800 files changed, 0 insertions, 111626 deletions

diff --git a/abs/mv-core/MythVantage-config/.kdbgrc.mythinstall b/abs/mv-core/MythVantage-config/.kdbgrc.mythinstall
deleted file mode 100644
index fed082f..0000000
--- a/abs/mv-core/MythVantage-config/.kdbgrc.mythinstall
+++ /dev/null
@@ -1,12 +0,0 @@
-[General]
-DebuggerCmdStr=
-DriverName=GDB
-FileVersion=1
-OptionsSelected=
-ProgramArgs=
-TTYLevel=7
-WorkingDirectory=
-
-[Memory]
-ColumnWidths=80,0
-NumExprs=0
diff --git a/abs/mv-core/MythVantage-config/MythVantage.sh b/abs/mv-core/MythVantage-config/MythVantage.sh
deleted file mode 100755
index 286c908..0000000
--- a/abs/mv-core/MythVantage-config/MythVantage.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-export MV_ROOT=/usr/MythVantage
-export PATH=$PATH:$MV_ROOT/bin
-export TEMPLATES=$MV_ROOT/templates
diff --git a/abs/mv-core/MythVantage-config/PKGBUILD b/abs/mv-core/MythVantage-config/PKGBUILD
deleted file mode 100755
index 18a8467..0000000
--- a/abs/mv-core/MythVantage-config/PKGBUILD
+++ /dev/null
@@ -1,112 +0,0 @@
-pkgname=MythVantage-config
-pkgver=3.2
-pkgrel=171
-pkgdesc="The Gui-installer"
-
-depends=(bc libstatgrab  mysql-python expect curl dnsutils parted 
-	 sg3_utils nmbscan system-templates rsync python-parted 
-	 ddcxinfo python-pexpect python-netifaces python-iplib mythinstall)
-
-arch=('i686')
-
-source=(mythinstall.bin 
- install-ui.xml
- bpopup-ui.xml
- mythbeselect.bin
- install_proxy.sh
- install_functions.sh
- startx systemconfig.sh
- install_db_chroot.sh
- restore_default_settings.sh
- live-install.sh
- xconfig.sh
- timezip.py
- soundconfig.sh
- mythvantage-release
- issue autocard.py 
- MythVantage.sh 
- create_master.sh 
- build_diskless.sh 
- networkconfig.sh 
- myth_user_call
- mv_advanced.py 
- mv_common.py 
- mv_config.py 
- mv_ir.py 
- mv_misc.py 
- mv_network.py 
- mv_screensaver.py 
- mv_smolt.py 
- mv_software.py 
- mv_webuser.py 
- mv_hostype.py 
- systemconfig.py 
- myth_user_call.py
- mv_install.py)
-
-install=live.install
-
-build() {
-    mkdir -p $startdir/pkg/etc
-    mkdir -p $startdir/pkg/usr/share/mythtv/themes/default
-    MVDIR=$startdir/pkg/usr/MythVantage
-    mkdir  $startdir/pkg/etc/profile.d
-    install -m 0755 MythVantage.sh  $startdir/pkg/etc/profile.d/MythVantage.sh
-    mkdir -p $startdir/pkg/root/
-
-
-    mkdir -p $MVDIR/bin
-    mkdir -p $MVDIR/templates
-    mkdir -p $MVDIR/etc
-#copy in all the installer specific stuff
-    rsync -r --exclude=.svn ../templates $MVDIR/
-    install -m0700 myth_user_call  $MVDIR/bin/myth_user_call
-    install -m 0755 install_proxy.sh  $MVDIR/bin/install_proxy.sh
-    install -m 0755 install_functions.sh  $MVDIR/bin/install_functions.sh
-    install -m 0755 systemconfig.sh  $MVDIR/bin/systemconfig.sh
-    install -m 0755 xconfig.sh  $MVDIR/bin/xconfig.sh
-   # install -m 0755 startx $MVDIR/bin/startx
-    install -m 0755 live-install.sh $MVDIR/bin/live-install.sh
-    install -m 0755 install_db_chroot.sh $MVDIR/bin/install_db_chroot.sh
-    install -m 0755 restore_default_settings.sh $MVDIR/bin/restore_default_settings.sh
-    install -m 0755 timezip.py $MVDIR/bin/timezip.py
-    install -m 0755 autocard.py $MVDIR/bin/autocard.py
-    install -m 0755 soundconfig.sh $MVDIR/bin/soundconfig.sh
-    install -m 0755 networkconfig.sh $MVDIR/bin/networkconfig.sh
-    install -m 0755 create_master.sh $MVDIR/bin/create_master.sh
-    install -m 0755 build_diskless.sh $MVDIR/bin/build_diskless.sh
-    install -m 0755 timezip.py $MVDIR/bin/timezip.py
-    install -m 0755 autocard.py $MVDIR/bin/autocard.py
-    install -m 0755 mv_config.py $MVDIR/bin/mv_config.py
-    install -m 0755 mv_install.py $MVDIR/bin/mv_install.py
-    install -m 0755 mv_advanced.py  $MVDIR/bin/
-    install -m 0755 mv_common.py $MVDIR/bin/ 
-    install -m 0755 mv_ir.py  $MVDIR/bin/ 
-    install -m 0755 mv_misc.py  $MVDIR/bin/ 
-    install -m 0755 mv_network.py  $MVDIR/bin/ 
-    install -m 0755 mv_screensaver.py  $MVDIR/bin/ 
-    install -m 0755 mv_smolt.py  $MVDIR/bin/ 
-    install -m 0755 mv_software.py  $MVDIR/bin/ 
-    install -m 0755 mv_webuser.py $MVDIR/bin/ 
-    install -m 0755 mv_hostype.py $MVDIR/bin/ 
-    install -m 0755 systemconfig.py $MVDIR/bin/ 
-
-    #copy in the branding stuff
-    install -m 0755 mythvantage-release $startdir/pkg/etc/mythvantage-release
-
-    install -m 0755 issue $startdir/pkg/etc/issue
-
-# copy over the ui files
-    install -m 0755 install-ui.xml $startdir/pkg/usr/share/mythtv/themes/default/
-    install -m 0755 bpopup-ui.xml $startdir/pkg/usr/share/mythtv/themes/default/
-#copy in the binaries
-    install -g mythtv -m 4750 mythinstall.bin $MVDIR/bin/MythVantage
-    cd $MVDIR/bin
-    ln -s MythVantage mythvantage
-    ln -s MythVantage mythinstall
-    cd -
-    install -g mythtv -m 4750 mythbeselect.bin $MVDIR/bin/mythbeselect
-    install -m 0755 startx $startdir/pkg/root/startx
-    install -m 0755 live-install.sh $startdir/pkg/root/live-install.sh
-}
-
diff --git a/abs/mv-core/MythVantage-config/add_service.sh b/abs/mv-core/MythVantage-config/add_service.sh
deleted file mode 100755
index 190d604..0000000
--- a/abs/mv-core/MythVantage-config/add_service.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-SERVICE_DIR=/var/service
-SCRIPT_DIR=/etc/sv
-if [ -d $SCRIPT_DIR/$1 ]
-then
-        if [  -d $SERVICE_DIR/$1 ]
-        then
-                echo "$1 already there"
-        else
-               ln -s $SCRIPT_DIR/$1 $SERVICE_DIR/$1
-              echo "adding $1"
-	fi
-else
-	echo "couldn't find $SCRIPT_DIR/$1"
-fi
diff --git a/abs/mv-core/MythVantage-config/autocard.py b/abs/mv-core/MythVantage-config/autocard.py
deleted file mode 100755
index 03eecac..0000000
--- a/abs/mv-core/MythVantage-config/autocard.py
+++ /dev/null
@@ -1,307 +0,0 @@
-#!/usr/bin/python
-# import MySQL module
-#jm
-import MySQLdb
-import sys
-import getopt
-import socket
-import os
-import time
-import string
-import glob
-from string import letters
-from string import digits
-def INSERTNULL_SOURCE(name,xmltvgrabber,userid,freqtable,lineupid,password,useeit):
-    cursor = db.cursor()
-    cursor.execute("INSERT INTO videosource(name,xmltvgrabber,userid,freqtable,lineupid,password,useeit) VALUES(%s,%s,%s,%s,%s,%s,%s);",(name,xmltvgrabber,userid,freqtable,lineupid,password,useeit))
-
-def INSERTCARD_INTOMYTH(Device,Driver,Cardvendor):
-    global currenthostname
-    print Device
-    print Driver,
-    print Cardvendor
-    cursor = db.cursor()
-    insert = "false"
-    if Driver == "ivtv" :
-        cardtype="MPEG"
-        defaultinput="Tuner 1"
-        insert="true"
-    if Cardvendor ==  "pcHDTV HD3000 HDTV":
-        insert="false"
-        cardtype ="whocares"
-
-        #print insert
-    if insert == "true" :
-        cursor.execute("INSERT INTO capturecard (videodevice,cardtype,defaultinput,hostname) VALUES(%s,%s,%s,%s);",(Device,cardtype,defaultinput,currenthostname))
-
-def INSERTHDR_INTOMYTH(deviceid,tuner_number):
-    cardtype='HDHOMERUN'
-    defaultinput='MPEG2TS'
-    global currenthostname
-    print deviceid
-    print cardtype
-    print defaultinput
-    print tuner_number
-    cursor = db.cursor()
-   #print insert
-    cursor.execute("INSERT INTO capturecard (videodevice,cardtype,defaultinput,dbox2_port ,hostname) VALUES(%s,%s,%s,%s,%s);",(deviceid,cardtype,defaultinput,tuner_number,currenthostname))
-
-def INSERTAUTOCARD():
-    global cardlist
-    global currenthostname
-    # create a cursor
-    cursor = db.cursor()
-
-
-    for i in range( 1 , len(cardlist)):
-        insert = "false"
-#        print cardlist[i]
-        Device=cardlist[i][0]
-        Driver=cardlist[i][1]
-        Cardvendor=cardlist[i][2]
-        Businfo=cardlist[i][3]
-        if Driver == "ivtv" :
-            insert="true"
-            devicestatus="unused"
-        if Cardvendor ==  "pcHDTV HD3000 HDTV":
-            insert="false"
-            cardtype ="whocares"
-        if Driver == "hdr":
-            insert="true"
-            devicestatus="unused"
-
-        if insert == "true" :
-            cursor.execute("delete from autocard where uniqid=%s;",(Businfo))
-            if Driver=="hdr":
-                Cardvendor="HDHOMERUN Tuner 1"
-                cursor.execute("INSERT INTO autocard (dev,driver,description,uniqid,devicestatus,hostname) VALUES(%s,%s,%s,%s,%s,%s);",(Device,Driver,Cardvendor,Businfo,devicestatus,currenthostname))
-                Cardvendor="HDHOMERUN Tuner 2"
-                cursor.execute("INSERT INTO autocard (dev,driver,description,uniqid,devicestatus,hostname) VALUES(%s,%s,%s,%s,%s,%s);",(Device,Driver,Cardvendor,Businfo,devicestatus,currenthostname))
-
-            else:
-                cursor.execute("INSERT INTO autocard (dev,driver,description,uniqid,devicestatus,hostname) VALUES(%s,%s,%s,%s,%s,%s);",(Device,Driver,Cardvendor,Businfo,devicestatus,currenthostname))
-
-
-
-def PRINTINFO():
-    global cardlist
-
-    for list in cardlist:
-        if  list != "_placeholder_":
-            print list
-            #print "-------------"
-
-def GATHER_HDR():
-    global cardlist
-    command="/usr/bin/hdhomerun_config --discover"
-    results=os.popen(command,'r')
-    line=results.readline()
-    if line.strip().split()[0] == "no":
-        print "HDHOMERUN not detected"
-    else:
-        print line
-        hdrdevice=line.strip().split()[2]
-        print hdrdevice
-        Driver="hdr"
-        Device=hdrdevice
-        Cardtype="HDHOMERUN"
-        Businfo=hdrdevice
-        cardprops =  [Device,Driver , Cardtype , Businfo]
-        cardlist.append(cardprops)
-
-
-def GATHER_v4l_CARDS():
-    global cardlist
-    cardlist=["_placeholder_"]
-   # print "Looking for v4l cards"
-    try:
-        filelist = os.listdir('/dev/v4l/')
-    except OSError:
-        filelist=" "
-        #fakelist=['/dev/v4l/video3', 'ivtv', 'WinTV PVR 500 (unit #2)', '0000:04:09.0']
-        #cardlist.append(fakelist)
-    try:
-        filelist = glob.glob("/dev/v4l/video?")
-        Driver=""
-        Cardtype=""
-        Businfo=""
-        numcards  = 0
-        for Device in filelist:
-            #print card
-            numcards = numcards+1
-            cmd = 'v4l2-ctl -D -d' + Device
-            for line in os.popen(cmd).readlines():
-                #print line
-                pos = string.find(line,"Driver name")
-                if pos >=0:
-                    splitline= line.split(':')
-                    Driver=splitline[1].strip()
-                pos = string.find(line,"Card type")
-                if pos >=0:
-                    splitline= line.split(':')
-                    Cardtype=splitline[1].strip()
-
-                pos = string.find(line,"Bus info")
-                if pos >=0:
-                    splitline= line.split(':',1)
-                    Businfo=splitline[1].strip()
-
-            #print Device,Driver , Cardtype , Businfo,numcards
-            cardprops =  [Device,Driver , Cardtype , Businfo]
-            cardlist.append(cardprops)
-    except IOError:
-        print "no v4l cards found"
-        sys.exit(2)
-
-
-def WRITEUDEV_IVTV():
-    global insertmyth
-    cursor = db.cursor()
-    #add ivtv,cid lookup loop through until empty.
-    cursor.execute("select distinct(uniqid) from autocard where driver='ivtv' and devicestatus='will-add'")
-    cidrows = cursor.fetchall()
-    for row in cidrows:
-        cid=row[0]
-        cursor.execute("select dev,driver,description,devicestatus,hostname from  autocard where uniqid=%s limit 1;",(cid))
-        result = cursor.fetchone()
-        description=result[2]
-        driver='DRIVERS==\"ivtv\"'
-        ATTRNAME='ATTR{name}=="ivtv? encoder MPG"'
-        KERNELS='KERNELS==\"'
-        KERNELS+=cid
-        KERNELS+="\""
-        #filter out non digit or chars
-        keep=letters.join(digits)
-        description=filter(lambda c: c in keep, description)
-        devnode="ivtv/"
-        #devnode+=description + "_"
-        udevcid=cid.partition(":")
-        devnode+=udevcid[2]
-        devnode+="_video"
-        UDEV_RULE=driver +', '+ATTRNAME+', '+ KERNELS +', ' + 'NAME=\"' + devnode + '"'
-        print "Here is the udev rule"
-        print UDEV_RULE
-        filename='/etc/udev/rules.d/11-ivtv-'+cid+'.rules'
-        file = open(filename,'w')
-        file.write(UDEV_RULE)
-        if ( insertmyth == "true"):
-            devnode="/dev/"+devnode
-            INSERTCARD_INTOMYTH(devnode,"ivtv",description)
-            cursor.execute("update autocard set devicestatus='done' where uniqid=%s;",(cid))
-#now insert HDR
-    cursor.execute("select distinct(uniqid),description from autocard where driver='hdr' and devicestatus='will-add'")
-    cidrows = cursor.fetchall()
-    for row in cidrows:
-              if ( insertmyth == "true"):
-                  deviceid=row[0]
-                  #cardtype="HDHOMRUN"
-                  #defaultinput="MPEG2TS"
-                  dbox2_port=row[1]
-                  tuner_number=dbox2_port.rpartition(' ')[2]
-                  INSERTHDR_INTOMYTH(deviceid,tuner_number)
-                  cursor.execute("update autocard set devicestatus='done' where uniqid=%s and description=%s;",(deviceid,dbox2_port))
-
-
-
-def CLEARAUTOCARD():
-    cursor = db.cursor()
-    cursor.execute("delete from autocard")
-
-def RELOADUDEV():
-        print "relaoding udev rules"
-        os.system('udevcontrol reload_rules')
-        os.system('rmmod ivtv')
-        os.system('udevtrigger')
-
-
-def usage():
-    print " -h   help"
-    print " -g   gather and print out the found cards"
-    print " -w   write out the udev rules"
-    print " -i   insert cards into myth that are marked will-add(only used with -w)"
-    print " -r   reload udev rules"
-    print " -c   clear the autocard db"
-
-def main(argv):
-    global db
-    global cardlist
-    global currenthostname
-    currenthostname=""
-    writeudev="false"
-    global insertmyth
-    insertmyth ="false"
-
-    db = MySQLdb.connect(host="localhost", user="mythtv", passwd="mythtv", db="mythconverg")
-    try:
-        cursor = db.cursor()
-        cursor.execute("describe autocard;")
-    except  MySQLdb.Error, e:
-        cursor.execute("create table autocard(dev varchar(50),driver varchar(50),description varchar(50),uniqid varchar(50), devicestatus varchar(50),hostname varchar(50));")
-        print "table created"
-
-    if ( currenthostname == "" ):
-         currenthostname = socket.gethostname()
-
-
-    try:
-        opts, args = getopt.getopt(argv, "hgwircd", ["help", "gathercards",  "writeudev" ,"insert" , "reloadudev" , "clearautocard"] )
-    except getopt.GetoptError:
-        sys.exit(2)
-    for opt, arg in opts:
-        if opt in ("-h", "--help"):
-             usage()
-             sys.exit()
-        elif opt in ( "-g" , "--gathercards"):
-             GATHER_v4l_CARDS()
-             GATHER_HDR()
-             INSERTAUTOCARD()
-             PRINTINFO()
-        elif opt in ("-w", "--writeudev"):
-             writeudev="true"
-        elif opt in ("-i", "--insert"):
-             insertmyth="true"
-        elif opt in ( "-r" , "--reloadudev"):
-             RELOADUDEV()
-        elif opt in ( "-c" , "--clearautocard"):
-             CLEARAUTOCARD()
-        elif opt in ( "-d" ):
-             INSERTCARD_INTOMYTH("file:/myth/video/TripThe1939.mpeg","ivtv","Dummy tuner")
-             INSERTNULL_SOURCE("dummy","/bin/true","","default","NULL","NULL","0")
-
-    if ( writeudev == "true"):
-        WRITEUDEV_IVTV()
-
-
-
-
-
-
-if __name__ == "__main__":
-    main(sys.argv[1:])
-
-
-
-
-
-#mysql>  create table autocard(dev varchar(50),driver varchar(50),description varchar(50),uniqid varchar(50), devicestatus varchar(50),hostname varchar(50));
-#Query OK, 0 rows affected (0.14 sec)
-
-#mysql> describe autocard;
-#+--------------+-------------+------+-----+---------+-------+
-#| Field        | Type        | Null | Key | Default | Extra |
-#+--------------+-------------+------+-----+---------+-------+
-#| dev          | varchar(50) | YES  |     | NULL    |       |
-#| driver       | varchar(50) | YES  |     | NULL    |       |
-#| description  | varchar(50) | YES  |     | NULL    |       |
-#| uniqid       | varchar(50) | YES  |     | NULL    |       |
-#| devicestatus | varchar(50) | YES  |     | NULL    |       |
-#| hostname     | varchar(50) | YES  |     | NULL    |       |
-#+--------------+-------------+------+-----+---------+-------+
-
-
-
-
-
-
-
-
diff --git a/abs/mv-core/MythVantage-config/bpopup-ui.xml b/abs/mv-core/MythVantage-config/bpopup-ui.xml
deleted file mode 100755
index df0598b..0000000
--- a/abs/mv-core/MythVantage-config/bpopup-ui.xml
+++ /dev/null
@@ -1,164 +0,0 @@
-<!--
-
-    This is a myth style theme file for mythwelcome
-
-    (c) 2005 by a whole bunch of people associated with MythTV
-
--->
-<mythuitheme>
- 
-    <window name="welcome_screen">
-    
-        <!--
-
-            First, define all the fonts we need on this screen
-
-        -->
-       <font name="title" face="Arial">
-           <color>#ffff00</color>
-           <dropcolor>#000000</dropcolor>
-           <size>24</size>
-           <shadow>3,3</shadow>
-           <bold>yes</bold>
-       </font>
-
-       <font name="time" face="Arial">
-            <color>#9999cc</color>
-            <size>18</size>
-            <bold>yes</bold>
-       </font>
-
-       <font name="label" face="Arial">
-            <color>#ffff00</color>
-            <dropcolor>#000000</dropcolor>
-            <size>18</size>
-            <shadow>3,3</shadow>
-            <bold>yes</bold>
-       </font>
-
-       <font name="info" face="Arial">
-            <color>#ffffff</color>
-            <size>18</size>
-            <bold>yes</bold>
-       </font>
-       
-       <font name="biginfo" face="Arial">
-	       <color>#ffffff</color>
-	       <size>50</size>
-	       <bold>yes</bold>
-       </font>
-       <font name="warning" face="Arial">
-            <color>#ff0000</color>
-            <dropcolor>#000000</dropcolor>
-            <size>16</size>
-            <shadow>2,2</shadow>
-            <bold>yes</bold>
-       </font>
-
-       <font name="buttons" face="Arial">
-            <color>#ffff00</color>
-            <size>14</size>
-            <bold>yes</bold>
-       </font>
-
-       <container name="main_display">
-            <area>0,0,800,600</area>
-
-            <textarea name="title" draworder="0" align="center">
-                <multiline>no</multiline>
-                <font>title</font>
-                <area>50,40,700,40</area>
-                <value></value>
-            </textarea>
-
-            <!-- 
-                time
-            -->            
-            <textarea name="time_text" draworder="0" align="right">
-                <multiline>no</multiline>
-                <font>time</font>
-                <area>660,520,110,30</area>
-                <value></value>
-            </textarea>
-
-            <textarea name="date_text" draworder="0" align="center">
-                <multiline>no</multiline>
-                <font>time</font>
-                <area>0,60,800,70</area>
-                <value></value>
-            </textarea>
-            
-            <!-- 
-                current myth status
-            -->
-
-            <textarea name="status_text" draworder="1" align="center">
-                <multiline>yes</multiline>
-                <font>info</font>
-                <area>20,70,760,60</area>
-                <value>MythTV is idle and will shutdown shortly.</value>
-            </textarea>
-
-            <!-- 
-                current recordings status
-            -->
-            
-            <textarea name="recording_label" draworder="1" align="center">
-                <font>label</font>
-                <area>20,110,760,30</area>
-                <!--<value>Percent Complete </value>-->
-                 <value></value>
-            </textarea>
-
-            <textarea name="recording_text" draworder="1" align="hcenter">
-                <multiline>yes</multiline>
-                <font>biginfo</font>
-                <area>20,110,760,150</area>
-                <value></value>
-            </textarea>
-
-            <!-- 
-                next scheduled recording status
-            -->
-            
-            <textarea name="scheduled_label" draworder="1" align="center">
-                <font>label</font>
-                <area>20,320,760,30</area>
-                <value></value>
-            </textarea>
-
-            <textarea name="scheduled_text" draworder="1" align="hcenter">
-                <multiline>yes</multiline>
-                <font>biginfo</font>
-                <area>20,400,760,120</area>
-                <value></value>
-            </textarea>
-
-            <!-- 
-                scheduled recordings conflict warning
-            -->
-            
-            <textarea name="conflicts_text" draworder="1" align="center">
-                <font>warning</font>
-                <area>20,490,760,30</area>
-                <value>WARNING: There are conflicting scheduled recordings!</value>
-            </textarea>
-
-            <!-- 
-                start frontend button
-                     
-            <textbutton name="startfrontend_button" draworder="1">
-                <position>81,535</position>
-                <font>buttons</font>
-                <image function="on" filename="mw_text_button_on.png"></image>
-                <image function="off" filename="mw_text_button_off.png"></image>
-                <image function="pushed" filename="mw_text_button_pushed.png"></image>
-            </textbutton>
-
-            -->
-
-	   </container>
-    
-    </window>
-    
-</mythuitheme>
diff --git a/abs/mv-core/MythVantage-config/build_diskless.sh b/abs/mv-core/MythVantage-config/build_diskless.sh
deleted file mode 100755
index c6cce57..0000000
--- a/abs/mv-core/MythVantage-config/build_diskless.sh
+++ /dev/null
@@ -1,162 +0,0 @@
-#!/bin/bash
-#CD=/mnt/cd
-. /etc/profile
-. /etc/systemconfig
-current_hostname=`hostname`
-echo $@ > /tmp/diskless_build.call
-TFTP=/data/srv/tftp
-CD=/data/srv/tftp/live
-DESTCD=/data/srv/tftp/CD
-BASE=/data/srv/tftp/masterbuild
-
-MODULES=$DESTCD/MythVantage/base/
-#only supports eth0 at this point
-myip=`ifconfig  | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1}'|head -n1`
-SRCFILES=$BASE/.livesys/medium
-
-function log () {
-echo $1
-}
-
-function check_xvfb () {
-export    DISPLAY=127.0.0.1:25
- Xvfb -ac :25  &
-
-}
-
-
-function create_base_image() {
-echo $SRCFILES
-if [ -f $SRCFILES/system.sqf ]
-then
-    mkdir $HOST_IMG_DIR
-    cd $SRCFILES
-    echo "Creating image..." > $BASE/tmp/.install_state
-    echo "Transferring system"
-    unsquashfs -i -f -d \/$HOST_IMG_DIR $DESTCD/system.sqf
-
-    for i in sys proc dev tmp
-    do
-         mkdir /$HOST_IMG_DIR/$i
-    done
-
-    chmod 777 /$HOST_IMG_DIR/tmp
-    mknod /$HOST_IMG_DIR/dev/null c 1 3
-    mknod /$HOST_IMG_DIR/dev/null c 1 5
-    mknod /$HOST_IMG_DIR/dev/console c 5 1
-    chmod +s /$HOST_IMG_DIR/usr/bin/Xorg
-    chmod +s /$HOST_IMG_DIR/usr/bin/crontab
-    chmod +s /$HOST_IMG_DIR/usr/bin/sudo
-    chmod +s /$HOST_IMG_DIR/bin/mount
-    echo "configuring boot" > $BASE/tmp/.install_state
-    sed -ie 's/^MODULES=.*$/MODULES="nfs"/g' $HOST_IMG_DIR/etc/mkinitcpio.conf
-    sed -ie 's/^HOOKS=.*$/HOOKS="base net udev autodetect pata scsi sata filesystems"/g' $HOST_IMG_DIR/etc/mkinitcpio.conf
-    #chroot $DEST mkinitcpio -p kernel26
-    #copy fstab from masterbuild
-    cp -f $BASE/etc/fstab /$HOST_IMG_DIR/etc/fstab
-    echo "Done: installing data" > $BASE/tmp/.install_state
-    return 0
-else
-    echo "Error: no modules" > $BASE/tmp/.install_state
-    log "couldn't find modules to install"
-    return 1
-fi
-}
-
-function configure_image () {
-    echo "Configuring system" > $BASE/tmp/.install_state
-    cp -f $BASE/etc/systemconfig  $HOST_IMG_DIR/etc/systemconfig
-    chown root:mythtv $HOST_IMG_DIR/etc/systemconfig
-    chmod 775 "$HOST_IMG_DIR" /etc/systemconfig
-     cp /etc/mtab $HOST_IMG_DIR/etc/mtab
-     mount --bind /dev $HOST_IMG_DIR/dev
-#     mount --bind /dev/pts $HOST_IMG_DIR/dev/pts
-     mount --bind /proc $HOST_IMG_DIR/proc
-     mount --bind /sys $HOST_IMG_DIR/sys
-
-    chroot "$HOST_IMG_DIR" $MV_ROOT/bin/systemconfig.sh misc,hostype,network,this_is_install,NETINSTALL
-#copy syssettings template to here.
-    SE=$BASE$TEMPLATES/settings/syssettings
-    mkdir -p  $HOST_IMG_DIR/$TEMPLATES/settings/syssettings
-    cp -rp $SE/*  ${HOST_IMG_DIR}/$TEMPLATES/settings/syssettings
-    chown root:mythtv $HOST_IMG_DIR/etc/systemconfig
-    chown -R mythtv:mythtv $HOST_IMG_DIR/$TEMPLATES/settings/syssettings
-    chmod -R 775  $HOST_IMG_DIR/$TEMPLATES/settings/syssettings
-#update remotedb with this host settings
-    OLDDISPLAY=$DISPLAY
-    check_xvfb
-    echo "Running MythVantage to restore settings"
-    DISPLAY=$DISPLAY HOME=/root chroot $HOST_IMG_DIR  $MV_ROOT/bin/MythVantage  -t  restore,default_1
-    chroot $HOST_IMG_DIR  $MV_ROOT/bin/restore_default_settings.sh -c restore -t syssettings
-    if [ !  $? = 0 ]
-    then
-            touch $mountpoint/tmp/.dbsysfailed
-            chmod 777 $mountpoint/tmp/.dbsysfailed
-    else
-        #Run second time
-        chroot "$HOST_IMG_DIR" $MV_ROOT/bin/systemconfig.sh misc,hostype,network,this_is_install,NETINSTALL
-        chroot "$HOST_IMG_DIR" $MV_ROOT/bin/restore_default_settings.sh -c  ACCESSCONTROL
-    fi
-chroot "$HOST_IMG_DIR" $MV_ROOT/bin/systemconfig.sh advanced,this_is_install,NETINSTALL
-cp -f $BASE/etc/X11/xorg.conf   $HOST_IMG_DIR/etc/X11/xorg.conf
-echo "Done" > $BASE/tmp/.install_state
-DISPLAY=$OLDDISPLAY
-#umount $HOST_IMG_DIR/dev/pts
-umount $HOST_IMG_DIR/dev
-#umount $HOST_IMG_DIR/dev/pts
-#umount $HOST_IMG_DIR/dev
-umount $HOST_IMG_DIR/proc
-umount $HOST_IMG_DIR/sys
-#umount $HOST_IMG_DIR/sys
-
-#cp /tmp/mythvantage_install.log  $HOST_IMG_DIR/var/log/
-}
-
-function create_tftp_boot () {
-
-    CFGFILE=$TFTP/pxelinux.cfg/01-$2
-    echo "DEFAULT mythfe" > $CFGFILE
-    echo "LABEL mythfe" >> $CFGFILE
-    echo "kernel masterbuild/boot/vmlinuz26" >> $CFGFILE
-    echo "append vga=normal root=/dev/nfs rw netboot  nfsroot=$myip:/data/srv/tftp/$1 ip=dhcp init=/sbin/runit initrd=masterbuild/boot/kernel26.img" >> $CFGFILE
-    echo "TIMEOUT 2" >>  $CFGFILE
-}
-
-function create_nfs_export () {
-grep -q "/data/srv/tftp/$1" /etc/exports
-status=$?
-if [ ! $status = 0 ]
-then
-    echo "adding $1 to nfs exports"
-    echo "/data/srv/tftp/$1    *(rw,no_root_squash,anonuid=1000,anongid=1000) " >> /etc/exports
-    exportfs -arv
-fi
-
-}
-
-#-------------------------------------------------------------------------------MAIN PROGRAM ---------------------------------------------------------------------
-if [ x$1 = x  -o   x$2 = x ]
-then
-    echo "usage:  hostname macaddress"
-    echo "example: Love 00-0C-29-E6-8A-A9"
-	exit 1
-fi
-
-image_name=$1
-mac_address=`echo $2| tr "[:upper:]" "[:lower:]"`
-
-echo "using image_name of $image_name"
-echo "using mac_address of $mac_address"
-
-HOST_IMG_DIR=$TFTP/$1
-
-create_base_image $image_name
-configure_image
-hostname $current_hostname
-umount $HOST_IMG_DIR/dev
-create_tftp_boot $image_name $mac_address
-create_nfs_export $image_name
-
-echo "Finshed!"
-#create_dhcp_entry $mac_address
-
diff --git a/abs/mv-core/MythVantage-config/builddir b/abs/mv-core/MythVantage-config/builddir
deleted file mode 100644
index 7f0bd78..0000000
--- a/abs/mv-core/MythVantage-config/builddir
+++ /dev/null
@@ -1 +0,0 @@
-cd ../../multimedia/mythsvn/mythtv/mythtv-svn/src/mythtv/programs/mythinstall
diff --git a/abs/mv-core/MythVantage-config/checkout_MythVantage.sh b/abs/mv-core/MythVantage-config/checkout_MythVantage.sh
deleted file mode 100755
index 9fbab15..0000000
--- a/abs/mv-core/MythVantage-config/checkout_MythVantage.sh
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/bin/bash
-MYDIR=`pwd`
-MYTHPATH="\/data\/LinHES-PKGBUILD\/abs\/core-testing\/mythtv\/stable\/mythtv\/src\/mythtv-0.21"
-MYTHPATH="\/data\/LinHES-PKGBUILD\/abs\/mv-core\/myth\/stable\/mythtv-release-fixes\/src\/mythtv"
-
-function setup_links {
-rm mythinstall.bin
-rm mythbeselect.bin
-ln -s  $MYDIR/src/MythVantage-app/mythinstall/mythinstall ./mythinstall.bin
-ln -s  $MYDIR/src/MythVantage-app/mythbeselect/mythbeselect ./mythbeselect.bin
-}
-
-function dl_repo {
-mkdir src
-cd src
-if [ ! -d MythVantage-app ]
-then
-    git clone http://mythvantage.com/MythVantage-app.git/
-    cd MythVantage-app
-    git checkout --track -b  LinHES origin/LinHES
-    cd $MYDIR
-    setup_links
-    cd -
-else
-    echo "updating exisiting tree"
-    cd MythVantage-app
-    git pull
-    git checkout master
-    git merge
-    cd -
-fi
-
-cd MythVantage-app
-git checkout master
-#git checkout origin/LinHES
-
-}
-
-dl_repo
-sed -i "s/^MYTHPATH.*$/MYTHPATH\=\"$MYTHPATH\"/g"  $MYDIR/src/MythVantage-app/mythinstall/mythinstall.pro
-sed -i "s/^MYTHPATH.*$/MYTHPATH\=\"$MYTHPATH\"/g"  $MYDIR/src/MythVantage-app/mythbeselect/mythberestart.pro
-sed -i "s/\/\/#define __MVAPP__/#define __MVAPP__/g" $MYDIR/src/MythVantage-app/mythinstall/mv_common.h
-sed -i "s/LinHES/mythvantage/g" $MYDIR/src/MythVantage-app/mythinstall/mv_common.h
-
-cd $MYDIR/src/MythVantage-app/mythinstall && qmake
-make || exit 1
-cd $MYDIR/src/MythVantage-app/mythbeselect && qmake
-make ||exit 1
-
diff --git a/abs/mv-core/MythVantage-config/copy-back.sh b/abs/mv-core/MythVantage-config/copy-back.sh
deleted file mode 100755
index 1c92d89..0000000
--- a/abs/mv-core/MythVantage-config/copy-back.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-DATADIR="../../../local/multimedia/mythtv/trunk/mythtv-svn/src/mythtv/programs/"
-PRGDIR="../../../../../../../system/live-installer/"
-#cd $DATADIR
-#ln -s  $PRGDIR/mythinstall-src mythinstall
-#cd -
-cp -rp $DATADIR/mythinstall/* mythinstall-src/
-cp -rp $DATADIR/mythbeselect/* mythbeselect-src
diff --git a/abs/mv-core/MythVantage-config/copy-to-mythbase.sh b/abs/mv-core/MythVantage-config/copy-to-mythbase.sh
deleted file mode 100755
index a0d2ad0..0000000
--- a/abs/mv-core/MythVantage-config/copy-to-mythbase.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-#DATADIR="../../multimedia/mythtv/trunk/mythtv-svn/src/mythtv/programs"
-DATADIR="../../multimedia/mythtv/release_fixes/mythtv-release-fixes/src/mythtv/programs"
-mkdir $DATADIR/mythinstall
-mkdir $DATADIR/mythbeselect
-rm mythinstall.bin
-rm mythbeselect.bin
-ln -n `pwd`/mythinstall/* $DATADIR/mythinstall
-ln -n `pwd`/mythbeselect/* $DATADIR/mythbeselect
-
-ln -s  $DATADIR/mythbeselect/mythbeselect ./mythbeselect.bin
-ln -s  $DATADIR/mythinstall/mythinstall ./mythinstall.bin
diff --git a/abs/mv-core/MythVantage-config/create_master.sh b/abs/mv-core/MythVantage-config/create_master.sh
deleted file mode 100755
index b7b7648..0000000
--- a/abs/mv-core/MythVantage-config/create_master.sh
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/bash
-CD=/media/cdrom
-#CD=/data/srv/tftp/live
-DESTCD=/data/srv/tftp/CD
-DEST=/data/srv/tftp/masterbuild
-#MODULES=$DESTCD/MythVantage/base/
-
-#ONLY SUPPORTS ETH0
-myip=`ifconfig  | grep 'inet addr:'| grep -v '127.0.0.1' | cut -d: -f2 | awk '{ print $1}'|head -n1`
-if [ x$myip = x ]
-then
-    echo "couldn't find a ipaddress to use for NFS server"
-fi
-
-
-mkdir -p $DESTCD
-mkdir -p $DEST
-
-mount $CD
-status=0
-if [ -f $CD/system.sqf ]
-then
-    status=0
-else
-    status=1
-    echo "couldn't find system.sqf"
-    exit 1
-fi
-
-if [ x$status = x0 ]
-then
-    echo "copying to disk"
-    cp -rvp $CD/*.sqf  $DESTCD
-    cp -rvp $CD/overlay.ovl $DESTCD
-    echo "creating master copy at $DESTCD"
-    unsquashfs -f -d /$DEST $DESTCD/system.sqf
-    cd $DEST
-    lzop -d < $DESTCD/overlay.ovl |tar -xf -
-    cp -rp overlay/etc/* etc/
-    cd -
-
-        for i in sys proc dev tmp
-        do
-            mkdir $DEST/$i
-        done
-        chmod 777 /$DEST/tmp
-        mknod $DEST/dev/null c 1 3
-        mknod $DEST/dev/null c 1 5
-        mknod $DEST/dev/console c 5 1
-        chmod +s $DEST/usr/bin/Xorg
-        chmod +s $DEST/usr/bin/crontab
-        chmod +s $DEST/usr/bin/sudo
-        chmod +s $DEST/bin/mount
-fi
-
-if [ ! -f $DEST/etc/fstab.bak ]
-then
-    cp $DEST/etc/fstab $DEST/etc/fstab.bak
-fi
-
-tac $DEST/etc/fstab.bak|tail +4|tac  > $DEST/etc/fstab
-echo "$myip:/data/srv/tftp/masterbuild / nfs" >> $DEST/etc/fstab
-
-grep -q "/data/srv/tftp/masterbuild" /etc/exports
-status=$?
-if [ ! $status = 0 ]
-then
-    echo "adding masterbuild to nfs exports"
-    echo "/data/srv/tftp/masterbuild  *(rw,no_root_squash,anonuid=1000,anongid=1000)" >> /etc/exports
-    exportfs -arv
-fi
-
-echo "configuring the kernel"
-sed -ie 's/^MODULES=.*$/MODULES="nfs"/g' $DEST/etc/mkinitcpio.conf
-sed -ie 's/^HOOKS=.*$/HOOKS="base net udev autodetect pata scsi sata filesystems"/g' $DEST/etc/mkinitcpio.conf
-chroot $DEST mkinitcpio -p kernel26
-
-#change rc.local for masterbuild
-cd $DEST/etc
-patch   <<EOF
---- rc.local.orig       2008-09-27 09:17:42.000000000 -0500
-+++ rc.local    2008-09-27 09:21:47.000000000 -0500
-@@ -2,6 +2,9 @@
- . /etc/profile
- .  ${MV_ROOT}/bin/install_functions.sh
- #install initial database
-+rm -f /etc/sysconfig
-+mysql  -c "drop database mythconverg"
-+pacman -R --noconfirm mythdb-initial 2>/dev/null
- pacman -S --noconfirm mythdb-initial 2>/dev/null
-
- init_network
-
-EOF
-
-cd -
-
-
-
-echo "copy in modules for net install"
-#copy in the modules/.livesys/medium/system.sqf
-mkdir -p $DEST/.livesys/medium
-cp $DESTCD/*  $DEST/.livesys/medium/
-
diff --git a/abs/mv-core/MythVantage-config/file_time_offset.py b/abs/mv-core/MythVantage-config/file_time_offset.py
deleted file mode 100755
index f2973d0..0000000
--- a/abs/mv-core/MythVantage-config/file_time_offset.py
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/python
-
-
-import time
-import os
-import glob
-import getopt
-import sys
-def main(argv):
-    filecount=0
-#    root = "/tmp"
-#    offset = 4
-    now = int(time.time())
-
-
-    try:
-        opts, args = getopt.getopt(argv, "hs:d:")
-    except getopt.GetoptError:
-        sys.exit(2)
-    for opt, arg in opts:
-        if opt in ("-h", "--help"):
-                print "-s seconds -d /testdir"
-                print "default if 4 seconds"
-                sys.exit()
-        elif opt in ( "-s" ):
-                offset = int(arg)
-        elif opt in ("-d"):
-                root = arg
-
-    for item in glob.glob(root+"/*"):
-        lastmodDate = os.path.getmtime(item)
-        tdiff= now-lastmodDate
-        #print tdiff, offset
-
-        if tdiff > offset:
-            filecount+=1
-    print filecount
-if __name__ == "__main__":
-    main(sys.argv[1:])
diff --git a/abs/mv-core/MythVantage-config/install-ui.xml b/abs/mv-core/MythVantage-config/install-ui.xml
deleted file mode 100755
index 8cebd11..0000000
--- a/abs/mv-core/MythVantage-config/install-ui.xml
+++ /dev/null
@@ -1,175 +0,0 @@
-<!--
-
-    This is a myth style theme file for mythwelcome
-
-    (c) 2005 by a whole bunch of people associated with MythTV
-
--->
-<mythuitheme>
-
-    <window name="welcome_screen">
-
-        <!--
-
-            First, define all the fonts we need on this screen
-
-        -->
-       <font name="title" face="Arial">
-           <color>#ffff00</color>
-           <dropcolor>#000000</dropcolor>
-           <size>24</size>
-           <shadow>3,3</shadow>
-           <bold>yes</bold>
-       </font>
-
-       <font name="time" face="Arial">
-            <color>#9999cc</color>
-            <size>18</size>
-            <bold>yes</bold>
-       </font>
-
-       <font name="label" face="Arial">
-            <color>#ffff00</color>
-            <dropcolor>#000000</dropcolor>
-            <size>18</size>
-            <shadow>3,3</shadow>
-            <bold>yes</bold>
-       </font>
-
-       <font name="info" face="Arial">
-            <color>#ffffff</color>
-            <size>18</size>
-            <bold>yes</bold>
-       </font>
-
-       <font name="biginfo" face="Arial">
-	       <color>#ffffff</color>
-	       <size>50</size>
-	       <bold>yes</bold>
-       </font>
-       <font name="warning" face="Arial">
-            <color>#ff0000</color>
-            <dropcolor>#000000</dropcolor>
-            <size>16</size>
-            <shadow>2,2</shadow>
-            <bold>yes</bold>
-       </font>
-
-       <font name="buttons" face="Arial">
-            <color>#ffff00</color>
-            <size>14</size>
-            <bold>yes</bold>
-       </font>
-       <font name="tinyinfo" face="Arial">
-           <color>#9999cc</color>
-           <size>12</size>
-           <bold>no</bold>
-       </font>
-
-       <container name="main_display">
-            <area>0,0,800,600</area>
-
-            <textarea name="title" draworder="0" align="center">
-                <multiline>no</multiline>
-                <font>title</font>
-                <area>50,40,700,40</area>
-                <value>Welcome to  MythVantage! </value>
-            </textarea>
-
-            <!--
-                time
-            -->
-            <textarea name="time_text" draworder="0" align="right">
-                <multiline>no</multiline>
-                <font>time</font>
-                <area>660,520,110,30</area>
-                <value></value>
-            </textarea>
-
-            <textarea name="date_text" draworder="0" align="hcenter">
-                <multiline>yes</multiline>
-                <font>time</font>
-                <area>20,75,740,100</area>
-                <value></value>
-            </textarea>
-
-            <!--
-                current myth status
-            -->
-
-            <textarea name="status_text" draworder="1" align="center">
-                <multiline>yes</multiline>
-                <font>info</font>
-                <area>20,100,760,60</area>
-                <value>MythTV is idle and will shutdown shortly.</value>
-            </textarea>
-
-            <!--
-                current recordings status
-            -->
-
-            <textarea name="recording_label" draworder="1" align="center">
-                <font>label</font>
-                <area>20,140,760,30</area>
-                <!--<value>Percent Complete </value>-->
-                 <value></value>
-            </textarea>
-
-            <textarea name="recording_text" draworder="1" align="hcenter">
-                <multiline>yes</multiline>
-                <font>biginfo</font>
-                <area>20,140,760,150</area>
-                <value></value>
-            </textarea>
-
-            <!--
-                next scheduled recording status
-            -->
-
-            <textarea name="scheduled_label" draworder="1" align="center">
-                <font>label</font>
-                <area>20,320,760,30</area>
-                <value></value>
-            </textarea>
-
-            <textarea name="scheduled_text" draworder="1" align="hcenter">
-                <multiline>yes</multiline>
-                <font>biginfo</font>
-                <area>20,400,760,120</area>
-                <value></value>
-            </textarea>
-
-            <textarea name="mythvantage_text" draworder="1" align="right">
-                <multiline>no</multiline>
-                <font>tinyinfo</font>
-                <area>20,560,760,30</area>
-                <value></value>
-            </textarea>
-            <!--
-                scheduled recordings conflict warning
-            -->
-
-            <textarea name="conflicts_text" draworder="1" align="center">
-                <font>warning</font>
-                <area>20,490,760,30</area>
-                <value>WARNING: There are conflicting scheduled recordings!</value>
-            </textarea>
-
-            <!--
-                start frontend button
-
-            <textbutton name="startfrontend_button" draworder="1">
-                <position>81,535</position>
-                <font>buttons</font>
-                <image function="on" filename="mw_text_button_on.png"></image>
-                <image function="off" filename="mw_text_button_off.png"></image>
-                <image function="pushed" filename="mw_text_button_pushed.png"></image>
-            </textbutton>
-
-            -->
-
-	   </container>
-
-    </window>
-
-</mythuitheme>
diff --git a/abs/mv-core/MythVantage-config/install_db_chroot.sh b/abs/mv-core/MythVantage-config/install_db_chroot.sh
deleted file mode 100755
index 15b6a20..0000000
--- a/abs/mv-core/MythVantage-config/install_db_chroot.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-. /etc/profile
-. /etc/systemconfig
-#myhost=`cat /etc/hostname`
-myhost=$hostname
-hostname $myhost
-mount -t proc none /proc
-pacman --noconfirm -Sf mysql
-/etc/rc.d/mysqld
-
-status=1
-mysqlstatus=1
-while [ ! $status = 0  ]
-do
-    /etc/rc.d/mysqld stop
-    sleep 1
-    /etc/rc.d/mysqld start
-    mysqlstatus=$?
-    if [ $mysqlstatus = 0 ]
-    then
-   	mysql -e "show databases;"
-        showstatus=$?
-        if [ $showstatus = 0 ]
-        then
-            pacman --noconfirm -R mythdb-initial
-            pacman --noconfirm  -S mythdb-initial
-            $MV_ROOT/bin/restore_default_settings.sh -c load
-            DISPLAY=127.0.0.1:0  $MV_ROOT/bin/MythVantage  -t  restore,default_1
-            $MV_ROOT/bin/restore_default_settings.sh -c restore -t syssettings
-            $MV_ROOT/bin/systemconfig.sh misc,hostype,this_is_install
-            if [ $SystemType = "Master_backend" ]
-            then
-                $MV_ROOT/bin/restore_default_settings.sh  -c  BECONFIG  -s master  -a $dbhost
-            fi
-            #update database to allow user jobs on this host.
-            $MV_ROOT/bin/restore_default_settings.sh  -c  USERJOBALLOW
-            $MV_ROOT/bin/restore_default_settings.sh  -c  ACCESSCONTROL
-	   if [ -d /data/srv/mysql/mythconverg ]
-	   then
-	    pacman --noconfirm -R webcalendar
-            pacman --noconfirm --nodeps  -S webcalendar
-	    status=0
-	   fi
-   	fi
-    fi
-done
-#/etc/rc.d/mysqld stop
-#umount /proc
-
-
-
diff --git a/abs/mv-core/MythVantage-config/install_functions.sh b/abs/mv-core/MythVantage-config/install_functions.sh
deleted file mode 100755
index 83a2bed..0000000
--- a/abs/mv-core/MythVantage-config/install_functions.sh
+++ /dev/null
@@ -1,344 +0,0 @@
-#!/bin/bash
-. /etc/profile
-
-disk=$2
-mountpoint=new_boot
-
-#-------------------------------------------
-MYTHDBUSER=mythtv
-MYTHTVPASSWD=mythtv
-CMDLINE=$(cat /proc/cmdline)
-hostname=`hostname`
-MYSQLCMD_C="mysql -u$MYTHDBUSER  -p$MYTHTVPASSWD mythconverg -B --exec"
-BASE=""
-found_remote=1
-
-function update_db_settings () {
-
- printhl "  setting database value $1 to $2 for $hostname"
- $MYSQLCMD_C "delete from settings where value='${1}' and hostname=\"$hostname\";"  2>/dev/null
- $MYSQLCMD_C "REPLACE INTO  settings set value='${1}', data='${2}' , hostname=\"$hostname\";" 2>/dev/null
-}
-
-function random_theme () {
-THEMES="basic-blue
-basic-green
-basic-red
-basic-purple
-basic-amber"
-
-theme=($THEMES)                # Read into array variable.
-
-num_themes=${#theme[*]}        # Count how many elements.
-
-pick=${theme[$((RANDOM%num_themes))]}
-printhl "   Selected $pick as the theme"
-update_db_settings Theme "$pick"
-}
-
-function parse_cmdline_2_db(){
-    echo $CMDLINE | grep -q displayres
-    if [ $? -eq 0 ]
-    then
-        TEMPVAR=${CMDLINE#*displayres=}
-        update_db_settings HostXres $TEMPVAR
-    fi
-
-}
-
-
-function bootsplash_setup (){
-    echo $CMDLINE | grep -q splash=silent
-    if [ $? -eq 0 ]
-    then
-        update_db_settings Hostbootsplash 1
-    else
-        update_db_settings Hostbootsplash 0
-    fi
-}
-
-
-function setupremote {
-    [ -e $BASE/etc/lircd.conf ] && mv -f $BASE/etc/lircd.conf $BASE/etc/lircd.conf.`date +%Y-%m-%d-%H-%M`
-    if [ -d $TEMPLATES/remotes/$Remotetype ]
-    then
-            cd $TEMPLATES/remotes/$Remotetype
-            for i in lircd*
-            do
-                    cat $i >> $BASE/etc/lircd.conf
-            done
-            cp -f lircrc* $BASE/etc/lircrc 2> /dev/null
-            [ -e /etc/lircrc ] && chmod 755 /etc/lircrc
-            update_db_settings HostRemoteType  "$Remotetype"
-        #special case for special remote
-        printhl "Starting with support for $Remotetype"
-        if [ "$Remotetype" == "dvico" ]
-        then
-            /usr/sbin/lircd  -d /dev/usb/hiddev0 --driver=dvico
-        elif [ "$Remotetype" == "Dvico-Dual-Digital4-rev2" ]
-        then
-            /usr/sbin/lircd -d /dev/input/irremote --driver=devinput
-        else
-            /usr/sbin/lircd -d /dev/lirc0
-        fi
-        [ -e /root/.mythtv ] ||  mkdir /root/.mythtv 2>/dev/null
-        ln -s /etc/lircrc /root/.mythtv/lircrc 2>/dev/null
-    else
-        echo "Couldn't open directory $TEMPLATES/remotes/$Remotetype"
-    fi
-}
-
-function scan_for_hpg_receiver() {
-printhl "   Scanning for Hauppauge receiver"
-for hpgid in `lspci -nm  -d4444: |cut -d" " -f6-  |tr -d '"'|tr " " :`
-do
-    line=`grep $hpgid $TEMPLATES/remotes/i2c.id`
-    if [ $? -eq 0 ]
-    then
-        modprobe lirc_i2c
-        FoundReceiverType=`echo "$line"|cut -d"|" -f2`
-        Remotetype=`echo "$line"|cut -d"|" -f4`
-        statusline=`echo "$line"|cut -d"|" -f2,4`
-        #echo "Found $statusline , $Remotetype"
-        echo "Found Hauppauge"
-        echo "-------------------"
-        echo "  1) Hauppauge black"
-        echo "  2) Hauppauge silver"
-        echo "  3) hauppauge-grey-g3"
-        echo ""
-        read -p "Which Hauppauge remote (5 sec): " -t 5 ans
-        echo
-        if [ "$?" != "0" ]; then
-        echo
-            echo "Using default $Remotetype"
-        else
-            case $ans in
-                1) Remotetype="hauppauge-black";;
-                2) Remotetype="hauppauge-silver";;
-                3) Remotetype="hauppauge-grey-g3" ;;
-                *) echo "Using default $Remotetype";;
-             esac
-        fi
-        update_db_settings  HostReceiverType $FoundReceiverType
-        found_remote=0
-        setupremote
-        break
-    fi
-done
-}
-
-
-function scan_for_usb_remote () {
-#found_remote=1
-printhl "   Scanning for usb receiver/remote"
-while read line
-do
-    USBID=`echo "$line"|cut -d"|"  -f1`
-    lsusb -d "$USBID" > /dev/null 2>/dev/null
-    if [ $? -eq 0 ]
-    then
-        Remotetype=`echo "$line"|cut -d"|" -f2`
-        printhl  "Found $Remotetype"
-        setupremote
-        found_remote=0
-        break
-    fi
-done <$BASE/$TEMPLATES/remotes/receiver_usb.id
-if [ $found_remote -eq 1 ]
-then
-    scan_for_hpg_receiver
-fi
-printhl "   Scanning for TatIR"
-if lsusb | grep 04d8:0004 > /dev/null 2>/dev/null
-then
-	/usr/bin/PyroUsb.py > /dev/null 2>&1 &
-fi
-
-if [ $found_remote -eq 1  ]
-then
-#No remote found_remote
-     update_db_settings HostRemoteType  "no_remote"
-fi
-
-}
-
-function rest_of_network () {
-    #netmask
-    echo $CMDLINE | grep -q cnetmask
-    if [ $? -eq 0 ]
-    then
-        TEMPVAR=${CMDLINE#*cnetmask=}
-        NETMASK=${TEMPVAR%% *}
-        /sbin/ifconfig eth0 $IP netmask $NETMASK
-        nm=`/usr/bin/nmconv.py -obits  $NETMASK`
-        NETMASK="/$nm $NETMASK"
-        #echo $NETMASK
-        update_db_settings HostNETMASK${MYTHDEFAULT} "$NETMASK"
-    else
-        printhl "   Netmask not found"
-    fi
-    #gateway
-    echo $CMDLINE | grep -q cgateway
-    if [ $? -eq 0 ]
-    then
-        TEMPVAR=${CMDLINE#*cgateway=}
-        GATEWAY=${TEMPVAR%% *}
-        /sbin/route add default  gw $GATEWAY
-        update_db_settings HostGW${MYTHDEFAULT} "$GATEWAY"
-    else
-        printhl  "  Gateway not found"
-    fi
-
-    #dns
-    echo $CMDLINE | grep -q cdns
-    if [ $? -eq 0 ]
-    then
-        TEMPVAR=${CMDLINE#*cdns=}
-        DNS=${TEMPVAR%% *}
-        echo "nameserver $DNS" >> /etc/resolv.conf
-        update_db_settings HostDNS${MYTHDEFAULT} "$DNS"
-        else
-            printhl "    DNS not found"
-    fi
-    echo $CMDLINE | grep -q chostname
-    if [ $? -eq 0 ]
-    then
-        TEMPVAR=${CMDLINE#*chostname=}
-        MYHOST=${TEMPVAR%% *}
-        update_db_settings HostMyhostname "$MYHOST"
-        else
-            printhl "    hostname not found"
-    fi
-}
-
-function init_network {
-    echo $CMDLINE |grep -q cnetdev
-    if [ $? -eq 0 ]
-    then
-        TEMPVAR=${CMDLINE#*cnetdev=}
-        MYTHDEFAULT=${TEMPVAR%% *}
-    else
-        MYTHDEFAULT="eth0"
-    fi
-
-    echo $CMDLINE | grep -q ip
-    if [ $? -eq 0 ]
-    then
-        update_db_settings HostDefaulteth0 0
-        update_db_settings HostDefault${MYTHDEFAULT} 1
-
-        update_db_settings HostActiveonbooteth0 0
-        update_db_settings HostActiveonboot${MYTHDEFAULT} 1
-        update_db_settings HostNetDevice ${MYTHDEFAULT}
-
-        TEMPVAR=${CMDLINE#*cip=}
-        IP=${TEMPVAR%% *}
-        if [ "$IP" == "dhcp" ]
-        then
-            /sbin/dhcpcd $MYTHDEFAULT
-            update_db_settings HostUseDHCP${MYTHDEFAULT} 0
-        else
-            /sbin/ifconfig ${MYTHDEFAULT} $IP
-            update_db_settings HostUseDHCP${MYTHDEFAULT} 1
-            update_db_settings HostIP${MYTHDEFAULT} "$IP"
-            rest_of_network
-        fi
-    fi
-
-
-
-
-}
-
-function dev_up_check(){
-    /sbin/ifconfig $1 1>/dev/null 2>/dev/null
-    status=$?
-    if [ $status -eq 1 ]
-    then
-        return 0
-    else
-        devip=`/sbin/ifconfig  | grep -C1 $1| grep inet|grep -v inet6  | cut -d: -f2 | awk '{ print $1}'`
-        if [  "x$devip" = "x" ]
-        then
-            return 1
-        else
-            return 0
-        fi
-    fi
-}
-
-function request_dhcp(){
-    echo $CMDLINE |grep -q cnetdev
-    if [ $? -eq 0 ]
-    then
-        TEMPVAR=${CMDLINE#*cnetdev=}
-        MYTHDEFAULT_NET=${TEMPVAR%% *}
-    else
-        MYTHDEFAULT_NET="eth0"
-    fi
-    for ndev in eth0 eth1 wlan0 wlan1 ath0
-    do
-        dev_up_check $ndev
-        status=$?
-        if [ $status -eq 1 ]
-        then
-            #interface is down, lets see if dhcp responds
-            dhcpcd -Td -t2 $ndev -h "" > /tmp/dhcpinfo.$ndev 2>/dev/null
-            #check for hostname here
-
-            TEMPVAR=`grep new_ip_address /tmp/dhcpinfo.$ndev |cut -d\= -f2`
-            if [ ! x$TEMPVAR = x ]
-            then
-                update_db_settings HostIP$ndev "$TEMPVAR"
-                TEMPVAR=`grep new_subnet_mask /tmp/dhcpinfo.$ndev |cut -d\= -f2`
-                nm=`/usr/bin/nmconv.py -obits  $TEMPVAR`
-                TEMPVAR="/$nm    $TEMPVAR"
-                update_db_settings HostNETMASK$ndev "$TEMPVAR"
-                TEMPVAR=`grep new_routers /tmp/dhcpinfo.$ndev |cut -d\= -f2`
-                update_db_settings HostGW$ndev "$TEMPVAR"
-                TEMPVAR=`grep new_domain_name_servers /tmp/dhcpinfo.$ndev |cut  -d\= -f2| tr -d \"|tr -d \'|cut -d" " -f 1`
-                update_db_settings HostDNS$ndev "$TEMPVAR"
-            fi
-        fi
-    done
-    TEMPVAR=`grep new_host_name /tmp/dhcpinfo.$MYTHDEFAULT_NET |cut -d\= -f2`
-    if [ ! x$TEMPVAR = x ]
-    then
-        update_db_settings HostMyhostname "$TEMPVAR"
-    fi
-
-}
-
-function init_remote {
-    echo $CMDLINE | grep -q remoteport
-    if [ $? -eq 0 ]
-    then
-        TEMPVAR=${CMDLINE#*remoteport=}
-        REMOTEPORT=${TEMPVAR%% *}
-    if [ x"$ReceiverType" = "xSerial" ]
-    then
-        if [ -e /dev/$REMOTEPORT ]
-        then
-            /usr/bin/setserial /dev/$REMOTEPORT uart none
-            /sbin/modprobe lirc_serial
-            update_db_settings HostReceiverType Serial
-            update_db_settings HostSerialPortlirc "$REMOTEPORT"
-        fi
-    fi
-
-    fi
-
-    echo $CMDLINE | grep -q remote
-    if [ $? -eq 0 ]
-    then
-        TEMPVAR=${CMDLINE#*remote=}
-        Remotetype=${TEMPVAR%% *}
-        setupremote
-    else
-        scan_for_usb_remote
-    fi
-}
-
-#-----------------------
-
-
diff --git a/abs/mv-core/MythVantage-config/install_proxy.sh b/abs/mv-core/MythVantage-config/install_proxy.sh
deleted file mode 100755
index 71b675b..0000000
--- a/abs/mv-core/MythVantage-config/install_proxy.sh
+++ /dev/null
@@ -1,234 +0,0 @@
-#!/bin/bash
-export TERM=vt100
-MVHOSTNAME=larch5
-. /etc/profile
-TEMP_TEMPLATES=/tmp/templates
-disk=$2
-rootfs=$3
-rootsize=$4
-datafs=$5
-datasize=$6
-swapsize=$7
-mountpoint="/new_boot"
-run=$MV_ROOT/bin/install_functions.sh
-. /etc/systemconfig 2>/dev/null
-. $MV_ROOT/bin/networkconfig.sh
-CMDLINE=$(cat /proc/cmdline)
-BACKUPFILE="/myth/backup/mythconverg.sql.gz"
-
-
-progress () {
-    mypercent=`echo "$1" | cut -d. -f1`
-    if [  x$mypercent = x ]
-    then
-    echo "" > /tmp/.install_percent
-    else
-    echo "${mypercent}% complete" > /tmp/.install_percent
-    fi
-}
-
-
-case $1 in
-    full_install_it )
-             mv_install.py --rootdisk=$disk --rootfs=$rootfs --rootsize=$rootsize --datafs=$datafs --datasize=$datasize --datadisk=$disk --swapsize=$swapsize -c full_install
-             rc=$?
-             echo "mv_install.py exit code $rc"
-             if [ $rc != 0 ]
-             then
-                echo "mv_install error" >> /tmp/.install_error
-             fi
-             exit $rc
-            ;;
-
-    NETBOOT)
-            echo "-----------------------------------------------------------------------3-----"
-            netboot-full_install
-            ;;
-
-    find_update)
-            mv_install.py --rootdisk=$disk -c find_upgrade
-            ;;
-
-    upgrade_it)
-            mv_install.py --rootdisk=$disk --rootfs=$rootfs -c upgrade
-            ;;
-
-    disk_model_it)
-            model="unknown"
-            size="xxx"
-            case $2 in
-                h* )
-                        model=`cat /proc/ide/$2/model`
-                        ;;
-                s*)     model=`sginfo /dev/$2|grep Product|awk ' { print $2 } '`
-                        ;;
-            esac
-            size=`parted /dev/$2  print |grep Disk|awk  ' { print $3 } '  `
-            echo ""$model" $size " >/tmp/model
-            ;;
-
-    network_check_it)
-            #Should never return from check_network
-            case $2 in
-                    setup_network)
-                                vnc_check
-                                install_network_setup
-                    ;;
-
-                    check_self)
-                                myipdefault=`ifconfig  | grep -C1 $default_interface| grep -v $default_interface | cut -d: -f2 | awk '{ print $1}'`
-                                echo "network check myself"
-                                ifconfig
-                                ping -c 1 $myipdefault
-                                if [ ! $? = 0 ]
-                                then
-                                    exit 3
-                                    #can't ping yourself
-                                fi
-                    ;;
-                    check_gw)
-                                #check gateway
-                                echo "network check gateway"
-                                /sbin/route -n
-                                mygwdefault=`/sbin/route -n  |grep $default_interface|grep UG|awk '{ print $2}'`
-                                echo "Default gateway seems to be $mygwdefault"
-                                if  [ !  x$mygwdefault = x ]
-                                then
-                                    sleep 2
-                                    ping -c 5 $mygwdefault
-                                    if [ ! $? = 0 ]
-                                    then
-                                        exit 4
-                                    fi
-                                fi
-                    ;;
-                    check_ns)
-                                #check nameserver
-                                        echo " network check nameserver"
-                                        mydns=`cat /etc/resolv.conf|grep nameserver|head -1|awk '{ print $2}'`
-                                        ping -c 1 $mydns
-                                        if [ ! $? = 0 ]
-                                        then
-                                            exit 5
-                                        fi
-                    ;;
-                    check_names)
-                                echo "network check resolve names"
-                                host google.com
-                                if [ ! $? = 0 ]
-                                then
-                                    exit 6
-                                fi
-                    ;;
-                    host_names)
-                                #if host is found, then check to see if it's online
-                                #if hoip matchs my ip assume it's ok
-                                echo "network check my hostname $hostname"
-                                hout=`host $hostname|head -n1`
-                                status=$?
-                                hoip=`echo $hout|awk  '{print $4}'`
-                                if [ $hoip = found: ]
-                                then
-                                    status=1
-                                fi
-
-                                if [ $hoip = "out;" ]
-                                then
-                                    #;; connection timed out; no servers could be reached
-                                    echo "DNS servers not found"
-                                    status=1
-                                fi
-
-                                unkownhost=`host unkown.linhes.org |head -n1 `
-                                unkownhostip=`echo $unkownhost |awk  '{print $4}'`
-
-                                #found host, now grab the ip
-                                if [ $status = 0 ]
-                                then
-                                    hoip=`echo $hout|awk  '{print $4}'`
-                                    /sbin/ifconfig -a |grep -q $hoip
-                                    if [  $? = 0 ]
-                                    then
-                                        echo "DNS ip matches on of my ips $hoip"
-                                        status=0
-                                    else
-                                        if [ $unkownhostip = $hoip ]
-                                        then
-                                            echo "Bad DNS returning false hits"
-                                            echo "Assuming hostname is OK"
-                                            echo "DNS unknown: $unkownhostip"
-                                            echo "    HOSTDNS: $hoip       "
-                                            /sbin/ifconfig -a |grep "inet addr"
-                                        else
-                                            echo "IP in DNS but doesn't match mine, hostname is not safe to use"
-                                            echo "DNS:$hoip"
-                                            echo "HOST: "
-                                            /sbin/ifconfig -a |grep "inet addr"
-                                            status=7
-                                            fi
-                                    fi
-                                else
-                                    echo "Couldn't find hostname in DNS, must be safe to use"
-                                    status=0
-                                fi
-                                exit $status
-                    ;;
-
-                esac
-            exit 0
-        ;;
-
-    * )
-        if [ -f /tmp/.install_state ]
-        then
-                state=`cat /tmp/.install_state`
-        else
-        state=" "
-        fi
-            if  [  x"${state}" =  "xConfiguring system" ]
-            then
-                progress ""
-            else
-
-                if [ -f /tmp/.startsize.io ]
-                then
-                    . /tmp/.startsize.io
-                    #finding the drive
-                    ddrive=`df |  grep $mountpoint | head -n1 | awk -F/ ' { print $3 } ' | cut -d" " -f 1|cut -b1,2,3 `
-                    used=`statgrab -M disk.|grep ${ddrive}.write_bytes|cut -d= -f 2|tr -d " "`
-                    used=`echo $used-$STARTSIZE|bc`
-                        #echo $used
-                fi
-
-        if [ ! x$used = x ]
-            then
-                .  /root/.install_size
-                #somehow find if it's an install or update
-                if [ -f /tmp/.this_is_upgrade ]
-                then
-                    total=$UPGRADESIZE
-                else
-                    total=$TOTALSIZE
-                fi
-            percent=`echo "scale=2 ;  ($used/$total) * 100 " |bc `
-            cond2=$(echo "$percent > 98" |bc  )
-            if [ $cond2 -eq 1  ]
-            then
-                percent=98
-            fi
-            if  [  x"${state}" =  "xDone" ]
-            then
-                percent=100
-            fi
-            cond3=$(echo "$percent < 3" |bc )
-            if [ $cond3 -eq 0   ]
-                then
-                    progress $percent
-                fi
-            fi
-        fi
-    ;;
-esac
-
-
-
diff --git a/abs/mv-core/MythVantage-config/issue b/abs/mv-core/MythVantage-config/issue
deleted file mode 100644
index 8a38358..0000000
--- a/abs/mv-core/MythVantage-config/issue
+++ /dev/null
@@ -1 +0,0 @@
-MythVantage
diff --git a/abs/mv-core/MythVantage-config/live-install.sh b/abs/mv-core/MythVantage-config/live-install.sh
deleted file mode 100755
index 573bb1f..0000000
--- a/abs/mv-core/MythVantage-config/live-install.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-#redirect stderr to stdout, then rediret stdout to file
-. /etc/profile
-exec 2>&1
-exec > /tmp/mythvantage_install.log
-. /etc/X11/STBWINDOWMANAGER
-/usr/bin/nvidia-settings -a InitialPixmapPlacement=2
-keylaunch &
-/usr/bin/tilda &
-/usr/X11R6/bin/unclutter -root -idle 0 -jitter 400 -noevents  &
-export MALLOC_CHECK_=0
-if [ -f /opt/vmware/bin32/vmware-user-wrapper ]
-then
-	/opt/vmware/bin32/vmware-user-wrapper &
-fi
-xhost +
-CMDLINE=$(cat /proc/cmdline)
-echo $CMDLINE |grep -q nfsroot
-NFSROOT=$?
-if  [ x$NFSROOT = x1  ]
-then
-
-    unbuffer MythVantage &
-else
-    NETBOOT=YES     MythVantage &
-fi
-
-exec  $STBWINDOWMANAGER
diff --git a/abs/mv-core/MythVantage-config/live.install b/abs/mv-core/MythVantage-config/live.install
deleted file mode 100644
index 01fa3ce..0000000
--- a/abs/mv-core/MythVantage-config/live.install
+++ /dev/null
@@ -1,57 +0,0 @@
-# This is a default template for a post-install scriptlet.  You can
-# remove any functions you don't need (and this header).
-
-# arg 1:  the new package version
-pre_install() {
-  rm -f /etc/issue
-  rm -f /etc/arch-relase
-}
-
-# arg 1:  the new package version
-post_install() {
-    if [ ! -f /etc/blacklist.package ]
-    then
-        echo "List of packages to ignore" > /etc/blacklist.package
-        echo "one package per line" >> /etc/blacklist.package
-    fi
-
-
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-pre_upgrade() {
-  /bin/true
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-	. /etc/profile
-	ps -ef|grep mysqld|grep -v grep
-	status=$?
-	echo "status $status"
-	if [ $status  = 0 ]
-	then
- 		restore_default_settings.sh -c load
-	fi
-        if [ ! -f /etc/blacklist.package ]
-        then
-            echo "List of packages to ignore" > /etc/blacklist.package
-            echo  "one package per line" >> /etc/blacklist.package
-        fi
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  /bin/true
-}
-
-# arg 1:  the old package version
-post_remove() {
-  /bin/true
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/mv-core/MythVantage-config/mv_advanced.py b/abs/mv-core/MythVantage-config/mv_advanced.py
deleted file mode 100755
index 4790fcf..0000000
--- a/abs/mv-core/MythVantage-config/mv_advanced.py
+++ /dev/null
@@ -1,384 +0,0 @@
-# -*- coding: utf-8 -*-
-import logging, os, re
-import mv_common
-
-def setup_pacman(create_link):
-    if create_link:
-        logging.info("    Creating pacman link")
-        #LOOK
-        #This is not implmented yet, below is the bash code for reference
-        #if [ ! x$1 = x ]
-    #then
-        #ln -s ${BASE}/data/var ${BASE}/data/srv/httpd/htdocs/repo
-        #echo "creating the link for the pacman repo mirror"
-    #fi
-
-    #for i in mv-core mv-core-testing mv-extra mv-extra-testing
-    #do
-        #echo "[$i]"  > ${BASE}/etc/pacman.d/$i
-        ##add mirror if needed
-        #if [ x$PKG_MIRROR = x1 ]
-        #then
-            #echo " Server = http://$dbhost/repo/$i " >> ${BASE}/etc/pacman.d/$i
-        #fi
-        ##add user templates
-        #USERTEMPLATES="/data/home/mythtv/templates"
-        #if [ -f $USERTEMPLATES/sources/$i ]
-        #then
-            #echo "Adding user  $i"
-            #cat $USERTEMPLATES/sources/$i  >> ${BASE}/etc/pacman.d/$i
-        #fi
-        #cat $TEMPLATES/sources/$i  >> ${BASE}/etc/pacman.d/$i
-        #echo "setting local mirror to $dbhost for $i "
-    #done
-    else:
-        logging.info("    Pacman link will not be created")
-    return
-
-def setup_ncid_client(dbhost,templatefile):
-    #This always runs
-    logging.debug("    Configuring ncid client with server %s",dbhost)
-    cmd = '''sed -e "s/^set Host.*$/set Host %s /" %s >/etc/ncid/ncid.conf''' %(dbhost, templatefile)
-    return
-
-def setup_ncid_daemon(port,templatefile,Runncidd):
-    logging.info("    Configuring callerid daemon")
-    if Runncidd == "1":
-        logging.debug("    Port: %s",port)
-        mv_common.cp_and_log("/etc/ncid/ncidd.conf",templatefile)
-        cmd = '''sed -e "s/.*set ttyport.*$/set ttyport =  \/dev\/%s /" %s >/etc/ncid/ncidd.conf''' %(port,templatefile)
-        mv_common.runcmd(cmd)
-        mv_common.pacinstall("ncidd")
-        mv_common.add_service("ncidd")
-    else:
-        logging.debug("    Callerid will not run")
-        mv_common.pacremove("ncidd")
-        mv_common.remove_service("ncidd")
-    return
-
-def setup_splash(Usebootsplash):
-    if Usebootsplash == "1":
-        logging.info("    Enabling splash")
-        cmd = ''' sed -i "s/^default.*0/default 1/g" /boot/grub/menu.lst'''
-        mv_common.runcmd(cmd)
-    else:
-        logging.info("    Disabling splash")
-        cmd = ''' sed -i "s/^default.*1/default 0/g" /boot/grub/menu.lst'''
-        mv_common.runcmd(cmd)
-    return
-def setup_rrd(UseRRD):
-    if UseRRD == "1":
-        logging.info("    Enabling rrd_stats")
-        mv_common.pacinstall("rrd_stats")
-    else:
-        logging.info("    Disabling rrd_stats")
-        mv_common.pacremove("rrd_stats")
-
-
-def setup_hobbit(UseHobbit,SystemType,dbhost):
-    if UseHobbit == "1":
-        if SystemType == "Standalone" or SystemType == "Master_backend":
-            logging.info("    Installing hobbit server")
-            mv_common.pacinstall("hobbitserver")
-            mv_common.add_service("hobbit")
-        else:
-            logging.info("    Installing hobbit client")
-            mv_common.pacinstall("hobbit-client")
-            setup_hobbit_client(dbhost)
-            mv_common.add_service("hobbit-client")
-
-    else:
-            logging.info("    Removing Hobbit")
-            mv_common.pacremove("hobbit")
-            mv_common.pacremove("hobbit-client")
-            mv_common.remove_service("hobbit-client")
-            mv_common.remove_service("hobbitserver")
-            cmd = "rm -f /data/srv/httpd/htdocs/hobbit/index.html"
-            mv_common.runcmd(cmd)
-    return
-
-def setup_hobbit_client(dbhost):
-    logging.info("    Configuring hobbit client")
-    logging.debug("   hobbit server is %s:", dbhost)
-    cmd='''sed -i "s/^BBDISP.*$/BBDISP=%s/g" /data/srv/hobbit/client/etc/hobbitclient.cfg ''' %dbhost
-    mv_common.runcmd(cmd)
-    return
-
-def setup_evrouter(UseEvrouter,EvrouterConfig,template):
-    if UseEvrouter == "1":
-        logging.info("    Configuring everouter")
-        logging.debug("    EvrouterConfig is %s:",EvrouterConfig)
-        if EvrouterConfig == "tinker":
-            logging.debug("    tinker mode, not changing the config")
-            return
-        mv_common.pacinstall("evrouter")
-        mv_common.pacinstall("Xvfb")
-        mv_common.cp_and_log(template+"/evrouter/"+EvrouterConfig,"/etc/evrouter.cfg")
-        mv_common.add_service("evrouter")
-        mv_common.add_service("Xvfb")
-    else:
-        logging.info("    Not using evrouter")
-        mv_common.pacremove("evrouter")
-        mv_common.remove_service("evrouter")
-        mv_common.remove_service("Xvfb")
-
-    return
-
-def setup_DNSmasq(RunDHCP,ip,gw,nameserver):
-    if RunDHCP == "1":
-        logging.info("    Configuring dhcp server(dnsmasq)")
-        logging.debug("    ip: %s", ip)
-        logging.debug("    gw: %s", gw)
-        logging.debug("    ns: %s", nameserver)
-        mv_common.pacinstall("dnsmasq")
-        mv_common.pacinstall("mvpmc")
-        mv_common.add_service("dnsmasq")
-        logging.debug("    Setting default route to my gw: %s",gw)
-        try:
-            f = open("/etc/dnsmasq.conf",'r')
-            dnsconf = f.readlines()
-            f.close()
-        except:
-                logging.info("    Couldn't open dnsmasq.conf")
-                return
-        for line in dnsconf:
-            outline = line
-            if re.match("^dhcp-option=3",line):
-                logging.debug("    Setting default route to my gw: %s",gw)
-                outline = "dhcp-option=3,%s\n" %gw
-            if re.match("^dhcp-option=6",line):
-                logging.debug("    Setting dns to my ip: %s",ip)
-                outline = "dhcp-option=6,%s\n" %ip
-            f.write(outline)
-        f.close()
-
-        logging.debug("    change nfsroot to my ip:%s",ip)
-        cmd = '''sed -i "s/nfsroot=.*:/nfsroot=%s:/g" /data/srv/tftp/pxelinux.cfg/default''' %ip
-        mv_common.runcmd(cmd)
-
-        logging.debug("    Adding 127.0.0.1 to resolv.conf")
-        logging.debug("    other nameserver is %s",nameserver)
-        try:
-            f = open("/etc/resolv.conf",'r')
-            dns = f.readlines()
-            f.close()
-        except:
-                dns=''
-                logging.debug("   Couldn't open resolv.conf for reading")
-        try:
-            f = open("/etc/resolv.conf",'w')
-            line="search lan\n"
-            f.write(line)
-            line="nameserver 127.0.0.1\n"
-            f.write(line)
-            line="nameserver %s\n" %nameserver
-            f.write(line)
-            for line in dns:
-                f.write(line)
-            f.close()
-        except:
-                logging.debug("   Couldn't open resolv.conf for writing")
-
-        logging.debug("    setup dongle.config")
-        cmd = ''' sed -i "s/mvpmc -f .*/mvpmc -f \/etc\/helvR10.fon -s %s \& /" /data/srv/tftp/dongle.bin.config ''' %ip
-        #COMMAND="%s/mvpmc -f .*/mvpmc -f \/etc\/helvR10.fon -s ${ip} \& /"
-        #ex ${BASE}/data/srv/tftp/dongle.bin.config <<EOF
-        mv_common.runcmd(cmd)
-    else:
-        logging.info("    removing dhcp server(dnsmasq)")
-        mv_common.pacremove("dnsmasq")
-        mv_common.pacremove("mvpmc")
-        mv_common.remove_service("dnsmasq")
-    return
-
-def setup_mythweb(UseMythWEB):
-    if UseMythWEB == "1":
-        logging.info("    Activating mythweb")
-        mv_common.pacinstall("lighttpd")
-        mv_common.pacinstall("mythweb")
-        mv_common.add_service("lighttpd")
-    else:
-        logging.info("    Removing mythweb")
-#        mv_common.pacremove("lighttpd")
-        mv_common.pacremove("mythweb")
- #       mv_common.remove_service("lighttpd")
-    return
-
-def setup_samba(systemconfig,data_config):
-    mythhome = data_config.MYTHHOME
-    if systemconfig["UseSamba"] == "1":
-        logging.info("    Activating windows file sharing")
-        usersamba=mythhome+"/templates/smb.conf"
-        mv_common.pacinstall("samba")
-        if not os.path.exists("/etc/samba"):
-            logging.debug("    Creating directory /etc/samba")
-            try:
-                os.makedirs("/etc/samba")
-            except:
-                pass
-
-        if os.path.exists(usersamba):
-            logging.debug("    Using user provided config file %s",usersamba)
-            cmd = "install -D -m755  %s /etc/samba/smb.conf" %usersamba
-            mv_common.runcmd(cmd)
-        else:
-            Samba_media = systemconfig["Samba_media"]
-            Samba_home = systemconfig["Samba_home"]
-            if systemconfig["Samba_mediareadonly"] == "1":
-                smreadonly = "yes"
-            else:
-                smreadonly = "no"
-
-            if systemconfig["Samba_homereadonly"] == "1":
-                shreadonly = "yes"
-            else:
-                shreadonly = "no"
-            domain = systemconfig["Samba_domain"]
-            servername = systemconfig["hostname"]
-
-            try:
-                f = open(systemconfig["TEMPLATES"]+"/samba/smb.conf.template",'r')
-                t_smbconf = f.readlines()
-                f.close()
-            except:
-                logging.info("   Couldn't open samba template file")
-                return
-
-            try:
-                f = open("/etc/samba/smb.conf",'w')
-            except:
-                logging.info("   Couldn't open samba file")
-                return
-
-            for line in t_smbconf:
-                outline = line
-                if re.match("^.*workgroup", line):
-                    logging.debug("    Setting workgroup to %s",domain)
-                    outline="workgroup = %s\n" %domain
-                    logging.debug("     %s",outline)
-                if re.match("^.* server string",line):
-                    logging.debug("    Setting server name to %s",servername)
-                    outline="server string = %s\n" %servername
-                    logging.debug("     %s",outline)
-                f.write(outline)
-            outline="include =  %s/templates/user.shares \n" %mythhome
-            f.write(outline)
-            if Samba_media == "1":
-                outline="include =  /etc/samba/smb.conf.media\n"
-                f.write(outline)
-            if Samba_home == "1":
-                outline="include =  /etc/samba/smb.conf.home\n"
-                f.write(outline)
-            f.close()
-            logging.info("    Writing smb.conf.media")
-            try:
-                f = open("/etc/samba/smb.conf.media","w")
-            except:
-                logging.info("    Couldn't open smb.conf.media")
-                return
-            medialines='''
-[%s]
-path = %s
-public = yes
-only guest = yes
-writeable  = %s
-printable = no
-force user = mythtv
-force group = mythtv
-create mask = 0755''' %(data_config.SMEDIA,data_config.DATAMOUNT,smreadonly)
-            f.write(medialines)
-            f.close
-            logging.debug("     %s",medialines)
-            logging.info("    Writing smb.conf.home")
-            try:
-                    f = open("/etc/samba/smb.conf.home","w")
-            except:
-                logging.info("    Couldn't open smb.conf.home")
-                return
-            homelines='''
-[home]
-path = %s
-public = yes
-only guest = yes
-writeable  = %s
-printable = no
-force user = mythtv
-force group = mythtv
-create mask = 0755 ''' %(data_config.MYTHHOME,shreadonly)
-            f.write(homelines)
-            f.close
-            logging.debug("     %s",homelines)
-
-
-        mv_common.add_service("nmbd")
-        mv_common.add_service("smbd")
-    else:
-        logging.info("  Removing windows file sharing")
-        mv_common.remove_service("smbd")
-        mv_common.remove_service("nmbd")
-        mv_common.pacremove("samba")
-        mv_common.pacinstall("smbclient")
-    return
-
-def setup_NFSshares(UseNFS,templatefile):
-    if UseNFS == "1":
-        logging.info("    Activating NFS server")
-        mv_common.pacinstall("nfs-utils")
-        mv_common.pacinstall("portmap")
-        cmd = '''sed -e "s/REPLACEME/*/g" %s  >/etc/exports''' %templatefile
-        mv_common.add_service("nfsd")
-        mv_common.add_service("nfs-utils")
-        mv_common.add_service("portmap")
-    else:
-        logging.info("    Removing NFS server")
-        mv_common.remove_service("nfsd")
-    return
-
-def setup_dyndns(DDnsEnable):
-    if DDnsEnable == "1":
-        logging.info("    Installing Dynamic DNS client")
-        mv_common.pacinstall("inadyn")
-        mv_common.add_service("inadyn")
-    else:
-        logging.info("    Removing Dynamic DNS client")
-        mv_common.pacremove("inadyn")
-        mv_common.remove_service("inadyn")
-
-
-def setup_advanced(systemconfig,data_config):
-    logging.info("____Start of advanced configuration____")
-    create_link = False
-    if systemconfig["SystemType"] == "Master_backend":
-        create_link = True
-    setup_pacman(create_link)
-    setup_ncid_client(systemconfig["dbhost"],
-                      systemconfig["TEMPLATES"]+"/ncid.conf.template")
-
-    setup_ncid_daemon(systemconfig["nciddSerialPort"],
-                      systemconfig["TEMPLATES"]+"/ncidd.conf.template",
-                      systemconfig["Runncidd"])
-
-    setup_splash(systemconfig["Usebootsplash"])
-    if data_config.SYSTEMTYPE == "MythVantage":
-        setup_hobbit(systemconfig["UseHobbit"],
-                    systemconfig["SystemType"],
-                    systemconfig["dbhost"])
-    if data_config.SYSTEMTYPE == "LinHES":
-        setup_rrd(systemconfig["UseRRD"])
-
-    setup_evrouter(systemconfig["UseEvrouter"],
-                   systemconfig["EvrouterConfig"],
-                   systemconfig["TEMPLATES"])
-
-    setup_DNSmasq(systemconfig["RunDHCP"],
-                  systemconfig["mythip"],
-                  systemconfig["mythgw"],
-                  systemconfig["mythdns"])
-
-    setup_mythweb(systemconfig["UseMythWEB"])
-    setup_samba(systemconfig,data_config)
-    setup_NFSshares(systemconfig["UseNFS"],
-                systemconfig["TEMPLATES"]+"/exports.template")
-
-    setup_dyndns(systemconfig["DDnsEnable"])
-    logging.info("__End of advanced configuration\n")
diff --git a/abs/mv-core/MythVantage-config/mv_common.py b/abs/mv-core/MythVantage-config/mv_common.py
deleted file mode 100755
index a492597..0000000
--- a/abs/mv-core/MythVantage-config/mv_common.py
+++ /dev/null
@@ -1,201 +0,0 @@
-# -*- coding: utf-8 -*-
-import logging, os, time
-import commands
-config_file = "mv_config"
-data_config = __import__(config_file, globals(), locals(), [])
-
-def runcmd(cmd):
-    if data_config.NOOPDEBUG=="FALSE":
-        pass
-    else:
-        cmd = "echo "+cmd
-    logging.debug("    %s",cmd)
-    cmdout = commands.getstatusoutput(cmd)
-    logging.debug("    %s",cmdout)
-    return cmdout[0]
-
-def runcmd_output(cmd):
-    if data_config.NOOPDEBUG=="FALSE":
-        pass
-    else:
-        cmd = "echo "+cmd
-    logging.debug("    %s",cmd)
-    cmdout = commands.getstatusoutput(cmd)
-    logging.debug("    %s",cmdout)
-    return cmdout[1]
-
-def services(systemconfig):
-    logging.debug("______Start of services______")
-    logging.debug("__End services")
-
-def cp_and_log(srcfile,destfile):
-    #return
-    if not os.path.exists(srcfile):
-        logging.info("%s is not present, skipping...",srcfile)
-    else:
-        cmd = ("rsync -arhp %s %s") %(srcfile,destfile)
-        runcmd(cmd)
-
-
-def add_service(daemon):
-    logging.info("    Adding service %s",daemon)
-    cmd = "add_service.sh %s" %daemon
-    runcmd(cmd)
-
-def remove_service(daemon):
-    logging.info("    Removing service %s",daemon)
-    stop_service(daemon)
-    cmd = "remove_service.sh %s" %daemon
-    runcmd(cmd)
-
-def start_service(daemon):
-    logging.info("    start service %s",daemon)
-    cmd = "sv start %s" %daemon
-    runcmd(cmd)
-
-def stop_service(daemon):
-    logging.info("    stop service %s",daemon)
-    cmd = "sv stop %s" %daemon
-    runcmd(cmd)
-
-def restart_service(daemon):
-    logging.info("    Restarting service %s",daemon)
-    if daemon == "lcdd":
-        stop_service(daemon)
-        logging.debug("    killing all lcdd")
-        cmd = "killall -9 LCDd"
-        runcmd(cmd)
-        time.sleep(2)
-        start_service(daemon)
-    else:
-        cmd = "sv restart %s" %daemon
-        runcmd(cmd)
-
-def hup_service(daemon):
-    logging.info("    hup service %s",daemon)
-    cmd = "sv hup %s" %daemon
-    runcmd(cmd)
-
-
-
-def pkg_blacklist_check(pkg):
-    cmd = '''grep -q %s /etc/blacklist.package''' %pkg
-    rc = runcmd(cmd)
-    if rc == 0:
-        return True
-    else:
-        return False
-
-def pkg_installed_check(pkg):
-    logging.debug("    Checking if %sis installed",pkg)
-    cmd = "pacman -Q %s " %pkg
-    rc = runcmd(cmd)
-    if rc == 0:
-        return True
-    else:
-        return False
-
-
-def pacinstall(pkg):
-    logging.info("    Checking %s for install",pkg)
-    #extra pkg check
-    if pkg == "xine":
-        pacinstall("xine-ui")
-    elif pkg == "dvdcss":
-        pacinstall("libdvdcss")
-    elif pkg == "webmin":
-        add_service("webmin")
-    elif pkg == "fuppes":
-        pacinstall("fuppes-svn")
-
-    if  not pkg_blacklist_check(pkg):
-        if pkg_installed_check(pkg):
-            logging.info("    %s is already installed, will not install",pkg)
-        else:
-            logging.info("    Installing %s",pkg)
-            cmd ='''pacman --noconfirm -Sf %s ''' %pkg
-            runcmd(cmd)
-    else:
-        logging.info("    %s is blacklisted, will not install",pkg)
-
-def pacremove(pkg):
-    logging.info("    Checking %s for removal",pkg)
-    if pkg == "xine":
-        pacremove("xine-ui")
-    elif pkg == "dvdcss":
-        pacremove("libdvdcss")
-    elif pkg == "webmin":
-        remove_service("webmin")
-
-    if  not pkg_blacklist_check(pkg):
-        if not pkg_installed_check(pkg):
-            logging.info("    %s is not installed, will not remove",pkg)
-        else:
-            logging.info("    Removing %s",pkg)
-            cmd ='''pacman --noconfirm -R  %s ''' %pkg
-            runcmd(cmd)
-    else:
-        logging.info("    %s is blacklisted, will not remove",pkg)
-
-def getpid(process):
-    return commands.getoutput('pidof %s' % process)
-
-def remove_file(filename):
-    logging.debug("    Removing %s", filename)
-    try:
-        os.remove(filename)
-    except:
-        logging.debug("*     Could not remove %s", filename)
-
-
-def restartLCD(RESTART_LCD):
-    if  RESTART_LCD :
-        logging.info("    Restarting lcd server")
-        cmd = "killall -9 mythlcdserver"
-        runcmd(cmd)
-    else:
-        logging.debug("    Not restarting MYTHLCD server")
-
-
-def reloadfe(dbhost,RESTART_LCD):
-    logging.debug("____Start of reloadfe____")
-    if data_config.SYSTEMTYPE == "MythVantage":
-        logging.info("    Clearing Backend cache")
-        cmd = '''/usr/bin/backend_control.sh  clearcache  behost %s''' %dbhost
-        runcmd(cmd)
-
-    restartLCD(RESTART_LCD)
-    for pid in getpid("mythfrontend"):
-        cmd = ''' kill -s USR1 %s ''' %pid
-        #runcmd(cmd)
-        logging.info("    Reloading frontend with pid of %s",pid)
-
-    logging.debug("__End of reloadfe\n")
-
-
-def restartfe(RESTART_LCD):
-    logging.debug("____Start of restartfe____")
-    if data_config.SYSTEMTYPE=="LinHES":
-        logging.debug("    LinHES seems to be running will not restartfe")
-        return
-    logging.info("    Restarting frontend")
-    restartLCD(RESTART_LCD)
-    cmd="killall -9 mythfrontend"
-    runcmd(cmd)
-    cmd="killall -9 welcome"
-    runcmd(cmd)
-    logging.debug("__End of restartfe\n")
-
-
-def udev_trigger():
-    logging.info("    Triggering udev")
-    cmd = "udevadm settle"
-    runcmd(cmd)
-    cmd = "udevadm trigger"
-    runcmd(cmd)
-    cmd = "udevadm settle"
-    runcmd(cmd)
-    cmd = "udevadm trigger"
-    runcmd(cmd)
-
-
diff --git a/abs/mv-core/MythVantage-config/mv_config.py b/abs/mv-core/MythVantage-config/mv_config.py
deleted file mode 100755
index 9ce29f1..0000000
--- a/abs/mv-core/MythVantage-config/mv_config.py
+++ /dev/null
@@ -1,14 +0,0 @@
-# -*- coding: utf-8 -*-
-SYSTEMTYPE="MythVantage"
-MVHOSTNAME="mvi"
-MOUNTPOINT="/new_boot"
-DATAMOUNT="/data"
-MYTHHOME="/data/home/mythtv"
-SQUASHFILE="/tmp/.squashlist"
-SQUASHLIST=("bin","boot","etc","home","lib","opt","root","sbin","usr","var","data")
-NOOPDEBUG="FALSE"
-BACKUPFILE="mythconverg.sql.gz"
-BACKUPPATH="/data/backup/"
-TEMP_TEMPLATES="/tmp/templates"
-SMEDIA="media"
-
diff --git a/abs/mv-core/MythVantage-config/mv_hostype.py b/abs/mv-core/MythVantage-config/mv_hostype.py
deleted file mode 100755
index d6ec0ed..0000000
--- a/abs/mv-core/MythVantage-config/mv_hostype.py
+++ /dev/null
@@ -1,230 +0,0 @@
-# -*- coding: utf-8 -*-
-import logging, mv_common
-import os
-
-config_file = "mv_config"
-data_config = __import__(config_file, globals(), locals(), [])
-
-def setup_ntp(usepool,ntpserver):
-    if usepool:
-        logging.info("Setting ntp server to %s",ntpserver)
-        print '''sed -i "s/pool.ntp.org/$dbhost/g" ${BASE}/etc/ntp.conf'''
-    else:
-        logging.info("Not changing ntp configuration")
-
-def setup_avahi(templates):
-    file="/etc/avahi/services/mysql.service"
-    if not os.path.exists(file):
-        logging.debug("    copying in mysql.service for avahi")
-        try:
-            os.makedirs("/etc/avahi/services")
-        except:
-            logging.debug("    Couldn't create /etc/avahi/services")
-        mv_common.cp_and_log(templates+"/mysql.service",file)
-        cmd="sudo sv restart avahi"
-        mv_common.runcmd(cmd)
-
-def remove_avahi_service():
-    file="/etc/avahi/services/mysql.service"
-    if os.path.exists(file):
-        logging.debug("    Removing avahi mysql.service file")
-        cmd="rm -rf %s" %file
-        mv_common.runcmd(cmd)
-        cmd="sudo sv restart avahi"
-        mv_common.runcmd(cmd)
-
-def setup_db():
-    logging.debug("    Setting up the database")
-
-def setup_mysqlnetwork(EnableNetwork):
-    logging.debug("    Setting up mysql network")
-    mysqlconf = "/etc/my.cnf"
-    cmd = '''grep "#skip-networking" %s ''' %mysqlconf
-    status = mv_common.runcmd(cmd)
-
-    if EnableNetwork :
-        logging.debug("    Enabling mysql networking")
-        if status == 0 :
-            logging.debug("    Network is already enabled for mysql")
-        else:
-            cmd = '''sed -ie "s/^skip-networking/#skip-networking/g" %s ''' %mysqlconf
-            mv_common.runcmd(cmd)
-            mv_common.restart_service("mysqld")
-    else:
-        logging.debug("    Disabling mysql networking")
-        if status == 1 :
-            logging.debug("    Network is already disabled for mysql")
-        else:
-            cmd = '''sed -ie "s/#skip-networking/skip-networking/g" %s ''' %mysqlconf
-            mv_common.runcmd(cmd)
-            mv_common.restart_service("mysqld")
-
-def setup_mysql_connection(systemconfig):
-    logging.info("    Configuring database connection")
-    mythip = systemconfig["mythip"]
-    systemtype = systemconfig["SystemType"]
-    mv_root = systemconfig["MVROOT"]
-    mysqltxt = "/usr/share/mythtv/mysql.txt"
-    templates = systemconfig["TEMPLATES"]
-    mysqltemplate = templates + "/mysql.txt"
-    dbhost = systemconfig["dbhost"]
-
-    if systemtype == "Master_backend":
-        logging.debug("    Setting dbhost to %s in systemconfig", mythip)
-        dbhost = mythip
-        cmd = '''sed -ei "s/^dbhost=.*$/dbhost=\"%s\"/" /etc/systemconfig ''' %dbhost
-        mv_common.runcmd(cmd)
-        logging.debug("    Changing dbhost in settings table for master_backend")
-        cmd = '''%s/bin/restore_default_settings.sh -c BECONFIG -s master -a %s ''' %(mv_root, dbhost)
-        mv_common.runcmd(cmd)
-
-    if systemtype == "Slave_backend":
-        slavehost = mythip
-        logging.debug("    Changing slave in settings: %s", slavehost)
-        cmd = '''%s/bin/restore_default_settings.sh -c BECONFIG -s slave  -a %s ''' %(mv_root, slavehost)
-        mv_common.runcmd(cmd)
-
-    if systemtype == "Master_backend":
-        logging.debug("   changing mysql.txt file to use localhost")
-        cmd = '''sed -e "s/^DBHostName=.*$/DBHostName="localhost"/" %s > %s ''' %(mysqltemplate, mysqltxt)
-        mv_common.runcmd(cmd)
-    else:
-        logging.debug("   changing mysql.txt file to use %s", dbhost)
-        cmd = '''sed -e "s/^DBHostName=.*$/DBHostName=%s/" %s > %s ''' %(dbhost, mysqltemplate, mysqltxt)
-        mv_common.runcmd(cmd)
-
-    delfile = data_config.MYTHHOME + "/.mythtv/mysql.txt"
-    mv_common.remove_file(delfile)
-    delfile = mv_root + "/bin/mythtv/.mythtv/mysql.txt"
-    mv_common.remove_file(delfile)
-    filecheck = data_config.MYTHHOME + "/templates/mysql.txt"
-    if os.path.exists(filecheck):
-        logging.info("    Scrapping all the previous work and using %s for mysql.txt", filecheck)
-        mv_common.cp_and_log(filecheck, mysqltxt)
-
-
-
-def setup_func_key():
-    if data_config.SYSTEMTYPE == "MythVantage":
-        logging.debug("    Grabbing the key for Func")
-        cmd="/usr/MythVantage/bin/grabkey.py"
-        mv_common.runcmd(cmd)
-
-def setup_func_minion(dbhost):
-    logging.info("    Setting up the func minion:")
-    logging.debug("   certmaster is %s:",dbhost)
-    #cmd='''sed -i "s/^certmaster.*$/certmaster = %s/" /etc/func/minion.conf ''' %dbhost
-    #mv_common.runcmd(cmd)
-    cmd='''sed -i "s/^certmaster.*$/certmaster = %s/" /etc/certmaster/minion.conf ''' %dbhost
-    mv_common.runcmd(cmd)
-
-def setup_syslog(dbhost):
-    logging.debug("    Setting syslog to log to %s",dbhost)
-    cmd ='''sed -i "s/^destination d_remote.*$/destination d_remote \{tcp\(\"%s\" port\(514\)\) \;\} \;/" /etc/syslog-ng.conf''' %dbhost
-    return
-
-def hostypeprint(systemconfig):
-    logging.info("______Start of hostype config_____")
-    mv_common.services(systemconfig)
-    install_list=''
-    remove_list=''
-    daemon_list=''
-    daemon_remove_list=''
-    run_mysqlnetwork = False
-
-    if systemconfig["SystemType"] == "Standalone":
-        logging.info("Stand alone system being configured")
-        setup_ntp(False,"null")
-        remove_avahi_service()
-        EnableNetwork = False
-        run_mysqlnetwork = True
-        if systemconfig["hostypec"]:
-            setup_db()
-        install_list=["mysql", "mythdb-initial", "avahi", "portmap", "nfs-utils", "local-website", "myth2ipod", "mythtv-status"]
-        daemon_list=["mysql", "mythbackend", "avahi", "portmap", "nfs-utils", "netfs", "lighttpd"]
-        if data_config.SYSTEMTYPE == "MythVantage":
-          install_list.append('ghosd')
-
-    elif systemconfig["SystemType"] == "Master_backend":
-        logging.info("Master backend system being configured")
-        setup_ntp(False,"null")
-        setup_avahi(systemconfig["TEMPLATES"])
-        install_list=["mysql", "mythdb-initial", "avahi", "portmap", "nfs-utils", "local-website", "myth2ipod", "mythtv-status"]
-        daemon_list=["mysql", "mythbackend", "avahi", "portmap", "nfs-utils", "netfs", "lighttpd"]
-        EnableNetwork = True
-        run_mysqlnetwork = True
-        if data_config.SYSTEMTYPE == "MythVantage":
-            install_list.append('func')
-            daemon_list.append('func')
-            install_list.append('certmaster')
-            daemon_list.append('certmaster')
-            install_list.append('ghosd')
-
-    elif systemconfig["SystemType"] == "Slave_backend":
-        logging.info("Slave backend  system being configured")
-        setup_ntp(True,systemconfig["dbhost"])
-        remove_avahi_service()
-        if systemconfig["hostypec"]:
-            setup_db()
-        install_list = ["portmap", "nfs-utils", "local-website", "avahi", "libmysqlclient" ]
-        daemon_list = ["mythbackend", "portmap", "nfs-utils", "netfs", "lighttpd", "avahi" ]
-        daemon_remove_list=('mysql')
-        if data_config.SYSTEMTYPE == "MythVantage":
-            install_list.remove("local-website")
-            daemon_list.remove("lighttpd")
-            install_list.append('func')
-            daemon_list.append('funcd')
-            remove_list.append("lighttpd")
-            install_list.append('ghosd')
-
-
-    elif systemconfig["SystemType"] == "Frontend_only":
-        logging.info("Frontend only system being configured")
-        setup_ntp(True,systemconfig["dbhost"])
-        remove_avahi_service()
-        install_list=["mysql-clients", "libmysqlclient",  "avahi", "portmap", "nfs-utils", "local-website"]
-        remove_list=["mysql"]
-        daemon_list=["mysql", "mythbackend", "avahi", "portmap", "nfs-utils", "netfs", "lighttpd"]
-        daemon_remove_list=("mysql", "mythbackend")
-        if data_config.SYSTEMTYPE == "MythVantage":
-            install_list.remove("local-website")
-            daemon_list.remove("lighttpd")
-            install_list.append('func')
-            daemon_list.append('funcd')
-            remove_list.append("lighttpd")
-            install_list.append('ghosd')
-
-
-    for pkg in install_list:
-        mv_common.pacinstall(pkg)
-    for pkg in remove_list:
-        mv_common.pacinstall(pkg)
-    for daemon in daemon_list:
-        mv_common.add_service(daemon)
-    for daemon in daemon_remove_list:
-        mv_common.remove_service(daemon)
-    if systemconfig["RunFrontend"] == "1":
-        logging.debug("   Will run the frontend")
-        mv_common.add_service("frontend")
-        mv_common.add_service("hal")
-        if data_config.SYSTEMTYPE == "MythVantage":
-            mv_common.add_service("ghosd")
-    else:
-        logging.debug("   Will NOT run the frontend")
-        mv_common.remove_service("frontend")
-        mv_common.remove_service("hal")
-        if data_config.SYSTEMTYPE == "MythVantage":
-            mv_common.remove_service("ghosd")
-
-
-    if run_mysqlnetwork:
-        setup_mysqlnetwork(EnableNetwork)
-    else:
-        logging.debug("    Not running setup_mysql_connection")
-
-    setup_mysql_connection(systemconfig)
-    if data_config.SYSTEMTYPE == "MythVantage":
-        setup_func_minion(systemconfig["dbhost"])
-        setup_func_key()
-        setup_syslog(systemconfig["dbhost"])
-    logging.info("__End of hostype config\n")
diff --git a/abs/mv-core/MythVantage-config/mv_install.py b/abs/mv-core/MythVantage-config/mv_install.py
deleted file mode 100755
index 7d72c22..0000000
--- a/abs/mv-core/MythVantage-config/mv_install.py
+++ /dev/null
@@ -1,1434 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-import sys,  os,  commands,  glob,  time
-import getopt,  re,  MySQLdb
-import logging
-try:
-    import parted
-except:
-    print "module parted not found"
-
-def usage():
-    print "help text:"
-    print "example usage:  --rootdisk=sda --rootfs=ext4 --rootsize=34240 --datafs=ext4 --datasize=3400 --datadisk=sda --swapsize=340 -c full_install"
-
-def clean_upgrade():
-    return False
-
-def error_out(errmsg):
-    cmd = '''echo %s >> /tmp/.install_error ''' %errmsg
-    runcmd(cmd)
-    logging.critical("***********************************")
-    logging.critical("error: %s",errmsg)
-    print "***********************************"
-    print "ERROR: mv_install.py: %s" %errmsg
-    print "***********************************"
-    sys.exit(1)
-
-
-def update_db(value, data):
-    db = MySQLdb.connect(host="localhost",  user="mythtv",  passwd="mythtv",  db="mythconverg")
-    try:
-        cursor = db.cursor()
-        cursor.execute("DELETE FROM settings where value=%s and hostname=%s;", (value, data_config.MVHOSTNAME))
-        cursor.execute("REPLACE INTO  settings set value=%s, data=%s, hostname=%s;", (value, data, data_config.MVHOSTNAME))
-        logging.debug("Updated database  with %s, %s", data, value)
-    except  MySQLdb.Error,  e:
-        logging.debug("Unable to update database with %s, %s", data, value)
-
-
-def progress(pgnum):
-    progressline = str(pgnum) + "% complete"
-    logging.debug("Progress: %s",  pgnum)
-    f = open('/tmp/.install_percent',  'w')
-    f.write(progressline)
-    f.close()
-
-def update_status(status):
-    logging.debug("Status: %s",  status)
-    f = open('/tmp/.install_state',  'w')
-    f.write(str(status))
-    f.close()
-
-def kill_dhcp_chroot():
-    logging.debug("Killing off chroot dhcpcd")
-    stddir = os.getcwd()
-    piddir = ("%s/var/run/") %data_config.MOUNTPOINT
-    try:
-        os.chdir(piddir)
-        for FILE in glob.glob("dhcpcd-*.pid"):
-            f = open(FILE, 'r')
-            pid = f.readline()
-            f.close()
-            cmd = "kill -9 %s" %pid
-            runcmd(cmd)
-            os.remove(FILE)
-        os.chdir(stddir)
-    except:
-        pass
-
-def statgrab(disk):
-    cmd = "statgrab -M disk. |grep %s.write_bytes" % hostoptions["rootdisk"]
-    out = commands.getoutput(cmd)
-    try:
-        prewritebytes = out.split("=")[1].strip()
-    except:
-        prewritebytes = "1024"
-    outline = "STARTSIZE=%s" %prewritebytes
-    f = open('/tmp/.startsize.io',  'w')
-    f.write(str(outline))
-    f.close()
-
-def backup_sql_check():
-    logging.debug("Searching for backup file")
-    try:
-        hostoptions["backupfile"]
-    except:
-        logging.debug("Backup file var is empty")
-        return False
-    if os.path.exists(data_config.MOUNTPOINT+hostoptions["backupfile"]):
-        logging.debug("Backup file %s is present", data_config.MOUNTPOINT+hostoptions["backupfile"])
-        return True
-    else:
-        logging.debug("Backup file %s is NOT present", data_config.MOUNTPOINT+hostoptions["backupfile"])
-        return False
-
-def mdadm_find(PREFIX):
-    logging.debug("Searching for mdadm.conf")
-    if os.path.exists(PREFIX+"/etc/KnoppMyth-version"):
-        mdadmconf = "/etc/mdadm/mdadm.conf"
-    else:
-        mdadmconf = "/etc/mdadm.conf"
-    logging.debug("Using %s for mdadm.conf", mdadmconf)
-    return mdadmconf
-
-def mdadm_assemble_all():
-    # read mdadm.conf and start the arrays
-    #ARRAY /dev/md5 uuid=19464854:03f71b1b:e0df2edd:246cc977
-    logging.debug("Starting mdadm support")
-    mdadmconf_file = mdadm_find("/tmp")
-    cmd = "cdadm --assemble --scan -c /tmp/%s" %mdadmconf_file
-    runcmd(cmd)
-    mdadm_contents = ''
-    try:
-        f = open(mdadmconf_file,  'r')
-        mdadm_contents = f.readlines()
-        f.close()
-    except:
-        logging.debug("     Couldn't open mdadmconf file")
-    for line in mdadm_contents:
-        if line.startswith("ARRAY"):
-            logging.debug("     Found MD array: %s", line)
-            array = line.split()[1]
-            logging.info("      assembling array: %s", array)
-            cmd = "mdadm --assemble -c /tmp%s %s" %(mdadmconf_file, array)
-            runcmd(cmd)
-            time.sleep(2)
-            cmd = "fsck -p %s" %array
-            runcmd
-
-def copy_updates():
-    try:
-        MVROOT = os.environ["MV_ROOT"]
-    except:
-        logging.debug("MVROOT was not defined,  using the default value")
-        MVROOT = "/usr/MythVantage"
-    cp_and_log2(MVROOT+"/bin/", data_config.MOUNTPOINT+MVROOT+"/bin", "*.sh")
-    cp_and_log2(MVROOT+"/bin/", data_config.MOUNTPOINT+MVROOT+"/bin", "*.py")
-
-def timezone_to_db(timefile):
-    logging.info("importing timezone")
-    try:
-        f = open(timefile)
-        timezonecontents = f.readline().strip()
-        f.close()
-    except:
-        logging.debug("Couldn't open /tmp/etc/timezone, will not set the timezone")
-        return
-    update_db("HostTimeZone", timezonecontents);
-    tzsplit = timezonecontents.partition('/')
-    print tzsplit
-    if tzsplit[2]  == '' :
-        update_db("HostTimeZoneRegion", tzsplit[0])
-    else:
-        update_db("HostTimeZoneRegion", tzsplit[0])
-        tztemp="HostTimeZoneRegion_%s" % tzsplit[0]
-        update_db(tztemp, tzsplit[2])
-
-
-
-def cp_and_log(srcfile, destfile):
-    #return
-    if not os.path.exists(srcfile):
-        logging.info("%s is not present,  skipping...", srcfile)
-    else:
-        cmd = ("rsync -arvp %s %s") %(srcfile, destfile)
-        runcmd(cmd)
-
-def cp_and_log2(srcfile, destfile, fileglob):
-    #return
-    logging.debug("cp_and_log2")
-    logging.debug("%s,  %s,  %s", srcfile, destfile,  fileglob)
-
-    if not os.path.exists(srcfile):
-        logging.info("%s is not present,  skipping...", srcfile)
-    else:
-        if fileglob == '':
-            cmd = ("rsync -arvp %s %s") %(srcfile, destfile)
-            runcmd(cmd)
-        else:
-            fileglob = "*"
-            cmd = ("rsync -arvp %s/%s %s") %(srcfile, fileglob, destfile)
-            runcmd(cmd)
-
-def runcmd(cmd):
-    if data_config.NOOPDEBUG == "FALSE":
-        pass
-    else:
-        cmd = "echo "+cmd
-    logging.debug("    %s", cmd)
-    cmdout = commands.getstatusoutput(cmd)
-    logging.debug("    %s", cmdout)
-    return cmdout
-
-def mysqldb(cmd, inchroot):
-    if cmd == "start":
-        mycmd = "  /etc/rc.d/mysqld start"
-    elif cmd == "stop":
-        mycmd = "  /etc/rc.d/mysqld stop"
-    if inchroot == "chroot":
-        mycmd = "  chroot /newboot %s" %mycmd
-    runcmd(mycmd)
-
-
-def mount_bind_chroot():
-    logging.debug("Mounting dev/proc/sysfs for chroot")
-    cmd = "  mount --bind /dev %s" %data_config.MOUNTPOINT+"/dev"
-    runcmd(cmd)
-    cmd = "  mount --bind /dev/pts %s" %data_config.MOUNTPOINT+"/dev/pts"
-    runcmd(cmd)
-    cmd = "  mount --bind /proc %s" %data_config.MOUNTPOINT+"/proc"
-    runcmd(cmd)
-    cmd = "  mount -t sysfs none  %s" %data_config.MOUNTPOINT+"/sys"
-    runcmd(cmd)
-
-
-def umount_bind_chroot():
-    logging.debug("UnMounting dev/proc/sysfs for chroot")
-    cmd = "  umount -l %s" %data_config.MOUNTPOINT+"/dev/pts"
-    runcmd(cmd)
-    cmd = "  umount -l %s" %data_config.MOUNTPOINT+"/dev"
-    runcmd(cmd)
-    cmd = "  umount -l %s" %data_config.MOUNTPOINT+"/proc"
-    runcmd(cmd)
-    cmd = "  umount -l %s" %data_config.MOUNTPOINT+"/sys"
-    runcmd(cmd)
-
-
-def blank_table(diskdevice):
-    logging.debug("    writing new parition table for %s", diskdevice)
-    logging.debug("parition table before:")
-    cmd = "fdisk -l %s" %diskdevice
-    runcmd(cmd)
-
-    cmd = "echo w |fdisk %s" %diskdevice
-    runcmd(cmd)
-
-    logging.debug("parition table after:")
-    cmd = "fdisk -l %s" %diskdevice
-    runcmd(cmd)
-
-def partitions_removeall(diskdevice, label):
-    logging.info("Removing all partitions for %s  %s", label, diskdevice)
-    try:
-        device = parted.getDevice(diskdevice)
-        partdisk = parted.Disk(device)
-        partdisk.deleteAllPartitions()
-        if data_config.NOOPDEBUG == "FALSE":
-            partdisk.commit()
-        for partition in partdisk.partitions:
-            print "type: %s" %partition.type
-    except:
-        logging.debug("   Error reading parition table, attempting to write a blank one")
-        blank_table(diskdevice)
-
-
-def create_partitions(diskdevice, size, ptype, startsector):
-    logging.debug("_____Create partitions______")
-    if size == "NO":
-        logging.info("Size is 0,  skipping")
-        return "NO"
-    partlist = []
-    newstart = 0
-    totalused = 0
-    device = parted.getDevice(diskdevice)
-    partdisk = parted.Disk(device)
-    for partition in partdisk.partitions:
-        if partition.type != parted.PARTITION_FREESPACE:
-            partlist.append((partition,
-                        partition.path,
-                        partition.getFlag(parted.PARTITION_BOOT),
-                        partition.geometry.start,
-                        partition.geometry.end,
-                        partition.geometry.length,
-                        partition.type,
-                        partition.fileSystem))
-    for slice in partlist:
-        (usedpartition,  usedpath,  usedbootable,  usedstart,  usedend,  usedlength,  usedtype,  usedfs) = slice
-        #Start the new partition one after the end of last
-        newstart = usedend+1
-
-    if  startsector == 0:
-        newstart = 0
-    if size == "ALL":
-        logging.debug("     Using the rest of the disk  %s", (device.length-newstart) )
-        try:
-            geom = parted.Geometry(device=device,  start=newstart,  length=(device.length-newstart))
-        except:
-            logging.info("An error occured,  probably invalid parition size")
-            return
-    else:
-        # convert size in MB to a length on the device in sectors
-        length = (int(size) * (1024 * 1024)) / device.sectorSize
-        logging.debug("Size is %s", length)
-        try:
-            geom = parted.Geometry(device=device,  start=newstart,  length=length)
-        except:
-            logging.info("An error occured,  probably invalid parition size")
-            error_out("invalid parition size")
-
-    #collect device constraint
-    constraint = device.getConstraint()
-    # new partition
-    if ptype == "NORMAL":
-        newpart = parted.Partition(disk=partdisk, type=parted.PARTITION_NORMAL,  geometry=geom)
-    elif ptype == "SWAP":
-        newpart = parted.Partition(disk=partdisk, type=parted.PARTITION_NORMAL,  geometry=geom)
-
-    #add the partition to the disk and commit changes
-    partdisk.addPartition(partition=newpart,  constraint=constraint)
-    if data_config.NOOPDEBUG == "FALSE":
-        partdisk.commit()
-    logging.info("created partition %s of %dMB and added it to %s" %
-                (newpart.getDeviceNodeName(),  newpart.getSize(),  diskdevice))
-    return newpart.getDeviceNodeName()
-
-def set_active_parition(diskdevice):
-        """ Set the bootable flag for this partition. """
-        logging.debug("    Setting active parition")
-        device = parted.getDevice(diskdevice)
-        partdisk = parted.Disk(device)
-        try:
-            for partition in partdisk.partitions:
-                partition.setFlag(parted.PARTITION_BOOT)
-            partdisk.commit()
-        except:
-            logging.info("    Couldn't set the active partition")
-            logging.info("    Depending on your system this may not matter")
-
-
-def partition_disk():
-    global hostoptions
-    logging.info("Partitioning")
-    logging.debug("____start of partition_disk____")
-    rootdisk = hostoptions["rootdisk"]
-    datadisk = hostoptions["datadisk"]
-    label = "root"
-    partitions_removeall("/dev/"+rootdisk, label)
-    label = "data"
-    partitions_removeall("/dev/"+datadisk, label)
-    hostoptions["rootpartition"] = create_partitions("/dev/"+rootdisk, hostoptions["rootsize"], "NORMAL", 0)
-    set_active_parition("/dev/"+rootdisk)
-    hostoptions["swappartition"] = create_partitions("/dev/"+rootdisk, hostoptions["swapsize"], "SWAP", 1)
-    if datadisk != rootdisk:
-        hostoptions["datapartition"] = create_partitions("/dev/"+datadisk, hostoptions["datasize"], "NORMAL", 0)
-    else:
-        hostoptions["datapartition"] = create_partitions("/dev/"+datadisk, hostoptions["datasize"], "NORMAL", 1)
-    time.sleep(5)
-
-def fscmd(fstype):
-    fscmds = {"reiserfs":"mkreiserfs -q -l ROOT",  "xfs": "mkfs -t xfs -f",  "ext3": "mkfs.ext3", "jfs":"mkfs.jfs -q", "ext4":"mkfs.ext4", "Do_not_format":"noformat", "no_format":"noformat"}
-    try:
-        rc = fscmds[fstype]
-    except:
-        logging.critical(" %s is not a valid fs type,  exiting now", fstype)
-        error_out("Error mvinstall during format")
-    return rc
-
-
-def format_disk(install_type):
-    logging.info("______Starting Disk Format______")
-    rootfs = fscmd(hostoptions["rootfs"])
-    datafs = fscmd(hostoptions["datafs"])
-
-    rootdisk = hostoptions["rootdisk"]
-    datadisk = hostoptions["datadisk"]
-    rootpartition = hostoptions["rootpartition"]
-    datapartition = hostoptions["datapartition"]
-    if install_type != "upgrade":
-        swapsize = hostoptions["swapsize"]
-        swappartition = hostoptions["swappartition"]
-
-    logging.debug("     Format command for rootfs  %s : %s ",  rootfs, rootpartition)
-    if ( rootfs != "noformat"):
-        logging.info("Starting format of %s", rootpartition)
-        cmd = "  %s /dev/%s" %( rootfs,  rootpartition)
-        #os.system(cmd)
-        runcmd(cmd)
-    else:
-        logging.info("Will not format root partition: %s", rootpartition)
-
-    logging.debug("     Format command for datafs  %s : %s ",  datafs, datapartition)
-    if (datafs != "noformat"):
-        logging.info("Starting format of %s", datapartition)
-        cmd = "  %s /dev/%s" %( datafs,  datapartition)
-        #os.system(cmd)
-        runcmd(cmd)
-    else:
-        logging.info("Will not format data partition: %s",  datapartition)
-
-    if install_type == "install":
-        if (hostoptions["swapsize"] != "NO"):
-            logging.info("Starting format for swap %s", swappartition)
-            cmd = "  mkswap /dev/%s" % swappartition
-            #os.system(cmd)
-            runcmd(cmd)
-        else:
-            logging.debug("     Swap is set to NO,  will not run mkswap")
-
-    logging.debug("_____End of format______")
-
-
-def mount_it():
-    logging.info("______Mounting disk______")
-#   Create mount points
-    try:
-        mountpoint = data_config.MOUNTPOINT
-        mp = mountpoint
-        logging.info("Creating mountpoints %s", mp)
-        os.makedirs(mp)
-    except OSError:
-        logging.debug("     Could not create %s", mp)
-
-#   Mount root
-    cmd = "mount /dev/%s %s"  %(hostoptions["rootpartition"], mountpoint)
-    runcmd(cmd)
-    #logging.debug(cmd)
-    #cmdout=commands.getoutput(cmd)
-    #logging.debug(cmdout)
-#   Mount data
-#make mountpoint after mounting /
-    try:
-        mountpoint = data_config.MOUNTPOINT
-        datapoint = data_config.DATAMOUNT
-        mp = mountpoint+datapoint
-        logging.info("Creating mountpoints %s", mp)
-        os.makedirs(mp)
-    except OSError:
-        logging.debug("     Could not create %s", mp)
-
-    cmd = "mount /dev/%s %s"  %(hostoptions["datapartition"], mp)
-    runcmd(cmd)
-    #logging.debug(cmd)
-    #cmdout=commands.getoutput(cmd)
-    #logging.debug(cmdout)
-
-def unmount_it():
-    logging.info("______Unmounting disk______")
-    cmd = "umount  %s"  %(data_config.MOUNTPOINT+data_config.DATAMOUNT)
-    runcmd(cmd)
-    time.sleep(2)
-
-    cmd = "swapoff /dev/%s" %(hostoptions["swappartition"])
-    runcmd(cmd)
-
-    cmd = "sync"
-    runcmd(cmd)
-
-    cmd = "umount   %s"  %(data_config.MOUNTPOINT)
-    runcmd(cmd)
-    cmd = "sync"
-    runcmd(cmd)
-
-
-def create_squashlist():
-    logging.debug("Creating squashlist")
-    squashfile = data_config.SQUASHFILE
-    f = open(squashfile,  'w')
-    for i in data_config.SQUASHLIST:
-        f.write(i)
-        f.write("\n")
-        logging.debug(i)
-    f.close()
-
-
-def copy_it(install_type):
-    logging.info("______Transferring to disk______")
-    logging.debug(  install_type)
-    if ( install_type == "install"):
-        logging.info("Transferring system")
-        cmd = "  unsquashfs -f -d %s /.livesys/medium/system.sqf" %(data_config.MOUNTPOINT)
-        runcmd(cmd)
-        #logging.debug(cmd)
-        #cmdout=commands.getoutput(cmd)
-
-    if ( install_type == "upgrade"):
-        logging.info("Upgrading system")
-        create_squashlist()
-        cmd = "  unsquashfs -e %s -f -d %s /.livesys/medium/system.sqf" %(data_config.SQUASHFILE,  data_config.MOUNTPOINT)
-        runcmd(cmd)
-        #logging.debug(cmd)
-        #cmdout=commands.getoutput(cmd)
-#   Create the missing dir
-    i = ("sys", "proc", "dev", "tmp", "mnt", "media", "media/cdrom", "media/dvd", "var/log/mythtv")
-    mountpoint = data_config.MOUNTPOINT
-    for item in i:
-        try:
-            mp = mountpoint+"/"+item
-            logging.info("Creating mountpoints %s", mp)
-            os.makedirs(mp)
-        except OSError:
-            logging.debug("     __Could not create %s", mp)
-#   General fixup
-    cmd = "chmod 777 %s/tmp" %(data_config.MOUNTPOINT)
-    runcmd(cmd)
-    cmd = "mknod %s/dev/null c 1 5" %(data_config.MOUNTPOINT)
-    runcmd(cmd)
-    cmd = "mknod %s/dev/console c 5 1" %(data_config.MOUNTPOINT)
-    runcmd(cmd)
-    cmd = "chmod +s  %s/usr/bin/Xorg" %(data_config.MOUNTPOINT)
-    runcmd(cmd)
-    cmd = "chmod +s  %s/usr/bin/crontab" %(data_config.MOUNTPOINT)
-    runcmd(cmd)
-    cmd = "chmod +s  %s/usr/bin/sudo" %(data_config.MOUNTPOINT)
-    runcmd(cmd)
-    cmd = "chmod +s  %s/bin/mount" %(data_config.MOUNTPOINT)
-    runcmd(cmd)
-    logging.debug("__End of copy_it__")
-
-def create_fstab(extralines):
-    logging.debug("______Creating new fstab file_______")
-    logging.info("Creating new fstab file")
-    fstabfile = data_config.MOUNTPOINT+"/etc/fstab"
-    fstab_list = []
-    f = open(fstabfile,  'w')
-    line = '''# <file system>        <dir>         <type>    <options>          <dump> <pass> \n'''
-    fstab_list.append(line)
-    line = '''none                   /dev/pts      devpts    defaults            0      0 \n'''
-    fstab_list.append(line)
-    line = '''none                   /dev/shm      tmpfs     defaults            0      0\n'''
-    fstab_list.append(line)
-    line = '''/dev/cdrom /media/cdrom   auto    ro,user,noauto,unhide   0      0\n'''
-    fstab_list.append(line)
-    line = '''/dev/dvd /media/dvd   auto    ro,user,noauto,unhide   0      0\n'''
-    fstab_list.append(line)
-    line = '''UUID=ROOTUID /  auto defaults,noatime 0 1\n'''
-    fstab_list.append(line)
-    line = '''UUID=DATAUID %s  auto defaults,noatime 0 1\n''' %(data_config.DATAMOUNT)
-    fstab_list.append(line)
-    line = '''UUID=SWAPUID swap swap defaults  0 0 \n'''
-    fstab_list.append(line)
-    for vline in extralines:
-        fstab_list.append(vline)
-    for outline in fstab_list:
-        logging.debug(outline)
-        f.write(outline)
-    f.close()
-
-def find_uuid(partition):
-    logging.info("Finding the UUID for %s...", partition)
-    cmd = "blkid -s UUID /dev/%s" %partition
-    tmpuuid = runcmd(cmd)[1]
-    splituuid = tmpuuid.partition("=")
-    uuid = splituuid[2].replace('"', "")
-    logging.info("The uuid is %s", uuid)
-    return uuid.strip()
-
-def pick_out_vg():
-    logging.info("Searching for Volume Groups in old fstab")
-    vglines = []
-    f = open("/tmp/etc/fstab",  'r')
-    oldfscontents = f.readlines()
-    for line in oldfscontents:
-        if line.startswith("/dev/vg"):
-            vglines.append(line)
-            templine = line.split()
-            mdir = templine[1]
-            if not os.path.exists (mdir):
-                logging.debug("Creating dir %s for VG mount", mdir)
-                os.makedirs (mdir)
-#               Might need to os.chown to mythtv:users
-            else:
-                logging.debug("Directory %s for VG mount already present", mdir)
-    return vglines
-
-def fstab_it(install_type):
-    logging.info("______Checking fstab______")
-    kmvg = []
-    fstabfile = data_config.MOUNTPOINT+"/etc/fstab"
-#   Check for knoppmyth install,  if found create new
-    if install_type == "upgrade":
-        if os.path.exists("/tmp/etc/KnoppMyth-version"):
-            logging.debug("     KnoppMyth-Version found,  creating new fstab")
-            kmvg = pick_out_vg()
-            create_fstab(kmvg)
-        elif os.path.exists("/tmp/etc/fstab"):
-            logging.debug("     Upgrade and not Knoppmyth,  using old fstab")
-            cp_and_log("/tmp/etc/fstab", fstabfile)
-#   Catch all for creating new fstab
-    if not os.path.exists(data_config.MOUNTPOINT+"/etc"):
-        os.makedirs(data_config.MOUNTPOINT+"/etc")
-    if not os.path.exists(fstabfile):
-        create_fstab(kmvg)
-
-    logging.info("____UUID check for %s",  "swap")
-    swapuuid = find_uuid(hostoptions["swappartition"])
-
-    logging.info("____UUID check for %s",  "data")
-    datauuid = find_uuid(hostoptions["datapartition"])
-
-    logging.info("____UUID check for %s",  "root")
-    rootuuid = find_uuid(hostoptions["rootpartition"])
-
-    fstabfile = data_config.MOUNTPOINT+"/etc/fstab"
-    logging.info("Correcting UUID's in %s", fstabfile)
-    f = open(fstabfile,  'r')
-    oldfscontents = f.readlines()
-    newfstab = []
-    f.close()
-    for line in oldfscontents:
-        if line.startswith("UUID"):
-            templine = line.split()
-            if ( templine[1] == "/"):
-                logging.debug("     Found Root fstab line:")
-                logging.debug(      templine)
-                templine[0] = "UUID=%s" %(rootuuid)
-                newline = ''
-                for i in templine:
-                    newline+=i
-                    newline+="    "
-                newline+="\n"
-                logging.debug("     New fstab line:")
-                logging.debug(      newline)
-                newfstab.append(newline)
-
-            if ( templine[1] == data_config.DATAMOUNT):
-                logging.debug("     Found DATA mount")
-                logging.debug(      templine)
-                templine[0] = "UUID=%s" %(datauuid)
-                newline = ''
-                for i in templine:
-                    newline+=i
-                    newline+="    "
-                newline+="\n"
-                logging.debug("     New fstab line:")
-                logging.debug(      newline)
-                newfstab.append(newline)
-
-            if ( templine[1] == "swap"):
-                if len(swapuuid) <= 5:
-                    logging.debug("     swapp uuid is to small")
-                else:
-                    logging.debug("     Found swap partition")
-                    logging.debug(      templine)
-                    templine[0] = "UUID=%s" %(swapuuid)
-                    newline = ''
-                    for i in templine:
-                        newline+=i
-                        newline+="    "
-                    newline+="\n"
-                    logging.debug("     New fstab line:")
-                    logging.debug(      newline)
-                    newfstab.append(newline)
-        else:
-            logging.debug("     Line didn't match,  adding to newfstab:")
-            logging.debug(      line)
-            newfstab.append(line)
-    logging.info("Writing out newfstab")
-    logging.debug("______This is the new fstab_____")
-    f = open(fstabfile,  'w')
-    for line in newfstab:
-        logging.debug(line)
-        f.write(line)
-        #f.write("\n")
-    f.close()
-
-def grub_it():
-    logging.info("______Start of grub install______")
-    cmd = "  grub-install --recheck --no-floppy --root-directory=%s \"(hd0)\" "  % data_config.MOUNTPOINT
-    logging.info("Running grub-install")
-    runcmd(cmd)
-    rootuuid = find_uuid(hostoptions["rootpartition"])
-    cmd = "  mkinitcpio -g %s/boot/kernel26.img" % data_config.MOUNTPOINT
-    logging.info("Running mkinitcpio")
-    runcmd(cmd)
-    logging.info("Adding root uuid to grub menu")
-    grubfile = data_config.MOUNTPOINT+"/boot/grub/menu.lst"
-    try:
-        f = open(grubfile,  'r')
-        oldgrub = f.readlines()
-        newgrub = []
-        f.close()
-        for line in oldgrub:
-            if line.startswith("kernel"):
-                templine = line.split()
-                logging.debug("     Found kernel Root grubline:")
-                logging.debug(      templine)
-                templine[2] = "root=/dev/disk/by-uuid/%s" %(rootuuid)
-                newline = ''
-                for i in templine:
-                    newline+=i
-                    newline+="    "
-                newline+="\n"
-                logging.debug("     New grub menu.lst  line:")
-                logging.debug(      newline)
-                newgrub.append(newline)
-            else:
-                logging.debug("Line didn't match,  adding to newgrub:")
-                logging.debug(      line)
-                newgrub.append(     line)
-        logging.info("Writing out new grub file")
-        logging.debug("______This is the new grub_____")
-        f = open(grubfile,  'w')
-        for line in newgrub:
-            logging.debug(line)
-            f.write(line)
-        f.close()
-    except:
-        logging.debug("Couldn't open grub file")
-
-def fix_permissions():
-    logging.info("Fixing permissions")
-    SE = os.environ["TEMPLATES"]+"/settings/syssettings"
-    cmd = "  chmod -R 755  %s" %(data_config.MOUNTPOINT+SE)
-    runcmd(cmd)
-    cmd = "  chmod 775  %s" %(data_config.MOUNTPOINT+"/etc/systemconfig")
-    runcmd(cmd)
-    cmd = "  chmod 755  %s" %(data_config.MOUNTPOINT+"/root")
-    runcmd(cmd)
-    cmd = "  chown root:mythtv  %s" %(data_config.MOUNTPOINT+"/etc/systemconfig")
-    runcmd(cmd)
-    cmd = "  chown -R mythtv:mythtv  %s" %(data_config.MOUNTPOINT+SE)
-    runcmd(cmd)
-    cmd = "  chown -R mythtv:mythtv  %s" %(data_config.MOUNTPOINT+"/var/log/mythtv")
-    runcmd(cmd)
-
-def apply_new_auth():
-    logging.info("_____Applying Password updates_______")
-    passfile = "/root/myth_user_call.out"
-    try:
-        MVROOT = os.environ["MV_ROOT"]
-    except:
-        logging.debug("MVROOT was not defined,  using the default value")
-        MVROOT = "/usr/MythVantage"
-    if data_config.NOOPDEBUG == "FALSE":
-        cmdprefix = "chroot " + data_config.MOUNTPOINT + " " + MVROOT+"/bin/myth_user_call -i "
-    else:
-        cmdprefix = "echo chroot " + data_config.MOUNTPOINT + " " + MVROOT+"/bin/myth_user_call -i "
-    try:
-        f = open(passfile,  'r')
-        passcmds = f.readlines()
-        f.close()
-        for cmd in passcmds:
-            execmd = cmdprefix+cmd
-#            Using os.system because runcmd fails
-            logging.debug(execmd)
-            os.system(execmd)
-    except:
-        logging.debug("Applying password updates failed,  couldn't open %s", passfile)
-    logging.debug
-
-def add_to_blacklist(module):
-    rcfile = data_config.MOUNTPOINT + "/etc/rc.conf"
-    logging.debug("    Attempting to add %s to blacklist", module)
-    newline=''
-    try:
-        f = open(rcfile, 'r')
-        conflines = f.readlines()
-        f.close()
-    except:
-        logging.critical("    *Couldn't open %s for reading",rcfile)
-        return
-
-    try:
-        f = open(rcfile, 'w')
-    except:
-        logging.critical("    *Couldn't open %s for reading",rcfile)
-        return
-
-    for line in conflines:
-        newline = line
-        if re.match("MOD_BLACKLIST",line):
-            logging.debug(line)
-            try:
-                lastpar = line.rindex(')')
-                logging.debug("    found ) at %s", lastpar)
-                newline = line[:lastpar] +" !" + module + " " + line[lastpar:]
-                logging.debug(newline)
-            except:
-                logging.debug("Couldn't find ending )")
-                newline = line
-        f.write(newline)
-    f.close()
-
-
-def add_to_modulelist(module):
-    rcfile = data_config.MOUNTPOINT + "/etc/rc.conf"
-    logging.debug("    Attempting to add %s to modulelist", module)
-    newline=''
-    try:
-        f = open(rcfile, 'r')
-        conflines = f.readlines()
-        f.close()
-    except:
-        logging.critical("    *Couldn't open %s for reading",rcfile)
-        return
-
-    try:
-        f = open(rcfile, 'w')
-    except:
-        logging.critical("    *Couldn't open %s for reading",rcfile)
-        return
-
-    for line in conflines:
-        newline = line
-        if re.match("MODULES=",line):
-            logging.debug(line)
-            try:
-                lastpar = line.rindex(')')
-                logging.debug("    found ) at %s", lastpar)
-                newline = line[:lastpar] +" " + module + " " + line[lastpar:]
-                logging.debug(newline)
-            except:
-                logging.debug("Couldn't find ending )")
-                newline = line
-        f.write(newline)
-    f.close()
-
-
-
-def special_hardware_check():
-    logging.info("_____Applying special boot parameters_______")
-    try:
-        f = open('/proc/cmdline', 'r')
-        bootoptions = f.readlines()
-        f.close()
-    except:
-        logging.critical("    *Couldn't open /proc/cmdline")
-        return
-    bootoptions =  bootoptions[0].split()
-    logging.debug("    Boot options: %s", bootoptions)
-    for item in bootoptions:
-        logging.debug(item)
-        if re.match("disablemodules",item) != None :
-            logging.debug("    Found disabledmodules")
-            modulelist = item.split("=")[1]
-            for module in modulelist.split(','):
-                add_to_blacklist(module)
-
-        if re.match("modules",item) != None :
-            logging.debug("    Found modules")
-            modulelist = item.split("=")[1]
-            for module in modulelist.split(','):
-                add_to_modulelist(module)
-
-        if re.match("type",item) != None :
-            logging.debug("    Found special hardware type")
-            try:
-                typefile = open(data_config.MOUNTPOINT + "/myth/.special_hardware_type", 'w')
-                typelist = item.split("=")[1]
-                # there should be only one special hardware type, but this will handle multiples, just in case
-                for type in typelist.split(','):
-                    typefile.write(type)
-                    typefile.write("\n")
-                typefile.close()
-            except:
-                logging.debug("Couldn't write to file: ", typefile)
-        if re.match("no_meth",item) != None :
-          cmd = "  touch %s%s/.no_meth" %(data_config.MOUNTPOINT, data_config.MYTHHOME)
-          runcmd(cmd)
-
-def swapsearch():
-#currently unused!
-    partlist = []
-    stddir = os.getcwd()
-    os.chdir("/sys/block")
-    partitionlist = glob.glob("*")
-    for item in partitionlist:
-        try:
-            newitem = item.strip().rpartition(" ")[2]
-            if (not newitem == '') and  (not newitem.startswith("loop")):
-                path = "/dev/"+newitem.strip()
-                path = path.strip()
-                device = parted.getDevice(path)
-                (cylinders,  heads,  sectors) = device.biosGeometry
-                sizeInBytes = device.length * device.sectorSize
-                disk = parted.Disk(device)
-                for partition in disk.partitions:
-                    if partition.type == parted.PARTITION_PROTECTED or \
-                    partition.type == parted.PARTITION_METADATA or \
-                    partition.type == parted.PARTITION_FREESPACE:
-                        continue
-
-                    partlist.append((partition,
-                                    partition.path,
-                                    partition.getFlag(parted.PARTITION_BOOT),
-                                    partition.geometry.start,
-                                    partition.geometry.end,
-                                    partition.geometry.length,
-                                    partition.type,
-                                    partition.fileSystem))
-                for slice in partlist:
-                    (partition,  path,  bootable,  start,  end,  length,  type,  fs) = slice
-                    if partition.getFlag(parted.PARTITION_SWAP) or fs.type == "linux-swap":
-                        print "found swap"
-                        print path
-        except:
-            pass
-    os.chdir(stddir)
-
-def sane_settings(file):
-    #Remove some settings from file_name
-    removeline = ("HOSTrootfstype",  "HOSTrootfstype",  "HOSTdatafstype",  "HOSTOSsize",  "HostUseALLdata",  "HOSTDATAsize",  "HOSTuprootfstype",  "HostUseSWAP",  "HOSTSWAPsize")
-    logging.debug("__Running sane settings")
-    try:
-        f = open(file,  'r')
-        filecontents = f.readlines()
-        f.close()
-    except:
-        logging.debug("     Couldn't find file %s to sane", file)
-    try:
-        f = open(file, 'w')
-        for line in filecontents:
-            for item in removeline:
-                if line.startsize(line.strip()):
-                    logging.debug("     Found a line to remove in %s,  %s", file, line)
-                else:
-                    f.write(line)
-    except:
-        logging.debug("     Couldn't open file %s for writing", file)
-    logging.debug("     __End  sane settings")
-
-def restore_default_settings():
-    try:
-        MVROOT = os.environ["MV_ROOT"]
-    except:
-        logging.debug("     MVROOT was not defined,  using the default value")
-        MVROOT = "/usr/MythVantage"
-    logging.info("Saving syssettings")
-    cmd = "%s/bin/restore_default_settings.sh -c save -t syssettings -h %s -d localhost" %(MVROOT, data_config.MVHOSTNAME)
-    runcmd(cmd)
-    SE = os.environ["TEMPLATES"]+"/settings/syssettings/"
-    cp_and_log(SE, data_config.MOUNTPOINT+SE)
-    cp_and_log("/etc/mtab", data_config.MOUNTPOINT+"/etc/mtab")
-    copy_updates()
-    fix_permissions()
-
-def full_install(hostoptions):
-    logging.info("______Start of full install______")
-    try:
-        MVROOT = os.environ["MV_ROOT"]
-    except:
-        logging.debug("     MVROOT was not defined,  using the default value")
-        MVROOT = "/usr/MythVantage"
-
-    try:
-        os.remove("/tmp/.this_is_upgrade")
-    except OSError:
-        logging.debug("     File /tmp/.this_is_upgrade not present,  couldn't delete it")
-        pass
-#   Partition disk
-    statusmsg = "Partitioning %s"  %( hostoptions["rootdisk"])
-    update_status(statusmsg)
-    progress(1)
-    if data_config.NOOPDEBUG == "FALSE":
-        partition_disk()
-    else:
-        logging.debug("     Debug mode,  skipping partitioning step")
-
-#   Format disk
-    statusmsg = "Preparing  %s"  %( hostoptions["rootdisk"])
-    update_status(statusmsg)
-    progress(2)
-    format_disk("install")
-
-
-#   Mount partitions
-    statusmsg = "Mounting  %s"  %( hostoptions["rootdisk"])
-    update_status(statusmsg)
-    progress(3)
-    mount_it()
-
-#   Find number of bytes written to disk before starting copy.  This is used
-#   to have a somewhat decent progress indication.
-    statgrab( hostoptions["rootdisk"])
-    msg = "Creating %s" %(systemconfig["hostname"])
-    update_status(msg)
-
-#   Copy system to disk
-    copy_it("install")
-#   Remove old fstab so that a new one is created
-    fstabfile = data_config.MOUNTPOINT+"/etc/fstab"
-    try:
-        os.remove(fstabfile)
-    except OSError:
-        logging.debug("     ERROR: deleting %s", fstabfile)
-    fstab_it("full_install")
-#   Configure system
-    msg = "Configuring system"
-    update_status(msg)
-    progress(98)
-    grub_it()
-    special_hardware_check()
-#   Configuring the system
-    logging.info("______Configuring system________")
-    cp_and_log("/etc/systemconfig", data_config.MOUNTPOINT+"/etc/systemconfig")
-    cp_and_log("/root/xorg.conf.install", data_config.MOUNTPOINT+"/etc/X11/xorg.conf.install")
-    restore_default_settings()
-    #try:
-        #MVROOT=os.environ["MV_ROOT"]
-    #except:
-        #logging.debug("     MVROOT was not defined,  using the default value")
-        #MVROOT="/usr/MythVantage"
-    #logging.info("Saving syssettings")
-    #cmd="%s/bin/restore_default_settings.sh -c save -t syssettings -h %s -d localhost" %(MVROOT, data_config.MVHOSTNAME)
-    #runcmd(cmd)
-    #SE=os.environ["TEMPLATES"]+"/settings/syssettings"
-    #cp_and_log(SE, data_config.MOUNTPOINT+SE)
-    #cp_and_log("/etc/mtab", data_config.MOUNTPOINT+"/etc/mtab")
-    #cp_and_log2(MVROOT+"/bin/", data_config.MOUNTPOINT+MVROOT+"/bin/", "*.sh")
-    #cp_and_log2(MVROOT+"/bin/", data_config.MOUNTPOINT+MVROOT+"/bin/", "*.py")
-    #fix_permissions()
-    mount_bind_chroot()
-    apply_new_auth()
-    umount_bind_chroot()
-    if ( systemconfig["SystemType"] == "Master_backend" or  systemconfig["SystemType"] == "Standalone" ):
-#       This install will need a DB,  so install it
-        logging.info("______Installing Database in CHROOT________")
-        mysqldb("stop", '')
-        mount_bind_chroot()
-        cmd = "  chroot %s %s/bin/install_db_chroot.sh |tee /tmp/chrootdb.out" %(data_config.MOUNTPOINT, MVROOT)
-        runcmd(cmd)
-        logging.info("Running systemconfig in chroot")
-        #cmd = "  chroot %s %s/bin/systemconfig.sh misc, hostype, network, advanced, user, this_is_install" %(data_config.MOUNTPOINT, MVROOT)
-        cmd = "chroot %s %s/bin/systemconfig.sh all,this_is_install" %(data_config.MOUNTPOINT, MVROOT)
-        rc = runcmd(cmd)[0]
-        if rc != 0 :
-            error_out("Running systemconfig")
-
-        mysqldb("stop", "chroot")
-        kill_dhcp_chroot()
-        logging.info("____End Database in CHROOT____")
-        mysqldb("start", '')
-        umount_bind_chroot()
-    else:
-        logging.info("______No database required,  continuing configuration________")
-        mount_bind_chroot()
-        cmd = "  chroot %s DISPLAY=127.0.0.1:0 %s/bin/MythVantage -t restore, default 1" %(data_config.MOUNTPOINT, MVROOT)
-        runcmd(cmd)
-#       Need to check for to touch  /tmp/.dbsysfailed
-        cmd = "  chroot %s %s/bin/restore_default_settings.sh -c restore  -t syssettings " %(data_config.MOUNTPOINT, MVROOT)
-        runcmd(cmd)
-        if ( 'x' == '1' ):
-            logging.debug("touching /tmp/.dbsysfailed")
-        else:
-            #cmd = "  chroot %s %s/bin/systemconfig.sh misc, hostype, network, advanced, user, this_is_install" %(data_config.MOUNTPOINT, MVROOT)
-            cmd = "chroot %s %s/bin/systemconfig.sh all,this_is_install" %(data_config.MOUNTPOINT, MVROOT)
-            rc = runcmd(cmd)[0]
-            if rc != 0 :
-                error_out("Running systemconfig")
-            cmd = "chroot %s %s/bin/restore_default_settings.sh -c ACCESSCONTROL " %(data_config.MOUNTPOINT, MVROOT)
-            runcmd(cmd)
-        umount_bind_chroot()
-    cmd = "  touch %s%s/.configure" %(data_config.MOUNTPOINT, data_config.MYTHHOME)
-    runcmd(cmd)
-    cmd = "  chmod 777 %s%s/.configure" %(data_config.MOUNTPOINT, data_config.MYTHHOME)
-    runcmd(cmd)
-
-    msg = "Done"
-    update_status(msg)
-    cp_and_log("/tmp/mythvantage_install.log", data_config.MOUNTPOINT+"/var/log/mythvantage_install.log")
-    cp_and_log("/tmp/mv_debug.log", data_config.MOUNTPOINT+"/var/log/mv_debug.log")
-    unmount_it()
-    logging.debug("_____End of full install_____")
-
-def find_upgrade():
-    logging.info("_____Start of find_upgrade_____")
-    global hostoptions
-    #try to mount first partition of disk
-    #copy old /etc/systemconfig to live,  import settings into db
-    #umount drive.
-    #check for clean upgrade
-    if ( clean_upgrade() ):
-        logging.info("Clean upgrade requested,  not using old data")
-        return
-    mount_it()
-    oldbackupfile = data_config.MOUNTPOINT+"/root/backup/"+data_config.BACKUPFILE
-    newbackupfile = "/tmp/"+data_config.BACKUPFILE
-    if os.path.exists(oldbackupfile):
-        logging.debug("Setting backup file to %s", newbackupfile)
-        hostoptions["backupfile"] = newbackupfile
-        cp_and_log(oldbackupfile, newbackupfile)
-
-    srcfile = data_config.MOUNTPOINT+"/etc/systemconfig"
-    logging.info("Searching for systemconfig file %s", srcfile)
-    if os.path.exists(srcfile):
-        logging.info("Found systemconfig file %s", srcfile)
-        TEMPLATES = os.environ["TEMPLATES"]+"/settings/syssettings"
-        cp_and_log2(data_config.MOUNTPOINT+TEMPLATES, data_config.TEMP_TEMPLATES, '')
-        sane_settings("/tmp/templates/settings/syssettings/settings.txt")
-        cp_and_log2(data_config.TEMP_TEMPLATES, TEMPLATES, '')
-        cp_and_log(srcfile, "/etc/systemconfig")
-        cp_and_log(data_config.MOUNTPOINT+"/etc/", "/tmp/etc/")
-        cp_and_log(data_config.MOUNTPOINT+"/var/lib/alsa/", "/tmp/alsa")
-        cp_and_log(data_config.MOUNTPOINT+"/var/lib/oss/", "/tmp/oss")
-        cp_and_log("/tmp/etc/mdadm.conf", "/etc/mdadm.conf")
-    else:
-        logging.info("Could not find systemconfig file %s", srcfile)
-        cp_and_log(data_config.MOUNTPOINT+"/etc/", "/tmp/etc/")
-        cp_and_log(data_config.MOUNTPOINT+"/var/lib/alsa/", "/tmp/alsa")
-        cp_and_log("/tmp/etc/mdadm.conf", "/etc")
-        timezone_to_db("/tmp/etc/timezone")
-    unmount_it()
-    logging.debug("End of find_upgrade")
-
-def upgrade_mount_search():
-    #Search for data/myth partition based on contents of fstab
-    logging.debug("______Start of upgrade_mount_search_____")
-    cmd = "umount %s%s"  %(data_config.MOUNTPOINT, data_config.DATAMOUNT)
-    runcmd(cmd)
-    fstab_list = []
-    fstab_data_mount = ''
-    try:
-        f = open("/tmp/etc/fstab",  'r')
-        oldfscontents = f.readlines()
-        f.close()
-        ##    ['UUID=',  '/myth',  'auto',  'defaults, noatime',  '0',  '1']
-        #for line in oldfscontents:
-            #mountdir=line.split()
-            #if mountdir[1] == (data_config.DATAMOUNT):
-                #fstablist.append(mountdir)
-    except:
-        logging.debug("    Couldn't open /tmp/etc/fstab")
-    for line in oldfscontents:
-        if line.startswith("#"):
-            continue
-        mountdir=line.split()
-        try:
-            if mountdir[1] == (data_config.DATAMOUNT):
-                fstablist.append(mountdir)
-        except:
-            continue
-    #search fstab for data/myth mountpoint
-    for i in fstab_list:
-        if i[1] == data_config.DATAMOUNT:
-            fstab_data_mount = i[0]
-            break
-
-    #start software raid support if needed
-    for i in fstab_list:
-        if i[0].startswith("/dev/md"):
-            logging.debug("    starting software raid support")
-            mdadm_assemble_all
-
-
-    if re.search("UUID", fstab_data_mount):
-        fstab_data_uuid = fstab_data_mount.split("=")[1]
-        cmd = "blkid -t UUID=%s" %fstab_data_uuid
-        retcode = call(cmd,  shell=True)
-        if retcode != 0:
-            logging.debug("    Couldn't find uuid %s,  starting md support", fstab_data_uuid)
-            mdadm_assemble_all
-        #hoping everything is up and running and data/myth will be available for mount
-        cmd = "mount -U %s %s" %(fstab_data_uuid, data_config.MOUNTPOINT)
-        runcmd(cmd)
-        cmd = "blkid -t UUID=%s|cut -d: -f1" %fstab_data_uuid
-        logging.debug(cmd)
-        datadisk = commands.getoutput(cmd)
-        cmd = "basename %s" %datadisk
-        datadisk = commands.getoutput(cmd)
-    else:
-        cmd = "mount  %s %s" %(fstab_data_mount, data_config.MOUNTPOINT)
-        runcmd(cmd)
-        cmd = "basename %s" %fstab_data_mount
-        datadisk = commands.getoutput(cmd)
-    time.sleep(3)
-#    hostoptions["backupfile"]=data_config.BACKUPPATH+data_config.BACKUPFILE
-    if not backup_sql_check():
-        newbackupfile = "/tmp/"+data_config.BACKUPFILE
-        if os.path.exists(newbackupfile):
-            logging.debug("Setting backup file to %s", newbackupfile)
-            cp_and_log(newbackupfile, data_config.MOUNTPOINT+newbackupfile)
-            hostoptions["backupfile"] = newbackupfile
-        else:
-            logging.info("Couldn't find any database to restore,  upgrade will continue with a new database")
-
-
-
-def upgrade(hostoptions):
-
-    try:
-        MVROOT = os.environ["MV_ROOT"]
-    except:
-        logging.debug("MVROOT was not defined,  using the default value")
-        MVROOT = "/usr/MythVantage"
-    logging.info("______Start of upgrade______")
-    cmd = "touch /tmp/.this_is_upgrade"
-    runcmd(cmd)
-    if hostoptions["rootfs"] == "Do_not_format":
-        logging.info("Will not format root filesystem")
-    else:
-        statusmsg = "Preparing  %s"  %( hostoptions["rootdisk"])
-        update_status(statusmsg)
-        progress(2)
-        format_disk("upgrade")
-    #sys.exit(2)
-    statusmsg = "Mounting  %s"  %( hostoptions["rootdisk"])
-    update_status(statusmsg)
-    progress(3)
-    mount_it()
-    hostoptions["backupfile"] = data_config.BACKUPPATH+data_config.BACKUPFILE
-    statgrab( hostoptions["rootdisk"])
-    msg = "Upgrading %s" %(systemconfig["hostname"])
-    update_status(msg)
-    time.sleep(3)
-    copy_it("upgrade")
-    cmd = "rm -rf %s/etc.old" %data_config.MOUNTPOINT
-    runcmd(cmd)
-    cmd = "rm -rf %s/alsa.old" %data_config.MOUNTPOINT
-    runcmd(cmd)
-
-    cp_and_log("/tmp/etc/", data_config.MOUNTPOINT+"/etc.old/")
-    cp_and_log("/tmp/alsa/", data_config.MOUNTPOINT+"/alsa.old/")
-    cp_and_log("/tmp/oss", data_config.MOUNTPOINT+"/var/lib/oss.old")
-
-    srcfile = "%s/etc.old/ssh/" %(data_config.MOUNTPOINT)
-    destfile = "%s/etc/ssh/" %(data_config.MOUNTPOINT)
-    cp_and_log2(srcfile, destfile, '*.pub')
-    cp_and_log2(srcfile, destfile, '*.key')
-    cp_and_log2(srcfile, destfile, '*key')
-
-    mdfile = mdadm_find("/tmp")
-    cp_and_log("/tmp"+mdfile, data_config.MOUNTPOINT+"/etc")
-
-    srcfile = "%s/etc.old/asound.conf" %(data_config.MOUNTPOINT)
-    destfile = "%s/etc/asound.conf" %(data_config.MOUNTPOINT)
-    cp_and_log(srcfile, destfile)
-
-    # R5.5 -> R6
-    srcfile = "%s/alsa.old/asound.state" %(data_config.MOUNTPOINT)
-    destfile = "%s/etc/asound.state" %(data_config.MOUNTPOINT)
-    cp_and_log(srcfile, destfile)
-    # R6 -> R6
-    srcfile = "%s/etc.old/asound.state" %(data_config.MOUNTPOINT)
-    destfile = "%s/etc/asound.state" %(data_config.MOUNTPOINT)
-    cp_and_log(srcfile, destfile)
-
-    srcfile = "%s/etc.old/mplayer/mplayer.conf" %(data_config.MOUNTPOINT)
-    destfile = "%s/etc/mplayer/mplayer.conf" %(data_config.MOUNTPOINT)
-    cp_and_log(srcfile, destfile)
-
-    if not os.path.exists("/tmp/etc/KnoppMyth-version"):
-        logging.debug("    standard upgrade,  restoring auth files")
-        cp_and_log(data_config.MOUNTPOINT+"/etc.old/passwd", data_config.MOUNTPOINT+"/etc/passwd")
-        cp_and_log(data_config.MOUNTPOINT+"/etc.old/shadow", data_config.MOUNTPOINT+"/etc/shadow")
-        cp_and_log(data_config.MOUNTPOINT+"/etc.old/group", data_config.MOUNTPOINT+"/etc/group")
-    msg = "Configuring system"
-
-    update_status(msg)
-    progress(98)
-    logging.info("______Configuring system________")
-    cp_and_log("/etc/systemconfig", data_config.MOUNTPOINT+"/etc/systemconfig")
-    if not backup_sql_check():
-        upgrade_mount_search()
-    fstab_it("upgrade")
-    time.sleep(1)
-    grub_it()
-    time.sleep(1)
-    #needed to get around a bug with pacman
-    special_hardware_check()
-    cp_and_log("/root/xorg.conf.install", data_config.MOUNTPOINT+"/etc/X11/xorg.conf.install")
-    cp_and_log("/etc/mtab", data_config.MOUNTPOINT+"/etc/mtab")
-    if clean_upgrade() or os.path.exists("/tmp/etc/KnoppMyth-version"):
-        logging.debug("clean upgrade or knoppmyth upgrade detected,  running restore settings")
-        restore_default_settings()
-        if clean_upgrade():
-            file = "%s/%s/.kmupgrade" %(data_config.MOUNTPOINT, data_config.MYTHHOME)
-            cmd = "touch %s && chmod 777 %s" %(file, file)
-            runcmd(cmd)
-    copy_updates()
-    fix_permissions()
-    mount_bind_chroot()
-    logging.info("Running systemconfig in chroot")
-    #cmd = "  chroot %s %s/bin/systemconfig.sh misc, hostype, network, advanced, user, this_is_install" %(data_config.MOUNTPOINT, MVROOT)
-    cmd = "chroot %s %s/bin/systemconfig.sh all,this_is_install" %(data_config.MOUNTPOINT, MVROOT)
-    rc = runcmd(cmd)[0]
-    if rc != 0 :
-        error_out("Running systemconfig")
-    mysqldb("stop", "")
-    if ( systemconfig["SystemType"] == "Master_backend" or  systemconfig["SystemType"] == "Standalone" ):
-        if clean_upgrade() or not backup_sql_check():
-            logging.info("Installing new database")
-            cmd = "  chroot %s %s/bin/install_db_chroot.sh |tee /tmp/chrootdb.out" %(data_config.MOUNTPOINT, MVROOT)
-            runcmd(cmd)
-        else:
-            logging.info("Restoring database")
-            cmd = "  chroot %s %s/bin/restore_km_db_chroot.sh %s|tee /tmp/chrootdb.out" %(data_config.MOUNTPOINT, MVROOT, hostoptions["backupfile"])
-            runcmd(cmd)
-
-    if os.path.exists("/tmp/etc/KnoppMyth-version"):
-        cmd = "  chroot %s %s/bin/restore_default_settings.sh -c restore  -t hostsettings " %(data_config.MOUNTPOINT, MVROOT)
-        runcmd(cmd)
-        logging.debug("Correcting permissions because of km->linhes upgrade")
-        cmd = "  chown -R mythtv:mythtv  %s" %(data_config.MOUNTPOINT+data_config.DATAMOUNT)
-        runcmd(cmd)
-        cmd = "  chown -R root:root  %s" %(data_config.MOUNTPOINT+data_config.DATAMOUNT+"/backup")
-        runcmd(cmd)
-    else:
-        cmd = "  chroot %s %s/bin/restore_default_settings.sh -c restore  -t syssettings " %(data_config.MOUNTPOINT, MVROOT)
-        runcmd(cmd)
-
-    logging.info("Running systemconfig in chroot 2nd time")
-    #cmd = "  chroot %s %s/bin/systemconfig.sh misc, hostype, network, advanced, user, this_is_install" %(data_config.MOUNTPOINT, MVROOT)
-    cmd = "chroot %s %s/bin/systemconfig.sh all,this_is_install" %(data_config.MOUNTPOINT, MVROOT)
-    rc = runcmd(cmd)[0]
-    if rc != 0 :
-        error_out("Running systemconfig")
-    #logging.info("Running systemconfig in chroot")
-    #cmd = "  chroot %s %s/bin/systemconfig.sh advanced" %(data_config.MOUNTPOINT, MVROOT)
-    #runcmd(cmd)
-    mysqldb("stop", 'chroot')
-    apply_new_auth()
-    kill_dhcp_chroot()
-    umount_bind_chroot()
-    cp_and_log("/tmp/mythvantage_install.log", data_config.MOUNTPOINT+"/var/log/mythvantage_install.log")
-    cp_and_log("/tmp/mv_debug.log", data_config.MOUNTPOINT+"/var/log/mv_debug.log")
-    unmount_it()
-    msg = "Done"
-    update_status(msg)
-    mysqldb("start", '')
-
-
-
-
-def main(argv):
-    global hostoptions
-    try:
-        opts,  args = getopt.getopt(argv,  'c:h',  ["help",  "rootdisk=",  "rootfs=",  "rootsize=",  "datafs=",  "datasize=",  "datadisk=",  "swapsize=",  "datapartition=" ] )
-    except getopt.GetoptError, why:
-        print why
-        usage()
-        sys.exit(2)
-    hostoptions = {"op": 'null'}
-    for opt,  arg in opts:
-        if opt in ("-h",  "--help"):
-            usage()
-            sys.exit(0)
-        elif opt in ( "--rootdisk"):
-            hostoptions["rootdisk"] = arg
-            hostoptions["rootpartition"] = arg+str(1)
-        elif opt in ("--rootfs"):
-            hostoptions["rootfs"] = arg
-        elif opt in ("--rootsize"):
-            hostoptions["rootsize"] = arg
-        elif opt in ("--datafs"):
-            hostoptions["datafs"] = arg
-        elif opt in ("--datasize"):
-            hostoptions["datasize"] = arg
-        elif opt in ("--datadisk"):
-            hostoptions["datadisk"] = arg
-        elif opt in ("--datapartition"):
-            hostoptions["datapartition"] = arg
-        elif opt in ("--swapsize"):
-            hostoptions["swapsize"]  = arg
-
-        elif opt in ("-c"):
-            validop = ["full_install", "upgrade", "netboot", "find_upgrade"]
-            if arg not in validop:
-                logging.critical("-c %s is not a valid option", arg)
-                sys.exit(2)
-            else:
-                hostoptions["op"]  = arg
-    try:
-        hostoptions["datadisk"]
-    except:
-        hostoptions["datadisk"] = hostoptions["rootdisk"]
-        hostoptions["datapartition"] = hostoptions["datadisk"]+str(3)
-    try:
-        hostoptions["datapartition"]
-    except:
-        hostoptions["datapartition"] = hostoptions["datadisk"]+str(3)
-    hostoptions["swappartition"]  =  hostoptions["rootdisk"] + str(2)
-
-
-    if ( hostoptions["op"]  == "full_install" ) :
-        full_install(hostoptions)
-    elif (hostoptions["op"]  == "upgrade" ) :
-        hostoptions["datafs"] = "no_format"
-        find_upgrade()
-        upgrade(hostoptions)
-    elif (hostoptions["op"]  == "find_upgrade" ) :
-        find_upgrade()
-    return hostoptions
-
-
-#____________________________________________setup the logging______________________________________________________
-LOG_FILENAME = '/tmp/mv_status.log'
-DEBUGLOG = '/tmp/mv_debug.log'
-logging.basicConfig(level=logging.DEBUG,
-                    format='%(asctime)s - %(name)s - %(levelname)s - %(message)s',
-                    datefmt='%m-%d %H:%M',
-                    filename=DEBUGLOG,
-                    filemode='a')
-# define a Handler which writes INFO messages or higher to the sys.stderr
-console = logging.StreamHandler()
-console.setLevel(logging.INFO)
-# set a format which is simpler for console use
-#formatter = logging.Formatter('%(name)-12s: %(levelname)-8s %(message)s')
-formatter = logging.Formatter("%(message)s")
-# tell the handler to use this format
-console.setFormatter(formatter)
-# add the handler to the root logger
-logging.getLogger('').addHandler(console)
-
-#infoformatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
-infoformatter = logging.Formatter("%(message)s")
-infofile = logging.FileHandler(LOG_FILENAME, 'w')
-infofile.setFormatter(infoformatter)
-infofile.setLevel(logging.INFO)
-logging.getLogger('').addHandler(infofile)
-
-#Read in systemconfig
-global systemconfig
-systemconfig = {}
-file_name = "/etc/systemconfig"
-try:
-    config_file = open(file_name)
-except:
-    logging.debug("%s could not be opened", file_name)
-    config_file = ''
-
-for line in config_file:
-    line = line.strip()
-    if line and line[0] is not "#" and line[-1] is not "=":
-        var, val = line.rsplit("=", 1)
-        val = val.strip('"')
-        systemconfig[var.strip()] = val.strip()
-
-
-if __name__ == "__main__":
-    config_file = "mv_config"
-    data_config = __import__(config_file,  globals(),  locals(),  [])
-    logging.debug("___________START OF DEBUG_________________________")
-    cmdoptions = main(sys.argv[1:])
-    logging.debug("______cmd line options______")
-    for i in cmdoptions.items():
-        logging.debug (i)
-    logging.debug("______systemconfig______")
-    for i in systemconfig.items():
-        logging.debug(i)
-    logging.debug("______hostoptions______")
-    for i in hostoptions.items():
-        logging.debug(i)
-    pass
-
diff --git a/abs/mv-core/MythVantage-config/mv_ir.py b/abs/mv-core/MythVantage-config/mv_ir.py
deleted file mode 100755
index bc1ae37..0000000
--- a/abs/mv-core/MythVantage-config/mv_ir.py
+++ /dev/null
@@ -1,330 +0,0 @@
-# -*- coding: utf-8 -*-
-import logging, mv_common
-import os, re , glob
-from time import time, localtime, strftime
-import time
-import pwd
-
-def setup_lirc_links(mythhome):
-    logging.debug("    Creating links for lirc")
-    try:
-        mythuid = pwd.getpwnam('mythtv')[2]
-        mythgid = pwd.getpwnam('mythtv')[3]
-    except:
-        logging.critical("*    mythuid not found")
-        mythuid = '1000'
-        mythgid = '1000'
-    if not os.path.exists(mythhome+"/.mythtv"):
-        logging.debug("    Creating %s/.mythtv",mythhome)
-        try:
-            os.mkdir(mythhome+"/.mythtv")
-        except:
-            logging.debug("   Couldn't create .mythtv ")
-            return
-        try:
-            os.chown(mythhome+"/.mythtv", mythuid, mythgid)
-            logging.debug("*    Couldn't chown of %s", mythhome)
-        except:
-            cmd = ''' chown -R mythtv %s/.mythtv''' %mythhome
-            mv_common.runcmd(cmd)
-            cmd = ''' chgrp -R mythtv %s/.mythtv''' %mythhome
-            mv_common.runcmd(cmd)
-            pass
-
-    if os.path.exists("/etc/lircrc"):
-        if not os.path.exists(mythhome+"/.mythtv/lircrc"):
-            logging.debug("    Creating symlink for myth lircrc")
-            os.symlink("/etc/lircrc",mythhome+"/.mythtv/lircrc")
-        else:
-            logging.debug("    %s/lircrc already present",mythhome)
-
-        if not os.path.exists(mythhome+"/.lircrc"):
-            logging.debug("    Creating symlink for lircrc")
-            os.symlink("/etc/lircrc",mythhome+"/.lircrc")
-        else:
-            logging.debug("    %s/.lircrc already present",mythhome)
-    else:
-        logging.debug("    /etc/lircrc does not exisit, can not link it")
-
-def scrub_modules(filename,module):
-    logging.debug("    scrubbing %s from %s",module,filename)
-    cmd = '''sed -i -e '/.*#%s/d' %s''' %(module,filename)
-    mv_common.runcmd(cmd)
-
-def add_module(filename,module):
-    logging.debug("    adding  %s to %s",module,filename)
-    cmd = ''' echo "%s" >> %s ''' %(module,filename)
-    mv_common.runcmd(cmd)
-
-def unload_all_lirc():
-    logging.debug("    Unloading all lirc modules")
-    cmd = "sv stop lircd"
-    mv_common.runcmd(cmd)
-    cmd = "killall -9 lircd"
-    mv_common.runcmd(cmd)
-    cmd = '''modprobe -r $(lsmod |grep ^lirc |awk '{print $1}') '''
-    mv_common.runcmd(cmd)
-
-
-
-def include_file( incfile,filename):
-    logging.debug("     including %s within %s",filename,incfile)
-    try:
-        f = open( incfile, 'a')
-    except:
-        logging.debug("    Couldn't open %s for writing",incfile)
-        return
-    line = '''include "%s" ''' %filename
-    logging.debug("   %s",line)
-    f.write(line)
-    f.write("\n")
-    f.close()
-
-def setup_ir_remote(Remotetype,templates):
-    logging.debug("    Setup of remote type %s",Remotetype)
-    if Remotetype == "no_remote":
-        mv_common.remove_service("lircd")
-    elif Remotetype == "tinker":
-        pass
-    else:
-        currenttime = strftime("%b-%d-%Y-%H:%M:%S", localtime())
-        cmd = "mv /etc/lircd.conf /etc/lircd.conf-%s" %currenttime
-        mv_common.runcmd(cmd)
-        cmd = "mv /etc/lircrc /etc/lircrc-%s" %currenttime
-        mv_common.runcmd(cmd)
-        files = templates + "/remotes/" + Remotetype + "/lircd*"
-        logging.debug("    Using %s",files)
-        for filename in glob.glob(files):
-            # Ignore subfolders
-            if os.path.isdir (filename):
-                logging.debug("    %s is a dir, skipping",filename)
-                continue
-            include_file("/etc/lircd.conf",filename)
-        files = templates + "/remotes/" + Remotetype + "/lircrc*"
-        logging.debug("    Using %s",files)
-        for filename in glob.glob(files):
-            # Ignore subfolders
-            if os.path.isdir (filename):
-                logging.debug("    %s is a dir, skipping",filename)
-                continue
-            include_file("/etc/lircrc",filename)
-        cmd =  "chmod 755 /etc/lircrc"
-        mv_common.runcmd(cmd)
-        mv_common.add_service("lircd")
-
-
-def setup_ir_receiver(ReceiverType,TEMPLATES):
-    logging.info("    Configuring receiver %s", ReceiverType)
-    if ReceiverType == "Serial":
-        scrub_modules("/etc/modules.mythvantage","lirc")
-        add_module("/etc/modules.mythvantage","lirc_serial    #lirc")
-        cmd = "load-modules-mythvantage.sh"
-        mv_common.runcmd(cmd)
-        mv_common.remove_service("igdaemon")
-        mv_common.remove_service("tatir")
-
-    elif ReceiverType == "Usb-imon":
-        scrub_modules("/etc/modules.mythvantage","lirc")
-        add_module("/etc/modules.mythvantage","lirc_imon    #lirc")
-        cmd = "load-modules-mythvantage.sh"
-        mv_common.runcmd(cmd)
-        mv_common.remove_service("igdaemon")
-        mv_common.remove_service("tatir")
-
-    elif ReceiverType == "Hauppauge":
-        scrub_modules("/etc/modules.mythvantage","lirc")
-        add_module("/etc/modules.mythvantage","lirc_i2c    #lirc")
-        mv_common.cp_and_log(TEMPLATES+"/modules/lirc_i2c.conf" ,
-                             "/etc/modprobe.d/lirc_i2c.conf")
-        cmd = "rmmod lirc_i2c"
-        mv_common.runcmd(cmd)
-        cmd = "load-modules-mythvantage.sh"
-        mv_common.runcmd(cmd)
-        mv_common.remove_service("igdaemon")
-        mv_common.remove_service("tatir")
-    elif ReceiverType == "pvr150":
-        scrub_modules("/etc/modules.mythvantage","lirc")
-        add_module("/etc/modules.mythvantage","lirc_i2c    #lirc")
-        mv_common.cp_and_log(TEMPLATES+"/modules/lirc_i2c.conf" ,
-                             "/etc/modprobe.d/lirc_i2c.conf")
-        cmd = "rmmod lirc_i2c"
-        mv_common.runcmd(cmd)
-        cmd = "load-modules-mythvantage.sh"
-        mv_common.runcmd(cmd)
-        mv_common.remove_service("igdaemon")
-        mv_common.remove_service("tatir")
-    elif ReceiverType == "iguanaIR-usb":
-        scrub_modules("/etc/modules.mythvantage","lirc")
-        mv_common.add_service("igdaemon")
-        mv_common.remove_service("tatir")
-
-    elif ReceiverType == "tatir":
-        scrub_modules("/etc/modules.mythvantage","lirc")
-        mv_common.add_service("tatir")
-        mv_common.remove_service("igdaemon")
-
-    else:
-        logging.debug("    didn't match receiver, using genric case")
-        scrub_modules("/etc/modules.mythvantage","lirc")
-        mv_common.remove_service("igdaemon")
-        mv_common.remove_service("tatir")
-
-def setup_blaster_proto(HostBlasterType,Hostnumblaster,TEMPLATES,systemconfig):
-    logging.debug("    Start of setup_blaster_proto")
-    logging.debug("    HostBlasterType: %s", HostBlasterType)
-    logging.debug("    Hostnumblaster: %s" , Hostnumblaster)
-    if not HostBlasterType == "pvr150" and not HostBlasterType == "None":
-        for i in range(int(Hostnumblaster)):
-            try:
-                proto = systemconfig["HostTransmitproto_"+str(i+1)]
-                logging.debug("    proto: %s",proto)
-            except:
-               logging.info("    unkown proto for %s",i+1)
-               continue
-            template=TEMPLATES+"/transmit/%s/lircd.conf" %proto
-            if os.path.exists(template):
-                logging.debug("    include blaster template: %s",proto)
-                include_file("/etc/lircd.conf",template)
-            else:
-                logging.debug("    template: %s is not present",template)
-    logging.info("------NEED TO SETUP CHANGE_CHANNEL------")
-
-
-def setup_blaster_transmiter(HostBlasterType):
-    logging.debug("    Start of setup_blaster_transmiter")
-    logging.info("    HostBlasterType : %s", HostBlasterType)
-
-    if  HostBlasterType == "Receiver":
-        logging.info("    Blaster is receiver, skipping module config for Blaster")
-        return
-
-    if HostBlasterType == "no blaster":
-        scrub_modules("/etc/modules.mythvantage","blaster")
-    elif HostBlasterType == "Serial":
-        scrub_modules("/etc/modules.mythvantage","blaster")
-        add_module("/etc/modules/.mythvantage","lirc_serial    #blaster")
-        cmd = "load-modules-mythvantage.sh"
-        mv_common.runcmd(cmd)
-    elif HostBlasterType == "pvr150":
-        scrub_modules("/etc/modules.mythvantage", "blaster")
-        scrub_modules("/etc/modules.mythvantage", "lirc")
-        add_module("/etc/modules.mythvantage", "lirc_pvr150    #blaster")
-        add_module("/etc/modules.mythvantage", "lirc_pvr150    #lirc")
-        cmd = "rmmod lirc_i2c"
-        mv_common.runcmd(cmd)
-        cmd = "load-modules-mythvantage.sh"
-        mv_common.runcmd(cmd)
-    else:
-        scrub_modules("/etc/modules.mythvantage","blaster")
-
-def setup_lcd(LCDtype, TEMPLATES, Remotetype):
-    logging.debug("____Start of setup_lcd____")
-    logging.debug("    LCDType: %s", LCDtype)
-    logging.debug("    Remotetype: %s", Remotetype)
-    if LCDtype == "tinker":
-        logging.info("   tinker mode detected")
-        return
-
-    if LCDtype == "no_lcd":
-        logging.info("    Disabling LCD support")
-        cmd = "sv stop lcdd"
-        mv_common.runcmd(cmd)
-        #sometimes it doesn't want to die
-        cmd = "killall -9 LCDd"
-        mv_common.runcmd(cmd)
-        cmd = "load-modules-mythvantage.sh  UNLOAD LCD"
-        mv_common.runcmd(cmd)
-        scrub_modules("/etc/modules.mythvantage", "LCD")
-        mv_common.remove_service("lcdd")
-    else:
-        lcdmodule="%s/LCD/%s/modules" %(TEMPLATES,LCDtype)
-        if os.path.exists(lcdmodule):
-            logging.debug("    Adding module for LCD")
-            scrub_modules("/etc/modules.mythvantage", "LCD")
-            cmd = "cat %s >> /etc/modules.mythvantage" %lcdmodule
-            mv_common.runcmd(cmd)
-        if Remotetype != "tinker":
-            lcdconf = "%s/LCD/%s/LCDd.conf" %(TEMPLATES,LCDtype)
-            lcdlirc = "%s/LCD/%s" %(TEMPLATES,LCDtype)
-            mv_common.pacinstall("lcdproc")
-            if os.path.exists(lcdconf):
-                logging.debug("    Copying in lcdconf template file: %s",lcdconf)
-                mv_common.cp_and_log(lcdconf, "/etc/LCDd.conf")
-            else:
-                logging.debug("    %s is not present, will not copy it")
-
-            if os.path.exists(lcdlirc+"/lircrc"):
-                logging.debug("    LCD seems to support lirc")
-                #setup the lirc aspect of the lcd
-                #copied from setup_ir_remote
-                files = lcdlirc+"/lircd*"
-                logging.debug("    Using %s",files)
-                for filename in glob.glob(files):
-                    # Ignore subfolders
-                    if os.path.isdir (filename):
-                        logging.debug("    %s is a dir, skipping",filename)
-                        continue
-                    include_file("/etc/lircd.conf",filename)
-                files = lcdlirc+"/lircrc*"
-                logging.debug("    Using %s",files)
-                for filename in glob.glob(files):
-                    # Ignore subfolders
-                    if os.path.isdir (filename):
-                        logging.debug("    %s is a dir, skipping",filename)
-                        continue
-                    include_file("/etc/lircrc",filename)
-                cmd =  "chmod 755 /etc/lircrc"
-                mv_common.runcmd(cmd)
-
-            mv_common.add_service("lcdd")
-            mv_common.restart_service("lcdd")
-    logging.debug("__End of setup_lcd")
-
-def setup_ir(systemconfig, data_config):
-    rc = False
-    logging.info("____Start of IR____")
-    if systemconfig["Remotetype"] == "tinker":
-        logging.info("    Tinker mode detected")
-    else:
-        if not systemconfig["HostBlasterType"]:
-            HostBlasterType = "unknown"
-            Hostnumblaster = "0"
-        else:
-            HostBlasterType = systemconfig["HostBlasterType"]
-            Hostnumblaster  = systemconfig["Hostnumblaster"]
-
-        if systemconfig["HostBlasterType"] == "pvr150":
-            remotetype = "hauppauge-blaster"
-            logging.debug("    pvr150 blaster selected, setting remote to hauppauge-blaster")
-        else:
-            remotetype = systemconfig["Remotetype"]
-
-        setup_ir_remote(remotetype,systemconfig["TEMPLATES"])
-        setup_lirc_links(data_config.MYTHHOME)
-
-        if systemconfig["ReceiverType"]:
-            setup_ir_receiver(systemconfig["ReceiverType"],
-                              systemconfig["TEMPLATES"])
-        else:
-            setup_ir_receiver("unknown", systemconfig["TEMPLATES"])
-        unload_all_lirc()
-        setup_blaster_proto(HostBlasterType,
-                            Hostnumblaster,
-                            systemconfig["TEMPLATES"],
-                            systemconfig)
-        setup_blaster_transmiter(HostBlasterType)
-        cmd = "load-modules-mythvantage.sh"
-        mv_common.runcmd(cmd)
-        time.sleep(2)
-        mv_common.udev_trigger()
-        cmd="sv start lircd"
-        mv_common.runcmd(cmd)
-        rc = [ True , True ]
-    if systemconfig["LCDtype"]:
-        setup_lcd(systemconfig["LCDtype"],
-                  systemconfig["TEMPLATES"],
-                  systemconfig["Remotetype"])
-    else:
-        logging.debug("    LCD not defined")
-    logging.info("__End IR\n")
-    return rc
\ No newline at end of file
diff --git a/abs/mv-core/MythVantage-config/mv_misc.py b/abs/mv-core/MythVantage-config/mv_misc.py
deleted file mode 100755
index 9ea9c95..0000000
--- a/abs/mv-core/MythVantage-config/mv_misc.py
+++ /dev/null
@@ -1,180 +0,0 @@
-# -*- coding: utf-8 -*-
-import logging, mv_common
-import os, re
-from urllib2 import Request, urlopen, URLError, HTTPError
-
-config_file = "mv_config"
-data_config = __import__(config_file, globals(), locals(), [])
-
-def setup_zip(MVROOT,zipcode):
-    logging.debug("____Setting up the zipcode____")
-
-    if zipcode:
-        cmd="%s/bin/restore_default_settings.sh -c ZIP -c %s" %(MVROOT,zipcode)
-        mv_common.runcmd(cmd)
-        #Let's also speed things up for those in North America
-        cmd="mkdir /usr/bin/perlbin/vendor/tv_grabbers_non_na"
-        mv_common.runcmd(cmd)
-        cmd="mv  /usr/bin/perlbin/vendor/tv_grab_*  /usr/bin/perlbin/vendor/tv_grabbers_non_na"
-        mv_common.runcmd(cmd)
-        cmd="mv  /usr/bin/perlbin/vendor/tv_grabbers_non_na/tv_grab_na*  /usr/bin/perlbin/vendor/"
-        mv_common.runcmd(cmd)
-    else:
-        logging.debug("    Zipcode is not set")
-
-    logging.debug("__End of zipcode\n")
-
-def setup_tz(timezone,TEMPLATES):
-    logging.info("____Setting up the timezone____")
-
-    if not timezone:
-        timezone="unknown"
-    logging.info("    Setting timezone to %s",timezone)
-    mv_common.remove_file("/etc/localtime")
-    #try:
-        #logging.debug("    Removing /etc/localtime")
-        #os.remove("/etc/localtime")
-    #except:
-        #logging.debug("    Couldn't remove /etc/localtime")
-        #pass
-
-    srclink="/usr/share/zoneinfo/%s" %timezone
-    logging.debug("    symlinking %s to /etc/localtime",srclink)
-    try:
-        os.symlink(srclink,"/etc/localtime")
-    except:
-        logging.critical("    Couldn't make symlink for /etc/localtime")
-    cmd = '''sed -e "s/^TIMEZONE=.*$/TIMEZONE=\\"%s\\" /" /etc/rc.conf > $TEMPLATES/rc.conf''' %re.escape(timezone)
-    mv_common.runcmd(cmd)
-
-    if os.path.exists("/etc/php/php.ini"):
-        logging.info("    Changing timezone for php")
-        cmd = '''sed -i "s/^.*date.timezone.*$/date.timezone=%s/" ${BASE}/etc/php/php.ini''' %re.escape(timezone)
-        mv_common.runcmd(cmd)
-
-    mv_common.cp_and_log(TEMPLATES+"/rc.conf","/etc/rc.conf")
-    logging.info("__End of timezone\n")
-
-def setup_nfs(systemconfig):
-    nfslist=[]
-    logging.info("____Start of setup_nfs____")
-    scrubnfs(systemconfig["TEMPLATES"])
-
-    if systemconfig["HaveCentralNFS"] == "yes":
-        logging.debug("    Using a Central NFS server")
-        if systemconfig["NFSserver"] == "file:nfsmap":
-        #if it's a file check for it, failure results in downloading attempt from MBE
-            nfsmap_file=data_config.MYTHHOME+"/templates/nfsmap"
-            if not os.path.exists(nfsmap_file):
-                logging.debug("    Couldn't find local %s",nfsmap_file)
-                logging.info("    Trying to download nfsmap from MBE")
-                nfsmap_file = download_nfsmap(systemconfig["dbhost"])
-            nfslist = process_nfsmap_file(nfsmap_file)
-        # if it's an ip  parse ip and download file
-        elif re.search(systemconfig["NFSserver"],":nfsmap"):
-            ip=systemconfig["NFSserver"].split(":")[0]
-            nfsmap_file = download_nfsmap(ip)
-            nfslist = process_nfsmap_file(nfsmap_file)
-        #else treat it as a single mount point
-        else:
-            item = (systemconfig["NFSserver"] , systemconfig["NFSmount"])
-            nfslist.append(item)
-    else:
-        #if standalone or slave try to use MBE
-        if systemconfig["SystemType"] == "Frontend_only" or systemconfig["SystemType"] == "Slave_Backend":
-            item = (systemconfig["dbhost"] , data_config.DATAMOUNT)
-            nfslist.append(item)
-    setup_nfs_fstab(nfslist)
-    logging.info("__End of nfs\n")
-
-def setup_sleep(systemconfig):
-    logging.debug("____Setting up sleep____")
-    autoshutdown = systemconfig["AutoShutdown"]
-    stime1 = systemconfig["Shutdowntime"]
-    stime2 = systemconfig["Shutdowntime2"]
-    cstime1=''
-
-    if autoshutdown == "1" :
-        if  not stime1 == "-1" :
-            cstime1 = stime1
-            cshutdown = cstime1
-        if  not stime2 == "-1" :
-            if cstime1 :
-                cshutdown = "%s,%s" %(cstime1,stime2)
-            else:
-                cshutdown = stime2
-        logging.debug("    Shutdown time at %s",cshutdown)
-        cmd='''sed -e "s/HOUR/%s/g" %s/cron.template | crontab - -u mythtv''' %(cshutdown,systemconfig["TEMPLATES"])
-        mv_common.runcmd(cmd)
-    else:
-        logging.info("    Shutdown not enabled")
-        cmd='''sed -e "/00 HOUR.*/d" %s/cron.template | crontab - -u mythtv''' %systemconfig["TEMPLATES"]
-        mv_common.runcmd(cmd)
-
-    logging.debug("__End of  sleep\n")
-
-
-def process_nfsmap_file(mapfile):
-    logging.debug("   processing nfsmap file %s",mapfile)
-    nfslist = []
-    try:
-        f = open(mapfile,"r")
-        for line in f.readlines():
-            if line.startswith("#"):
-                continue
-            item = line.split()
-            if len(item) <= 1 :
-                continue
-            logging.debug("    %s",item)
-            nfslist.append(item)
-    except :
-        logging.critical("Couldn't read file %s, or some other error",mapfile)
-    return nfslist
-
-def scrubnfs(templates):
-    logging.info("    Scrubbing nfs")
-    mv_common.cp_and_log("/etc/fstab",templates+"/fstab.conf.template")
-    #used this sed cmd because it's clean and took me forever to figure out =)
-    cmd='''sed '/^#STARTSCRUB.*$/,/^#ENDSCRUB.*$/d' %s/fstab.conf.template > /etc/fstab''' %templates
-    mv_common.runcmd(cmd)
-
-def download_nfsmap(ip):
-    nfsmap_file="/tmp/nfsmap"
-    myurl="http://%s:1337/templates/nfsmap" %ip
-    req = Request(myurl)
-    try:
-        f = urlopen(req)
-        logging.info("    downloading %s", myurl)
-        local_file = open(nfsmap_file, "w")
-        #Write to our local file
-        local_file.write(f.read())
-        local_file.close()
-    #handle errors
-    except HTTPError, e:
-        logging.info("    File download failed")
-        logging.debug("    %s", myurl)
-        logging.debug("   HTTP Error: %s", e.code)
-    except URLError, e:
-        logging.info("    File download failed")
-        logging.debug("   %s",myurl)
-        logging.debug("   URL Error: %s ", e.reason)
-
-    return nfsmap_file
-
-def setup_nfs_fstab(nfslist):
-    logging.info("    Adding nfs paths to fstab")
-    try:
-        f = open('/etc/fstab', 'a')
-        line = "#STARTSCRUB --------------anything in this block will be scrubbed\n"
-        f.write(line)
-        for s, m in nfslist:
-            line = "%s %s    nfs \n" %(s,m)
-            logging.debug("    %s",line)
-            f.write(line)
-        line = "#ENDSCRUB\n"
-        f.write(line)
-        f.close()
-    except:
-        logging.critical("    *Couldn't open /etc/fstab for writing")
-    logging.debug("   Done adding nfs paths to fstab")
-
diff --git a/abs/mv-core/MythVantage-config/mv_network.py b/abs/mv-core/MythVantage-config/mv_network.py
deleted file mode 100755
index b80e4cc..0000000
--- a/abs/mv-core/MythVantage-config/mv_network.py
+++ /dev/null
@@ -1,507 +0,0 @@
-# -*- coding: utf-8 -*-
-import sys , os, commands , glob, time, re
-import logging
-import mv_common
-import socket, fcntl, struct, array
-import netifaces, iplib
-global etcnetdir
-etcnetdir = "/etc/net/ifaces"
-
-def setup_MYTH_DHCP(systemconfig):
-    default_interface = systemconfig["default_interface"]
-    try:
-        defaultdhcp = systemconfig["HostUSEDHCP"+default_interface]
-    except:
-        logging.critical("    *Error occured finding default dhcp")
-        defaultdhcp = "0"
-    logging.debug("    Using %s as dhcp value for %s",  defaultdhcp, default_interface)
-    return defaultdhcp
-
-def all_interfaces():
-    max_possible = 128  # arbitrary. raise if needed.
-    bytes = max_possible * 32
-    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-    names = array.array('B', '\0' * bytes)
-    outbytes = struct.unpack('iL', fcntl.ioctl(
-        s.fileno(),
-        0x8912,  # SIOCGIFCONF
-        struct.pack('iL', bytes, names.buffer_info()[0])
-    ))[0]
-    namestr = names.tostring()
-    return [namestr[i:i+32].split('\0', 1)[0] for i in range(0, outbytes, 32)]
-
-def get_ip(ifname):
-    logging.debug("    Finding ip address for %s", ifname)
-    all_if = all_interfaces()
-    logging.debug("    found interfaces:%s", all_if)
-    if ifname in all_if :
-        logging.debug("    Found %s in all_interfaces", ifname)
-    else:
-        logging.critical("*     Couldn't find %s in list", ifname)
-        ifname = all_if[0]
-        logging.critical("*     Using %s for interface name", ifname)
-
-
-    s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
-    return socket.inet_ntoa(fcntl.ioctl(
-        s.fileno(),
-        0x8915,  # SIOCGIFADDR
-        struct.pack('256s', ifname[:15])
-    )[20:24])
-
-def get_default_route(iface):
-    rcroute = "127.0.0.1" 
-    f = open ('/proc/net/route', 'r')
-    for line in f:
-        words = string.split (line)
-        netiface = words[0]
-        route =  words[2]
-        flags =  words[3]
-        try:
-            if ( netiface == iface ) and ( flags == "0003") :
-                route = iplib.IPv4Address(route, notation="hex")
-                t = str(route.get_dot())
-                s = t.split(".")
-                rcroute = s[3] + "." + s[2] + "." + s[1] + "." + s[0]
-                break
-        except ValueError:
-            pass
-    return rcroute
-
-def setup_MYTH_IP(systemconfig):
-    default_interface = systemconfig["default_interface"]
-    #check for dhcp in use
-    if setup_MYTH_DHCP(systemconfig) == "0":
-        logging.debug("   dhcp is in use, finding dhcp ip")
-        defaultip = get_ip(default_interface)
-    else:
-        try:
-            defaultip = systemconfig["Hostip"+default_interface]
-        except:
-            logging.debug("    Error occured finding the defaultip")
-            defaultip = "127.0.0.1"
-    logging.debug("    Using %s as default ip", defaultip)
-    return defaultip
-
-
-def setup_MYTH_GW(systemconfig):
-    default_interface = systemconfig["default_interface"]
-    #check for dhcp in use
-    if setup_MYTH_DHCP(systemconfig) == "0":
-        logging.debug("   dhcp is in use, finding dhcp ip")
-        defaultgw = get_default_route(default_interface)
-    else:
-        try:
-            defaultgw = systemconfig["Hostgw"+default_interface]
-        except:
-            logging.debug("    Error occured finding the defaultgw")
-            defaultgw = "127.0.0.1"
-    logging.debug("    Using %s as default gw", defaultgw)
-    return defaultgw
-
-
-def setup_MTYH_DNS():
-    returndns = "127.0.0.1"
-    try:
-      f = open ('/etc/resolv.conf', 'r')
-      for line in f:
-          if line.startswith("nameserver"):
-              print line
-              returndns = line.split()[1]  
-              break
-    except:
-      logging.debug("   Couldn't open /etc/resolv.conf for myth_dns")
-    logging.debug("   using %s for myth_dns", returndns)
-    return returndns
-
-
-
-
-
-def flush(netdev):
-    logging.debug("    Flushing %s",netdev)
-    cmd = '''ip address flush dev %s''' %netdev
-    mv_common.runcmd(cmd)
-
-def kill_dhcp(basedir):
-    logging.debug("    _Start of kill_dhcp")
-    logging.debug("    Killing off dhcpd")
-    stddir = os.getcwd()
-    piddir = ("%s/var/run/") %basedir
-    try:
-        os.chdir(piddir)
-        for FILE in glob.glob("dhcpcd-*.pid"):
-            f = open(FILE,'r')
-            pid = f.readline()
-            f.close
-            cmd = "kill -9 %s" %pid
-            mv_common.runcmd(cmd)
-            mv_common.remove_file(FILE)
-        os.chdir(stddir)
-    except:
-        pass
-
-def setup_nameserver(dns):
-    logging.info("    Adding %s for DNS", dns)
-    cmd = '''grep -q %s /etc/resolv.conf''' %dns
-    status = mv_common.runcmd(cmd)
-    if  not status == 0 :
-        cmd =  ''' echo "nameserver %s" >> /etc/resolv.conf ''' %dns
-        mv_common.runcmd(cmd)
-
-
-
-def setup_hostname(systemconfig):
-    logging.debug("   _Start of setup_hostname")
-    try:
-        hostname = systemconfig["hostname"]
-    except:
-        logging.critical("    *Hostname could not be set")
-        logging.info("    Using default value of me")
-        hostname = "me"
-    logging.info("    Setting the hostname to %s", hostname)
-    cmd = ''' echo %s > /etc/hostname ''' %hostname
-    mv_common.runcmd(cmd)
-    cmd = "cat /etc/hosts | grep -v 127.0.0.1 | grep -v %s > /tmp/hosts" %hostname
-    mv_common.runcmd(cmd)
-    if systemconfig["mythdhcp"] == "1" :
-        logging.debug("    not using dhcp")
-        cmd = ''' echo 127.0.0.1 localhost  > /etc/hosts '''
-        mv_common.runcmd(cmd)
-        cmd = ''' echo %s %s  > /etc/hosts ''' %(systemconfig["mythip"], systemconfig["hostname"])
-        mv_common.runcmd(cmd)
-    else:
-        cmd = ''' echo 127.0.0.1 %s localhost  > /etc/hosts ''' %systemconfig["hostname"]
-        mv_common.runcmd(cmd)
-    cmd = '''cat /tmp/hosts >> /etc/hosts '''
-    mv_common.runcmd(cmd)
-
-
-def write_wpafile(line,netdev):
-    logging.debug("    writing out wpa_supplicant.conf file")
-    logging.debug(line)
-    wpafile = etcnetdir+"/"+netdev+"/wpa_supplicant.conf"
-    try:
-        f = open(wpafile,'w')
-        f.write(line)
-        f.close()
-    except:
-        logging.debug("    Couldn't write to %s",wpafile)
-
-def setup_wpa(netinfo,netdev):
-    logging.info("    %s will use wpa for encryption",netdev)
-    line = '''
-#This file was automaticly generated, any changes may be lost
-ctrl_interface=/var/run/wpa_supplicant
-network={
-    ssid="%s"
-    # Preshared key as an ASCII passphrase
-    psk="%s"
-    scan_ssid=1
-    key_mgmt=WPA-EAP WPA-PSK NONE
-    pairwise=CCMP TKIP
-    proto=WPA RSN
-}''' %(netinfo["ESSID"],netinfo["KEY"])
-    write_wpafile(line,netdev)
-
-def setup_wep(netinfo,netdev):
-    logging.info("    %s will use wep for encryption",netdev)
-    logging.debug("    When a packet comes along, you must wep it")
-    line='''
-#This file was automaticly generated, any changes may be lost
-ctrl_interface=/var/run/wpa_supplicant
-network={
-        ssid="%s"
-        key_mgmt=NONE
-        wep_key0=%s
-        wep_tx_keyidx=0
-        scan_ssid=1
-        auth_alg=SHARED
-}
-''' %(netinfo["ESSID"],netinfo["KEY"])
-    write_wpafile(line,netdev)
-
-
-def setup_none(netinfo,netdev):
-    logging.info("    %s will not use encryption",netdev)
-    line = '''
-#This file was automaticly generated, any changes may be lost
-ctrl_interface=/var/run/wpa_supplicant
-network={
-        ssid="%s"
-        key_mgmt=NONE
-}
-''' %netinfo["ESSID"]
-    write_wpafile(line,netdev)
-
-def setup_interface(netdev,systemconfig):
-    logging.debug("    _Start of setup_interface for %s",netdev)
-    nettrans = {'Hostip':'ip',
-                'Hostnetmask':'netmask',
-                'HostActive':'isactive',
-                'HostDNS':'dns',
-                'HostUSEDHCP':'UseDHCP',
-                'HostGW':'GW',
-                'HostMTU':'mtu',
-                'HOST_iswireless':"wireless",
-                'HostESSID':'ESSID',
-                'HostKey':'KEY',
-                'HostUseEncryption':'ENCRYPT'}
-    netinfo = {}
-    #populate the netinfo dict
-    for netitem in nettrans:
-        if systemconfig[netitem+netdev]:
-            netinfo[nettrans[netitem]] = systemconfig[netitem+netdev]
-        else:
-            netinfo[nettrans[netitem]] = False
-        logging.debug("     %s:%s",netitem,netinfo[nettrans[netitem]])
-    logging.info("    %s wireless: %s", netdev,netinfo["wireless"])
-    try:
-        os.makedirs(etcnetdir)
-    except:
-        logging.debug("   Could not create %s",etcnetdir)
-
-    optionfile=etcnetdir+"/"+netdev+"/options"
-    if not os.path.exists(optionfile):
-	try:
-            os.makedirs(etcnetdir+"/"+netdev)
-	except:
-            pass
-        mv_common.cp_and_log(systemconfig["TEMPLATES"]+"/etcnet/eth/options", optionfile)
-
-    if netinfo["isactive"] == "1" :
-        change_iface_state(netdev,"enabled")
-    else:
-        change_iface_state(netdev,"disabled")
-
-    if netinfo["wireless"] == "1" :
-
-        logging.info("    Enabling wireless extensions")
-        cmd = ''' sed -i -e 's/^CONFIG_WIRELESS=.*$/CONFIG_WIRLESS=yes/g'  %s/%s/options''' %(etcnetdir,netdev)
-        mv_common.runcmd(cmd)
-        if netinfo["ENCRYPT"] == "WEP":
-            setup_wep(netinfo,netdev)
-        elif netinfo["ENCRYPT"] == "WPA":
-            setup_wpa(netinfo,netdev)
-        elif netinfo["ENCRYPT"] == "none":
-            setup_none(netinfo,netdev)
-
-    else:
-        logging.info("    Disabling wireless extensions")
-        cmd = '''sed -i -e 's/^CONFIG_WIRLESS=.*$/CONFIG_WIRLESS=no/g' %s/%s/options''' %(etcnetdir, netdev)
-        mv_common.runcmd(cmd)
-        #try:
-        wpafile=etcnetdir+"/"+netdev+"/wpa_supplicant.conf"
-            #os.remove(wpafile)
-        mv_common.remove_file(wpafile)
-        #except:
-            #logging.debug("    Couldn't remove %s",wpafile)
-
-    if netinfo["UseDHCP"] == "0" :
-        logging.info("    Enabling DHCP support")
-        cmd = ''' sed -i -e 's/^BOOTPROTO=.*$/BOOTPROTO=dhcp/g' %s/%s/options''' %(etcnetdir, netdev)
-        mv_common.runcmd(cmd)
-    else:
-        logging.info("    Using static ip address of %s",netinfo["ip"])
-        cmd = ''' sed -i -e 's/^BOOTPROTO=.*$/BOOTPROTO=static/g' %s/%s/options''' %(etcnetdir, netdev)
-        mv_common.runcmd(cmd)
-        cmd = '''echo "default via %s" > %s/%s/ipv4route''' %(netinfo["GW"], etcnetdir, netdev)
-        mv_common.runcmd(cmd)
-        cmd = '''echo "%s%s" > %s/%s/ipv4address ''' %(netinfo["ip"], netinfo["netmask"].split()[0], etcnetdir, netdev)
-        mv_common.runcmd(cmd)
-        setup_nameserver(netinfo["dns"])
-
-    if netinfo["mtu"] :
-        logging.info("    Setting mtu to %s", netinfo["mtu"])
-        cmd = '''sed -i '/^mtu.*$/d' %s/%s/iplink''' %(etcnetdir,netdev)
-        mv_common.runcmd(cmd)
-        cmd = ''' echo "mtu %s" >> %s/%s/iplink''' %(netinfo["mtu"], etcnetdir,netdev)
-        mv_common.runcmd(cmd)
-    else:
-        logging.info("    Using default mtu value")
-        cmd = '''sed -i '/^mtu.*$/d' %s/%s/iplink''' %(etcnetdir,netdev)
-        mv_common.runcmd(cmd)
-
-
-def change_iface_state(netdev, state):
-    if state == "enabled":
-        logging.info("    Activating %s", netdev)
-        cmd = '''sed -i -e 's/^ONBOOT=.*$/ONBOOT=yes/g' %s/%s/options''' %(etcnetdir,netdev)
-        mv_common.runcmd(cmd)
-        cmd = '''sed -i -e 's/^DISABLED=.*$/DISABLED=no/g' %s/%s/options ''' %(etcnetdir,netdev)
-        mv_common.runcmd(cmd)
-    else:
-        logging.info("    Disabling %s", netdev)
-        cmd = '''sed -i -e 's/^ONBOOT=.*$/ONBOOT=no/g' %s/%s/options''' %(etcnetdir,netdev)
-        mv_common.runcmd(cmd)
-        cmd = '''sed -i -e 's/^DISABLED=.*$/DISABLED=yes/g' %s/%s/options ''' %(etcnetdir,netdev)
-        mv_common.runcmd(cmd)
-        cmd = "/sbin/ifconfig %s down" %netdev
-        mv_common.runcmd(cmd)
-        cmd = "ip address flush %s" %netdev
-        mv_common.runcmd(cmd)
-
-def devcheck(netdev):
-    cmd = ''' /sbin/ifconfig %s''' %netdev
-    rc = mv_common.runcmd(cmd)
-    if rc == 0 :
-        return True
-    else:
-        return False
-
-def udev_rules(netdev):
-    filename = "/etc/udev/rules.d/net.rules"
-    if devcheck(netdev):
-        logging.info("    Finding macaddress for %s",netdev)
-        try:
-            macaddress = netifaces.ifaddresses(netdev)[netifaces.AF_LINK][0]['addr']
-            logging.debug("    Macaddress: %s",macaddress)
-        except:
-            logging.debug("    Couldn't find mac address for %s",netdev)
-            return
-        try:
-            f = open(filename,'a')
-        except:
-            logging.debug("    Couldn't open %s for writing", filename)
-            return
-        if netdev.startswith('eth'):
-            line = '''KERNEL=="eth*", SYSFS{address}=="%s", NAME="%s"''' % ( macaddress , netdev)
-        elif netdev.startswith('wlan'):
-            line = '''KERNEL=="wlan*", SYSFS{address}=="%s", NAME="%s"'''% ( macaddress , netdev)
-        elif netdev.startswith('ath'):
-            line = '''KERNEL=="ath*", SYSFS{address}=="%s", NAME="%s"''' % ( macaddress , netdev)
-        logging.debug("     adding to net.rules ")
-        logging.debug("    %s",line)
-        f.write(line)
-        f.write("\n")
-        f.close()
-
-def find_active(systemconfig,this_is_install):
-    interfacelist=('eth0', 'eth1', 'wlan0', 'wlan1', 'ath0')
-    logging.debug("    _Start of find_active")
-
-    if systemconfig["mythdhcp"] == "1":
-        mv_common.remove_file("/etc/resolv.conf")
-        cmd = ''' echo search lan > /etc/resolv.conf '''
-        mv_common.runcmd(cmd)
-        cmd = ''' echo nameserver 127.0.0.1 >> /etc/resolv.conf '''
-        mv_common.runcmd(cmd)
-
-    for netdev in interfacelist:
-        if this_is_install:
-            udev_rules(netdev)
-        currentnet = "HostActive" + netdev
-        try:
-            systemconfig[currentnet]
-        except:
-            logging.debug("    %s is not defined",currentnet)
-            change_iface_state(netdev, "disabled")
-            continue
-        if systemconfig[currentnet] == "1" :
-            #check if device is present
-            if devcheck(netdev) :
-                setup_interface(netdev,systemconfig)
-            else:
-                logging.debug("    Interface %s not found in config", netdev)
-                #change_iface_state(netdev, "disabled")
-        else:
-            change_iface_state(netdev, "disabled")
-
-def vnc_netboot_check():
-    logging.debug("    Start of VNC/NETBOOT check")
-    vnc = False
-    netboot = False
-    try:
-        f = open('/proc/cmdline', 'r')
-        bootoptions = f.readlines()
-        f.close()
-    except:
-        logging.critical("    *Couldn't open /proc/cmdline")
-        logging.debug("    Assuming it's ok to fiddle with the network")
-        return True
-    bootoptions =  bootoptions[0]
-    if re.match("vnc",bootoptions) != None :
-        logging.debug("    Found VNC option")
-        vnc = True
-    if re.match("nfsroot",bootoptions) != None :
-        logging.debug("    Found netboot option")
-        netboot = True
-
-    return (vnc or netboot)
-
-def start_network():
-    if not vnc_netboot_check():
-        logging.info("    Restarting network")
-        cmd ="/etc/net/scripts/network.init reload"
-        mv_common.runcmd(cmd)
-        cmd ="/etc/net/scripts/network.init restart"
-        mv_common.runcmd(cmd)
-    else:
-        logging.info("    Will not restart network due to netboot/vnc")
-
-
-def stop_network():
-    if not vnc_netboot_check():
-        logging.info("    Stopping network")
-        cmd ="/etc/net/scripts/network.init stop"
-        mv_common.runcmd(cmd)
-        kill_dhcp("")
-        interfacelist=('eth0', 'eth1', 'wlan0', 'wlan1', 'ath0')
-        for i in interfacelist:
-            flush(i)
-    else:
-        logging.info("    Will not stop network due to netboot/vnc")
-    pass
-
-def hostname_change_check(systemconfig):
-    restartfe = False
-    logging.debug("    _Start of hostname_change_check")
-    oldhostname = socket.gethostname()
-    #oldhostname = "crap"
-    newhostname = systemconfig["hostname"]
-    mv_root = systemconfig["MVROOT"]
-    logging.debug("    Old hostname: %s", oldhostname)
-    logging.debug("    New hostname: %s", newhostname)
-    if oldhostname != newhostname :
-        logging.info("    Changing hostname in database to match new hostname")
-        cmd ="%s/bin/restore_default_settings.sh -cuhostname -o -h%s" %(mv_root, oldhostname)
-        mv_common.runcmd(cmd)
-        logging.info("    Changing hostname to %s", newhostname)
-        cmd = "hostname %s" %newhostname
-        mv_common.runcmd(cmd)
-        if systemconfig["SystemType"] != "Frontend_only" :
-            logging.info("    Restarting backend")
-            mv_common.stop_service("mythbackend")
-            mv_common.start_service("mythbackend")
-            restartfe = True
-    else:
-        logging.debug("    old and new hostnames matched, leaving things along")
-    logging.debug("  __End of hostname_change_check")
-    return restartfe
-
-
-
-def setup_network (systemconfig,this_is_install):
-    logging.info("____Start of network____")
-    logging.info("    Setting up the network")
-    restartfe = hostname_change_check(systemconfig)
-    setup_hostname(systemconfig)
-    find_active(systemconfig,this_is_install)
-    start_network()
-    logging.info("__End of network\n")
-    return restartfe
-
-
-
-##this is used by the install process to start the network
-def install_network_setup(systemconfig):
-    logging.info("____Start of network_install____")
-    logging.info("    Setting up the network")
-    #setup_MYTH_vars
-    setup_hostname(systemconfig)
-    stop_network()
-    find_active(systemconfig)
-    start_network()
-    logging.info("__End of network install \n")
-
-
diff --git a/abs/mv-core/MythVantage-config/mv_screensaver.py b/abs/mv-core/MythVantage-config/mv_screensaver.py
deleted file mode 100755
index 2da970c..0000000
--- a/abs/mv-core/MythVantage-config/mv_screensaver.py
+++ /dev/null
@@ -1,199 +0,0 @@
-# -*- coding: utf-8 -*-
-import logging, mv_common
-import re
-import os
-
-
-def mplayer_saver_check (cmd,templatefile):
-    logging.debug("    Checking for heartbeat command in mplayer.conf")
-    mplayerconf = "/etc/mplayer/mplayer.conf"
-    if not os.path.exists(mplayerconf):
-        logging.debug("    copying in mplayer template file")
-        mv_common.cp_and_log(templatefile, mplayerconf)
-
-    try:
-        f = open(mplayerconf, 'r')
-        mplayerconf_contents = f.readlines()
-        f.close()
-    except:
-        logging.debug("    Couldn't open %s for reading",mplayerconf)
-        mplayerconf_contents = "#\n"
-
-    try:
-        f = open(mplayerconf, 'w')
-    except:
-        logging.debug("    Couldn't open %s for writing",mplayerconf)
-        return
-
-    for line in mplayerconf_contents:
-        if re.match("^.*stop-xscreensaver",line):
-            continue
-        elif re.match("^.*heartbeat-cmd",line):
-            continue
-        else:
-            f.write(line)
-
-    f.write("stop-xscreensaver = 0\n")
-    line='''heartbeat-cmd="%s"\n''' %cmd
-    f.write(line)
-    f.close()
-
-
-def killxscreensaver():
-    logging.info("   Stopping xscreensaver")
-    cmd="xscreensaver-command --exit "
-    mv_common.runcmd(cmd)
-    cmd="killall xscreensaver "
-    mv_common.runcmd(cmd)
-
-def killgscreensaver():
-    logging.info("    Stopping gnome-screensaver")
-    cmd="gnome-screensaver-command --exit "
-    mv_common.runcmd(cmd)
-    cmd="killall gnome-screensaver "
-    mv_common.runcmd(cmd)
-
-
-def setup_x_screensaver(idle,theme,screenconfigfile,templatefile):
-    logging.info("    Configuring X screensaver")
-    killgscreensaver()
-    logging.debug("    Why can't xscreensaver have a nice configuration !")
-
-    if not os.path.exists(screenconfigfile):
-        logging.debug("   copying in new template file")
-        mv_common.cp_and_log(templatefile,screenconfigfile)
-
-    try:
-        f = open(screenconfigfile, 'r')
-        screenconfigcontents=f.readlines()
-        f.close()
-    except:
-        logging.info("Couldn't open %s for reading",screenconfigfile)
-        return
-    try:
-        f = open(screenconfigfile, 'w')
-    except:
-        logging.info("Couldn't open %s for writing",screenconfigfile)
-        return
-
-    startline=0
-    foundline=0
-
-    for k, line in enumerate(screenconfigcontents):
-        if re.match("programs:",line):
-            startline = k
-        if re.search(theme,line):
-            foundline = k
-    themenumber=foundline-startline-2
-
-    for line in screenconfigcontents:
-        if re.match("selected.*$",line):
-            continue
-
-        if re.match("timeout",line):
-            logging.info("    Setting idletime to %s",idle)
-            outline = "timeout:   0:%s:00 \n" %idle
-            f.write(outline)
-        elif re.match("mode",line):
-            if theme == "Random":
-                logging.info("    Setting theme to %s", "Random")
-                outline = "mode:    random \n"
-                f.write(outline)
-                outline = "selected:    -1 \n"
-                f.write(outline)
-                continue
-
-            elif theme == "Blank":
-                logging.info("    Setting theme to %s", "blank")
-                outline = "mode:    blank \n"
-                f.write(outline)
-                outline = "selected:    -1 \n"
-                f.write(outline)
-                continue
-
-            else:
-                logging.info("    Setting theme to %s", theme)
-                outline = "mode:    one\n"
-                f.write(outline)
-                logging.debug("    Theme number is %s",themenumber)
-                outline = "selected:    %s\n" %themenumber
-                f.write(outline)
-                continue
-
-        else:
-            outline = line
-            f.write(outline)
-    f.close()
-    logging.debug("__End of xscreensaver")
-
-def setup_gnome_screensaver(theme,idletime):
-    logging.info("    Configuring gnome screensaver")
-
-    logging.info("    Disabling lock screen")
-    cmd='''gconftool-2 --direct   --config-source xml:readwrite:/etc/gconf/gconf.xml.mandatory  --type bool   --set /apps/gnome-screensaver/lock_enabled false'''
-    mv_common.runcmd(cmd)
-
-    logging.info("    Setting idletime to %s",idletime)
-    cmd='''gconftool-2 --direct  --config-source xml:readwrite:/etc/gconf/gconf.xml.mandatory  --type int -s "/apps/gnome-screensaver/idle_delay" %s''' %idletime
-    mv_common.runcmd(cmd)
-
-    logging.info("    Setting mode to single")
-    cmd='''gconftool-2 --direct  --config-source xml:readwrite:/etc/gconf/gconf.xml.mandatory  --type string -s "/apps/gnome-screensaver/mode" single'''
-    mv_common.runcmd(cmd)
-
-    if theme == "Random":
-        logging.info("    setting theme to random")
-        cmd='''gconftool-2 --direct  --config-source xml:readwrite:/etc/gconf/gconf.xml.mandatory  --type string -s "/apps/gnome-screensaver/mode" random'''
-        mv_common.runcmd(cmd)
-
-    elif theme == "Blank":
-        logging.info("    setting theme to blank")
-        cmd='''gconftool-2 --direct  --config-source xml:readwrite:/etc/gconf/gconf.xml.mandatory  --type string -s "/apps/gnome-screensaver/themes" blank'''
-        mv_common.runcmd(cmd)
-
-    else:
-        logging.info("    setting theme to %s",theme)
-        cmd='''gconftool-2  --direct  --config-source xml:readwrite:/etc/gconf/gconf.xml.mandatory --set --type list --list-type=string /apps/gnome-screensaver/themes [screensavers-%s]''' %theme
-        mv_common.runcmd(cmd)
-
-    killxscreensaver()
-    logging.info("__End gnome screensaver")
-
-
-
-
-def setup_screensaver (systemconfig,data_config):
-    logging.info("____Start of screensaver configuration____")
-    screensavertype = systemconfig["Screensavertype"]
-    theme = systemconfig["Screensavertheme"]
-    idletime = systemconfig["Screensaveridle"]
-    configfile = data_config.MYTHHOME+"/.xscreensaver"
-    templatefile = systemconfig["TEMPLATES"]+"/xscreensaver.template"
-    mtemplate = systemconfig["TEMPLATES"]+"/mplayer.conf.template"
-
-    if screensavertype == "xscreensaver":
-        mv_common.pacinstall("xscreensaver")
-        mv_common.pacremove("gnome-screensaver")
-        setup_x_screensaver(idletime, theme, configfile, templatefile)
-        mplayer_saver_check("/usr/bin/xscreensaver-command -deactivate &",mtemplate)
-
-    elif screensavertype == "gscreensaver":
-        mv_common.pacinstall("xscreensaver")
-        mv_common.pacinstall("gnome-screensaver")
-        setup_gnome_screensaver(theme,idletime)
-        mplayer_saver_check("/usr/bin/gnome-screensaver-command -p &",mtemplate)
-
-    elif screensavertype == "none":
-        mv_common.pacremove("xscreensaver")
-        mv_common.pacremove("gnome-screensaver")
-        killgscreensaver()
-        killxscreensaver()
-
-    elif screensavertype == "tinker" :
-        logging.debug("    screensaver tinker mode detected")
-    else:
-        logging.debug("   Unknown screensaver")
-    logging.info("__End of screensaver\n")
-
-
-
diff --git a/abs/mv-core/MythVantage-config/mv_smolt.py b/abs/mv-core/MythVantage-config/mv_smolt.py
deleted file mode 100755
index 5fd3722..0000000
--- a/abs/mv-core/MythVantage-config/mv_smolt.py
+++ /dev/null
@@ -1,59 +0,0 @@
-# -*- coding: utf-8 -*-
-import logging
-import mv_common
-
-def read_release(stype):
-    if stype == "LinHES":
-        rfile = "/etc/LinHES-release"
-    else:
-        rfile = "/etc/MythVantage-release"
-
-    try:
-        f= open(rfile,'r')
-        releasename = f.readlines()[0]
-        f.close()
-    except:
-        logging.debug("    Couldn't open %s",rfile)
-        releasename = "unknown"
-
-    return releasename
-
-
-def setup_smolt_type(SystemType,Remotetype,RunFrontend,mythhome,stype):
-    logging.debug("____Start of setup_smolt_type____")
-    releasename = read_release(stype)
-
-    if SystemType == "Standalone":
-        smoltsystem = 6
-        MVRELEASE="%s (Standalone)" %releasename
-    elif SystemType == "Master_backend":
-        if RunFrontend == "1":
-            smoltsystem = 2
-            MVRELEASE="%s (MBE with Frontend)" %releasename
-        else:
-            smoltsystem=1
-            MVRELEASE="%s (MBE)" %releasename
-    elif SystemType == "Slave_backend":
-        if RunFrontend == "1" :
-            smoltsystem = 4
-            MVRELEASE="%s (SLAVE  with Frontend)" %releasename
-        else:
-            smoltsystem = 5
-            MVRELEASE="%s (SLAVE)" %releasename
-    elif SystemType == "Frontend_only":
-        smoltsystem = 3
-        MVRELEASE="%s ( Frontend only)" %releasename
-
-    logging.debug("    smolt type is %s : %s", MVRELEASE,smoltsystem)
-    smoltfile = mythhome+"/.mythtv/smolt.info"
-    cmd = ''' echo  "%s" > /etc/os_myth_release ''' %MVRELEASE
-    mv_common.runcmd(cmd)
-
-    cmd = '''echo "systemtype=%s" > %s''' %(smoltsystem,smoltfile)
-    mv_common.runcmd(cmd)
-
-    cmd = '''echo "remote=%s" >> %s ''' %(Remotetype,smoltfile)
-    mv_common.runcmd(cmd)
-
-    logging.debug("__End of setup_smolt_type")
-
diff --git a/abs/mv-core/MythVantage-config/mv_software.py b/abs/mv-core/MythVantage-config/mv_software.py
deleted file mode 100755
index e5b96b2..0000000
--- a/abs/mv-core/MythVantage-config/mv_software.py
+++ /dev/null
@@ -1,41 +0,0 @@
-# -*- coding: utf-8 -*-
-import logging, mv_common
-import os, re
-
-def setup_software(systemconfig, data_config):
-    logging.info("____Start of Software install____")
-    default_disabled = ("mythphone", "mytharchive", "mythbrowser", "mythnews",
-                        "mythgame", "mythflix", "mythweather",
-                        "mythappletrailers", "mythstream", "mythvodka")
-
-    default_installed=("mythcontrols", "mythgallery", "mythmovies",
-                        "mythmusic", "mythsmolt", "mythvideo")
-    other_pkg=("miro", "xe", "romdb", "xine", "dvdcss", "webmin" , "fuppes")
-
-    for pkg in default_disabled:
-        try:
-            if systemconfig[pkg] == "1":
-                mv_common.pacinstall(pkg)
-            else:
-                mv_common.pacremove(pkg)
-        except:
-            logging.debug("  ERROR-- %s is not defined", pkg)
-
-    for pkg in default_installed:
-        try:
-            if systemconfig[pkg] == "0":
-                mv_common.pacremove(pkg)
-            else:
-                mv_common.pacinstall(pkg)
-        except:
-            logging.debug("  ERROR-- %s is not defined", pkg)
-
-    for pkg in other_pkg:
-        try:
-            if systemconfig[pkg] == "1":
-                mv_common.pacinstall(pkg)
-            elif systemconfig[pkg] == "0":
-                mv_common.pacremove(pkg)
-        except:
-            logging.debug("   ERROR-- %s is not defined", pkg)
-    logging.info("__End Software\n ")
\ No newline at end of file
diff --git a/abs/mv-core/MythVantage-config/mv_webuser.py b/abs/mv-core/MythVantage-config/mv_webuser.py
deleted file mode 100755
index a8517a8..0000000
--- a/abs/mv-core/MythVantage-config/mv_webuser.py
+++ /dev/null
@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-import logging, mv_common
-#import os
-
-def setup_web_auth(UseMythWEB_auth):
-    logging.info("____Start of setup_web_auth____")
-    if UseMythWEB_auth == str(1):
-        #enable auth
-        logging.info("    Enabling authorization for mythweb")
-        cmd='''sed -i "s/^.*include.*auth-inc.conf.*$/include \\"\/etc\/lighttpd\/auth-inc.conf\\"/g" /etc/lighttpd/lighttpd.conf'''
-        mv_common.runcmd(cmd)
-    else:
-        #disable auth
-        logging.info("    Disabling authorization for mythweb")
-        cmd='''sed -i "s/^.*include.*auth-inc.conf.*$/#include \\"\/etc\/lighttpd\/auth-inc.conf\\"/g" /etc/lighttpd/lighttpd.conf'''
-        mv_common.runcmd(cmd)
-    logging.debug("Restarting lighttpd")
-    cmd="sudo sv restart lighttpd"
-    mv_common.runcmd(cmd)
-    logging.info("__End of webauth\n")
-
diff --git a/abs/mv-core/MythVantage-config/myth_user_call b/abs/mv-core/MythVantage-config/myth_user_call
deleted file mode 100644
index 0479895..0000000
--- a/abs/mv-core/MythVantage-config/myth_user_call
+++ /dev/null
@@ -1,172 +0,0 @@
-#!/bin/bash
-#Wrapper script to manage USERNAME accounts + web security
-# myth_USERNAME_all -c add -u USERNAME
-# myth_USERNAME_all -c delete -u USERNAME
-# myth_USERNAME_all -c pass  -u USERNAME -p pass
-# myth_USERNAME_all -c web  -u USERNAME -p pass
-
-INIT_CHECK=TRUE
-FULL_CALL="$@"
-function CHROOT_CHECK {
-    INIT=`ps -p 1 -o comm=`
-    if [ x$INIT = xrunit ]
-    then
-       CHROOT_NEEDED=FALSE
-    else
-       CHROOT_NEEDED=TRUE
-    fi
-}
-
-function store_commands () {
-    echo "$FULL_CALL" >> /root/myth_user_call.out
-    chmod 600 /root/myth_user_call.out
-}
-
-
-function add_user() {
-    if [ $CHROOT_NEEDED = TRUE ]
-    then
-        echo "calling myth_call_user in chroot to add user"
-        store_commands
-    else
-        echo "adding user $USERNAME"
-	useradd -m -s /bin/bash $USERNAME -G audio,video,optical,storage,users
-    fi
-
-}
-
-
-function del_user() {
-    if [ $CHROOT_NEEDED = TRUE ]
-    then
-        echo "calling myth_call_user in chroot to delete user"
-        store_commands
-    else
-        echo "removing  user $USERNAME"
-        userdel $USERNAME
-    fi
-
-}
-
-
-function pass_change() {
-    if [ $CHROOT_NEEDED = TRUE ]
-    then
-        echo "calling myth_call_user in chroot to change password"
-        store_commands
-    else
-        echo "changing password for $USERNAME"
-        echo $USERNAME:$PASSWORD | chpasswd
-    fi
-
-}
-
-
-function web_security {
-
-    grep -q ${USERNAME}: /etc/lighttpd/lighttpd.user
-    if [ $? = 0 ]
-    then
-            #delete user
-            sed -i "/${USERNAME}\:/d"  /etc/lighttpd/lighttpd.user
-    fi
-    echo "${USERNAME}:${PASSWORD}" >> /etc/lighttpd/lighttpd.user
-
-}
-
-function ARG_ERR()  {
-        if [  x$OPTARG = "x" ]
-        then
-            echo "$SWITCH NEEDS AND ARG"
-            exit 11
-        fi
-}
-
-
-function print_help {
-
-    echo "Valid options are:"
-    echo "  -c (add|delete|pass|web)"
-    echo "  -u  USERNAMEname"
-    echo "  -p  password"
-    exit 1
-}
-
-if [ $# -eq 0 ]
-then
-    print_help
-fi
-
-declare -r OPTSTRING="c:u:p:i"
-while getopts "$OPTSTRING"  SWITCH
-do
-    case $SWITCH in
-
-            c)  ARG_ERR
-                OPERATION=$OPTARG
-                ;;
-            u)  ARG_ERR
-                USERNAME=$OPTARG
-                ;;
-            p)  ARG_ERR
-                PASSWORD=$OPTARG
-                ;;
-            i)  INIT_CHECK=FALSE
-
-    esac
-done
-
-if [ $INIT_CHECK = TRUE ]
-then
-    CHROOT_CHECK
-else
-    CHROOT_NEEDED=FALSE
-fi
-
-case $OPERATION in
-    add)
-            if [ x$USERNAME = x ]
-            then
-                print_help
-            fi
-            add_user
-        ;;
-    delete)
-            if [ x$USERNAME = x ]
-            then
-                print_help
-            fi
-            del_user
-        ;;
-    pass)
-            if [ x$USERNAME = x ]
-            then
-                print_help
-            fi
-
-            if [ x$PASSWORD = x ]
-            then
-                print_help
-            fi
-            pass_change
-        ;;
-
-    web)
-            if [ x$USERNAME = x ]
-            then
-                print_help
-            fi
-
-
-            if [ x$PASSWORD = x ]
-            then
-                print_help
-            fi
-            echo "adding webUSERNAME $USERNAME with pass $PASSWORD"
-	    web_security
-            ;;
-    *)  print_help
-        ;;
-esac
-
-
diff --git a/abs/mv-core/MythVantage-config/myth_user_call.py b/abs/mv-core/MythVantage-config/myth_user_call.py
deleted file mode 100755
index 63915a4..0000000
--- a/abs/mv-core/MythVantage-config/myth_user_call.py
+++ /dev/null
@@ -1,159 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-#Wrapper script to manage USERNAME accounts + web security
-# myth_USERNAME_all -c add -u USERNAME
-# myth_USERNAME_all -c delete -u USERNAME
-# myth_USERNAME_all -c pass  -u USERNAME -p pass
-# myth_USERNAME_all -c web  -u USERNAME -p pass
-
-import pexpect, sys, time
-import os, re, getopt
-import mv_common
-
-
-
-
-def chroot_check():
-    if  not INIT_CHECK :
-        return False
-    cmd = '''ps -p 1 -o comm='''
-    init = mv_common.runcmd_output(cmd).strip()
-    if init == "runit":
-        return False
-    else:
-        return True
-
-
-def store_commands(full_call):
-    file_name = "/root/myth_user_call.out"
-    try:
-        f = open(file_name,'a')
-    except:
-        print "%s could not be opened" % file_name
-        sys.exit(1)
-    f.write(full_call)
-    f.write("\n")
-    f.close()
-    try:
-        os.chmod(600,file_name)
-    except:
-        pass
-
-
-def add_user(username,full_call):
-    if chroot_check() :
-        print "calling myth_call_user in chroot to add user"
-        store_commands(full_call)
-    else:
-        print "Adding user %s" %username
-        cmd = '''useradd -m -s /bin/bash %s -G audio,video,optical,storage,users''' %username
-        mv_common.runcmd(cmd)
-        cmd = ''' usermod -a -G mythtv %s ''' %username
-
-
-def del_user(username,full_call):
-    if chroot_check() :
-        print "calling myth_call_user in chroot to del user"
-        store_commands(full_call)
-    else:
-        print "Removing  user %s" %username
-        cmd = '''userdel  %s ''' %username
-        mv_common.runcmd(cmd)
-
-
-def pass_change(username,password,full_call) :
-    if chroot_check() :
-        print "calling myth_call_user in chroot to change password"
-        store_commands(full_call)
-    else:
-        print "changing password for %s" %username
-        passwd = pexpect.spawn("/usr/bin/passwd %s" % username)
-
-        for repeat in (1, 2):
-                passwd.expect("password: ")
-                passwd.sendline(password)
-                time.sleep(0.1)
-
-def web_security(username,password) :
-    file_name = "/etc/lighttpd/lighttpd.user"
-    file_contents = ''
-    if  os.path.exists(file_name):
-        try:
-            f = open(file_name,'r')
-            file_contents = f.readlines()
-        except:
-            print " couldn't read %s" % file_name
-    try:
-        f = open(file_name,'w')
-    except:
-        print "%s could not be opened for writing" % file_name
-        return
-
-    for line in file_contents:
-        if not re.search(username, line):
-            f.write(line)
-    line = "%s:%s" %(username, password)
-    f.write(line)
-    f.write("\n")
-    f.close()
-
-
-def usage ():
-    print "Valid options are:"
-    print "  -c (add|delete|pass|web)"
-    print "  -u  USERNAME"
-    print "  -p  password"
-    sys.exit(0)
-
-def main(argv):
-    global INIT_CHECK
-    full_call = ""
-    INIT_CHECK = True
-    try:
-        opts,  args = getopt.getopt(argv,  'c:u:p:ih' )
-    except getopt.GetoptError, why:
-        print why
-        usage()
-        print "exception happened"
-        sys.exit(2)
-
-    for opt,  arg in opts:
-        if opt in ("-h",  "--help"):
-            usage()
-            sys.exit(0)
-        elif opt in ("-c") :
-            module = arg
-            full_call += ''' -c %s ''' %re.escape(arg)
-        elif opt in ("-u") :
-            username = arg
-            full_call += ''' -u %s ''' %re.escape(arg)
-        elif opt in ("-p") :
-            password = arg
-            full_call += ''' -p %s ''' %re.escape(arg)
-        elif opt in ("-i") :
-            INIT_CHECK = False
-            full_call += ''' -i '''
-    try:
-        username
-    except:
-        usage()
-
-    if module == "add":
-        add_user(username,full_call)
-    elif module == "delete":
-        del_user(username,full_call)
-    elif module == "pass":
-        try:
-            password
-        except:
-            print "needs a password"
-            usage()
-        pass_change(username,password,full_call)
-    elif module == "web":
-        web_security(username,password)
-    else:
-        usage()
-
-if __name__ == "__main__":
-   main(sys.argv[1:])
-
diff --git a/abs/mv-core/MythVantage-config/mythvantage-release b/abs/mv-core/MythVantage-config/mythvantage-release
deleted file mode 100644
index 0ffe69d..0000000
--- a/abs/mv-core/MythVantage-config/mythvantage-release
+++ /dev/null
@@ -1 +0,0 @@
-MythVantage 1.6 Bust a move
diff --git a/abs/mv-core/MythVantage-config/networkconfig.sh b/abs/mv-core/MythVantage-config/networkconfig.sh
deleted file mode 100644
index 5611265..0000000
--- a/abs/mv-core/MythVantage-config/networkconfig.sh
+++ /dev/null
@@ -1,313 +0,0 @@
-#!/bin/bash
-#. /etc/profile
-#. /etc/systemconfig
-#BASE=/tmp
-ETCNETDIR=$BASE/etc/net/ifaces
-
-
-
-function kill_dhcp ()
-{
-for i in ${BASE}/etc/dhcpc/dhcpcd-*.pid
-do
-    if [ -f ${i} ]
-    then
-        pid=`cat ${i}`
-        kill -9 $pid
-        rm -f ${i}
-    fi
-    if [ x$1 = xflush ]
-    then
-        for ifdev in eth0 wlan0 eth1 wlan1
-        do
-           echo ${i} |grep $ifdev
-           status=$?
-           if [ $status = 1 ]
-           then
-             ip address flush $ifdev
-           fi
-        done
-    fi
-
-done
-
-}
-
-function setup_nameserver(){
-grep -q $1 ${BASE}/etc/resolv.conf
-status=$?
-if [ ! $status = 0 ]
-then
-    echo "nameserver $1" >> ${BASE}/etc/resolv.conf
-fi
-
-}
-
-function change_iface_state () {
-    if [  x$2 =  xenabled ]
-    then
-            echo "setting $1 to active"
-            sed -i -e 's/^ONBOOT=.*$/ONBOOT=yes/g' $ETCNETDIR/$1/options
-            sed -i -e 's/^DISABLED=.*$/DISABLED=no/g' $ETCNETDIR/$1/options
-    else
-            echo "setting $1 to inactive"
-            if [ -e $ETCNETDIR/$1/options ]
-            then
-                sed -i -e 's/^ONBOOT=.*$/ONBOOT=no/g' $ETCNETDIR/$1/options
-                sed -i -e 's/^DISABLED=.*$/DISABLED=yes/g' $ETCNETDIR/$1/options
-            fi
-            /sbin/ifconfig $1 down
-            ip address flush $1
-    fi
-
-}
-
-function setup_interfaces() {
-  local IS_WIRELESS
-  local ip
-  local netmask
-  local isactive
-  local dns
-  local UseDHCP
-  local GW
-  local ESSID
-  local KEY
-  local ENCRYPT
-  local TEMPNET
-  IS_WIRELESS=false
-
-  #local ip
-  TEMPNET="Hostip"$1
-  echo $TEMPNET
-  eval ip=\$${TEMPNET}
-
-  TEMPNET=Hostnetmask$1
-  eval netmask=\$${TEMPNET}
-  netmask=`echo "$netmask" | cut -d " " -f1`
-
-  TEMPNET=HostActive$1
-  eval isactive=\$${TEMPNET}
-
-  TEMPNET=HostDNS$1
-  eval dns=\$${TEMPNET}
-
-  TEMPNET="HostUSEDHCP"$1
-  eval UseDHCP=\$${TEMPNET}
-
-  TEMPNET=HostGW$1
-  eval GW=\$${TEMPNET}
-
-  TEMPNET=HOST_iswireless$1
-  eval wireless=\$${TEMPNET}
-
-
-
-
-  if [ x$wireless = x1  ]
-  then
-    IS_WIRELESS=TRUE
-    TEMPNET=HostESSID$1
-    eval ESSID=\$${TEMPNET}
-
-    TEMPNET="HostKey"$1
-    eval KEY=\$${TEMPNET}
-
-    TEMPNET=HostUseEncryption$1
-    eval ENCRYPT=\$${TEMPNET}
-  fi
-
-
-  echo "Setup $1 in progress, wireless: $IS_WIRELESS"
-
-    if [ ! -d $ETCNETDIR/$1 ]
-    then
-        mkdir -p $ETCNETDIR/$1
-    fi
-
-    if  [ ! -f  $ETCNETDIR/$1/options ]
-    then
-        cp -f  $TEMPLATES/etcnet/eth/options $ETCNETDIR/$1/options
-    fi
-
-    if [  x$isactive =  x1 ]
-    then
-            change_iface_state $1 enabled
-            #echo "setting $1 to active"
-            #sed -i -e 's/^ONBOOT=.*$/ONBOOT=yes/g' $ETCNETDIR/$1/options
-            #sed -i -e 's/^DISABLED=.*$/DISABLED=no/g' $ETCNETDIR/$1/options
-    else
-            change_iface_state $1 disabled
-            #echo "setting $1 to inactive"
-            #sed -i -e 's/^ONBOOT=.*$/ONBOOT=no/g' $ETCNETDIR/$1/options
-            #sed -i -e 's/^DISABLED=.*$/DISABLED=yes/g' $ETCNETDIR/$1/options
-    fi
-
-    if [ x$IS_WIRELESS =  xTRUE ]
-    then
-            echo "setting $1 wireless"
-            sed -i -e 's/^CONFIG_WIRELESS=.*$/CONFIG_WIRLESS=yes/g' $ETCNETDIR/$1/options
-            #set the key and essid
-            echo "essid  $ESSID" > $ETCNETDIR/$1/iwconfig
-            if  [ x$ENCRYPT = x1 ]
-            then
-                echo "key $KEY" >>  $ETCNETDIR/$1/iwconfig
-            fi
-
-    else
-            echo "disabling wireless"
-            sed -i -e 's/^CONFIG_WIRLESS=.*$/CONFIG_WIRLESS=no/g' $ETCNETDIR/$1/options
-    fi
-
-
-
-
-    if [ x$UseDHCP = x0 ]
-    then
-            echo using dhcp
-            sed -i -e 's/^BOOTPROTO=.*$/BOOTPROTO=dhcp/g' $ETCNETDIR/$1/options
-
-    else
-        echo "using static ip"
-        sed -i -e 's/^BOOTPROTO=.*$/BOOTPROTO=static/g' $ETCNETDIR/$1/options
-        echo "default via $GW" > $ETCNETDIR/$1/ipv4route
-        echo "$ip$netmask" > $ETCNETDIR/$1/ipv4address
-        setup_nameserver $dns
-    fi
-}
-
-
-function find_active () {
-#HostActiveeth1="1"
-rm -f ${BASE}/etc/resolv.conf
-if [ x$MYTHDHCP =  x1 ]
-           then
-            #add 127.0.0.1 to /etc/resolv.conf
-                 echo "search lan" > ${BASE}/etc/resolv.conf
-                 echo "nameserver 127.0.0.1" >> ${BASE}/etc/resolv.conf
- fi
-
-for i in eth0 eth1 wlan0 wlan1
-do
-    CURRENTIF="HostActive"$i
-    eval IFSTATE=\$${CURRENTIF}
-    echo $IFSTATE "---"
-        echo $i
-    if [ x$IFSTATE = x1 ]
-    then
-        setup_interfaces $i
-    else
-        change_iface_state $i disabled
-    fi
-done
-
-}
-
-function setup_hostname {
-#set the hostname
-if [ !  x$hostname = x ]
-then
-    echo $hostname > ${BASE}/etc/hostname
-    cat $BASE/etc/hosts |grep -v 127.0.0.1|grep -v $hostname  > /tmp/hosts
-    #cat $BASE/etc/hosts |grep -v 127.0.0.1|grep -v $hostname | grep -v $ip > /tmp/hosts
-
-    if [ x$MYTHDHCP =  x1 ]
-    then
-        echo "127.0.0.1  localhost " >  ${BASE}/etc/hosts
-        echo "$MYTHIP $hostname   " >>  ${BASE}/etc/hosts
-    else
-        echo "127.0.0.1 $hostname  localhost " >  ${BASE}/etc/hosts
-    fi
-    cat /tmp/hosts >> ${BASE}/etc/hosts
-fi
-
-kill_dhcp
-}
-
-function vnc_check() {
-    CMDLINE=$(cat /proc/cmdline)
-    echo $CMDLINE |grep -q vnc
-    USEVNC=$?
-    echo $CMDLINE |grep -q nfsroot
-     NETBOOT=$?
-    echo $USEVNC
-    if [ !  x$USEVNC = x0  ]
-    then
-        echo "not using vnc"
-        if [ !  x$NETBOOT = x0  ]
-        then
-            echo "not using netboot"
-        else
-            echo "using netboot"
-            USEVNC=0
-        fi
-
-    else
-        echo " using vnc"
-    fi
-}
-
-function setup_MYTH_vars {
-    TEMPMYTH="Hostip"$default_interface
-    #echo $TEMPMYTH
-    eval MYTHIP=\$${TEMPMYTH}
-
-    TEMPMYTH="HostUSEDHCP"$default_interface
-    eval MYTHDHCP=\$${TEMPMYTH}
-
-
-
-}
-
-
-
-
-function start_network {
-if [ ! $USEVNC = 0 ]
-then
-    /etc/net/scripts/network.init reload
-    /etc/net/scripts/network.init restart
-else
-    echo "VNC/NETBOOT in use, will NOT restart network"
-fi
-
-}
-
-function setup_network {
-    setup_MYTH_vars
-    setup_hostname
-    find_active
-}
-
-
-function stop_network {
-if [ ! $USEVNC = 0 ]
-then
-    echo "stopping the network"
-    kill_dhcp flush
-    ip address flush dev eth0 2>&1 >/dev/null
-    ip address flush dev eth1 2>&1 >/dev/null
-    ip address flush dev wlan0 2>&1 >/dev/null
-    ip address flush dev wlan1 2>&1 >/dev/null
-else
-    echo "VNC/NETBOOT in use, will NOT restart network"
-fi
-
-}
-
-
-#this is used by the install process to start the network
-function install_network_setup {
-    setup_MYTH_vars
-    setup_hostname
-    stop_network
-    find_active
-    start_network
-
-}
-
-
-
-
-
-
-
diff --git a/abs/mv-core/MythVantage-config/remove_service.sh b/abs/mv-core/MythVantage-config/remove_service.sh
deleted file mode 100755
index 6cc4b4f..0000000
--- a/abs/mv-core/MythVantage-config/remove_service.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-SERVICE_DIR=/var/service
-SCRIPT_DIR=/etc/sv
-if [ -e $SERVICE_DIR/$1 ]
-then
-		echo "removing"
- rm $SERVICE_DIR/$1
-fi
diff --git a/abs/mv-core/MythVantage-config/restore_default_settings.sh b/abs/mv-core/MythVantage-config/restore_default_settings.sh
deleted file mode 100755
index dcf5e23..0000000
--- a/abs/mv-core/MythVantage-config/restore_default_settings.sh
+++ /dev/null
@@ -1,362 +0,0 @@
-#!/bin/bash
-. /etc/profile
-. /etc/systemconfig
-shopt -s -o nounset
-echo $@ >>  /tmp/restore.out
-#TEMPLATES="/usr/share/templates/settings"
-TEMPLATES="$TEMPLATES/settings"
-TABLES="settings keybindings"
-MYTHDBUSER=mythtv
-MYTHTVPASSWD=mythtv
-declare -r OPTSTRING="c:e:t:d:h:s:a:z:Ho"
-Thistemplate=""
-declare -i OVERRIDE=0
-declare -i EVERYTHING=0
-
-
-function CMD_DEFINE () {
-     #add override check
-    if  [ x$Thistemplate = xsyssettings  -a  $OVERRIDE  -eq 1   ]
-    then
-         MYSQLCMD="mysql  --local-infile  -s -u$MYTHDBUSER  -p$MYTHTVPASSWD -h$ovdbhost mythconverg -B --exec"
-         MYSQLCMD_C="mysql -u$MYTHDBUSER  -p$MYTHTVPASSWD -h$ovdbhost mythconverg -B --exec"
-         MYSQLCMD_UPDATE_HOST="UPDATE settings set data='$oldhostname' where value='HostMyhostname' and hostname=\"$hostname\";"
-    else
-        MYSQLCMD="mysql  --local-infile  -s -u$MYTHDBUSER  -p$MYTHTVPASSWD -h$dbhost mythconverg -B --exec"
-        MYSQLCMD_C="mysql -u$MYTHDBUSER  -p$MYTHTVPASSWD -h$dbhost mythconverg -B --exec"
-        MYSQLCMD_UPDATE_HOST="select hostname from settings;"
-    fi
-}
-
-function SQL_DEFINE () {
-    thostname=`echo ${hostname}|tr -C [:alpha:] _`
-    echo "Using $thostname for temp table postfix"
-
-	#$1 is the table name
-	if [ $1 = "settings" ]
-	then
-		ALTERSQL="Alter table  temp_${1}_${thostname} add unique ( value )"
-	else
-		ALTERSQL=";"
-	fi
-
-    CREATESQL="create table  temp_${1}_${thostname} like $1;"
-	COPY_TMP_SQL="replace  into  temp_${1}_${thostname}  (select * from $1 where hostname=\"$hostname\");"
-	INSERTSQL="LOAD DATA local INFILE '/tmp/$1.txt' REPLACE INTO TABLE temp_${1}_${thostname}  FIELDS TERMINATED BY '\t';"
-    #INSERTSQL="LOAD DATA local INFILE '$TEMPLATES/$Thistemplate/$1.txt' REPLACE INTO TABLE temp_${1}_${hostname}  FIELDS TERMINATED BY '\t';"
-	DROPSQL="delete  from $1 where hostname=\"$hostname\";"
-	COPY_BCK_SQL="replace  into $1   (select * from  temp_${1}_${thostname}  where hostname=\"$hostname\");"
-	DROP_TABLE="Drop table temp_${1}_${thostname}"
-}
-
-function ARG_ERR()  {
-        if [  x$OPTARG = "x" ]
-        then
-            echo "$SWITCH NEEDS AND ARG"
-            exit 11
-        fi
-}
-
-function ALSADEVICE () {
-#ALSA:hw:1,4
-    if [ x$Audiotype = xALSA ]
-    then
-        SoundDevice=ALSA:$SoundDevice
-        MixerDevice="ALSA:default"
-    else
-        MixerDevice="/dev/mixer"
-    fi
-
-}
-
-
-
-if [ $# -eq 0 ]
-then
-    echo "Valid options are:"
-    echo "  -c (save|restore|load|uhostname|BECONFIG|ZIP|ACCESSCONTROL)"
-    echo "  -t (syssettings|hostsettings)"
-    echo "  -d databasename"
-    echo "  -h hostname"
-    echo "  -s systemtype (master|slave|standalone|frontendonly)"
-    echo "  -a ipaddress"
-    echo "  -z zipcode"
-    echo "  -o  override (only used upgrade installs)"
-    exit 1
-fi
-
-
-
-
-while getopts "$OPTSTRING"  SWITCH
-do
-    case $SWITCH in
-        #  \?)  echo "unkown option"
-                #       exit 11 ;;
-            c)   echo "$SWITCH"  "$OPTARG"
-                    ARG_ERR
-                    OPERATION=$OPTARG
-                    ;;
-            t) echo "$SWITCH"  "$OPTARG"
-                    ARG_ERR
-                    Thistemplate=$OPTARG
-
-                     if  [  x$Thistemplate = x"syssettings"  ]
-                     then
-                            echo "template is syssettings"
-                            loadhost=false
-                    elif [  x$Thistemplate = x"hostsettings"  ]
-                    then
-                            echo "template is hostsettings"
-                            Thistemplate=syssettings
-                            loadhost=true
-                    else
-                            echo "invalid template name"
-                            exit 1
-                    fi
-                    ;;
-            d) echo "$SWITCH"  "$OPTARG"
-                    ARG_ERR
-                    if [ $OVERRIDE =  1 ]
-                    then
-                        ovdbhost=$OPTARG
-                    else
-                        dbhost=$OPTARG
-                    fi
-                    ;;
-            h) echo "$SWITCH"  "$OPTARG"
-                    ARG_ERR
-                    if [ $OVERRIDE =  1 ]
-                    then
-                       oldhostname=$hostname
-                        hostname=$OPTARG
-                    else
-                        hostname=$OPTARG
-                   fi
-
-                                  ;;
-            s) echo "$SWITCH"  "$OPTARG"
-                    ARG_ERR
-                    SYSTEMTYPE=$OPTARG
-                        ;;
-            a) echo "$SWITCH"  "$OPTARG"
-                    ARG_ERR
-                    IP_ADDRESS=$OPTARG
-                    ;;
-            z) echo "$SWITCH"  "$OPTARG"
-                   ARG_ERR
-                   ZIPCODE=$OPTARG
-                    ;;
-           o)  OVERRIDE=1
-                 ;;
-
-            esac
-done
-
-echo $OVERRIDE
-
-#setup the Mysql commands
-CMD_DEFINE
-
-$MYSQLCMD_C "show tables" > /dev/null
-status=$?
-if [ $status = 1 ]
-then
-    echo "$@ failed"
-    echo "$@ failed" >> /tmp/restore.out
-    exit 1
-fi
-
-
-
-
-
-
-
-case $OPERATION in
-
-	restore)
-		#used to restore settings from syssettings
-		if  [ -d $TEMPLATES/$Thistemplate ]
-		then
-            cd $TEMPLATES/$Thistemplate
-            if [ $loadhost = false ]
-                then
-                    for i in $TABLES
-                    do
-                        SQL_DEFINE $i
-                        sed -e "s/REPLACEME/$hostname/g"  $i.txt  > /tmp/$i.txt
-                        #echo    $MYSQLCMD "$SELECTSQL"
-                        echo $i
-                        $MYSQLCMD "$CREATESQL"
-                        $MYSQLCMD "$ALTERSQL"
-                        $MYSQLCMD "$COPY_TMP_SQL"
-                        $MYSQLCMD "$INSERTSQL"
-                        $MYSQLCMD "$DROPSQL"
-                        $MYSQLCMD "$COPY_BCK_SQL "
-                        $MYSQLCMD "$DROP_TABLE "
-                        #rm /tmp/$i.txt
-                    done
-            fi
-            if [ $loadhost = true ]
-            then
-                #only load the settings table with values HOST
-                i=settings
-                SQL_DEFINE $i
-                sed -e "s/REPLACEME/$hostname/g"  $i.txt  > /tmp/$i.txt
-                echo $i
-                $MYSQLCMD "$CREATESQL"
-                $MYSQLCMD "$ALTERSQL"
-                $MYSQLCMD "$INSERTSQL"
-                $MYSQLCMD "$COPY_TMP_SQL"
-                $MYSQLCMD "$DROPSQL"
-                $MYSQLCMD "$COPY_BCK_SQL"
-                $MYSQLCMD "$DROP_TABLE "
-            fi
-		else
-		 echo "couldn't find $TEMPLATES/$Thistemplate"
-		fi
-	;;
-
-	save)
-
-                if [ ! -d $TEMPLATES/$Thistemplate ]
-                then
-                    mkdir -p $TEMPLATES/$Thistemplate
-                fi
-
-                cd $TEMPLATES/$Thistemplate
-        		for i in $TABLES
-		        do
-                     EXTRACLAUSE=""
-                    case $i in
-                    settings)
-                        EXTRACLAUSE="and  not (value like \"BackendServerIP\") and not (value like \"locale\")  order by value"
-                       	SQL="select value,data,'REPLACEME' as hostname from $i where hostname=\"$hostname\" "$EXTRACLAUSE"  ;"
-                    #    SQL="select * from $i where hostname=\"$hostname\" "$EXTRACLAUSE"  ;"
-             	        $MYSQLCMD_C "$SQL" > $TEMPLATES/$Thistemplate/$i.txt
-                           ;;
-                      keybindings)
-                                SQL="select context,action,description,keylist,'REPLACEME' as hostname from $i where hostname=\"$hostname\"  "$EXTRACLAUSE"  ;"
-                                $MYSQLCMD_C "$SQL" > $TEMPLATES/$Thistemplate/$i.txt
-                            ;;
-                    esac
-	                  #  sed -e "s/$hostname/REPLACEME/g"  $i  > $i.txt && rm $i
-
-                done
-		;;
-
-    load)
-
-                #will load both default_1 and default_2  unless either file is not found
-                for i in default_1 default_2
-                do
-                    if [ -f $TEMPLATES/$i/settings.txt   ]
-                    then
-                           echo $i
-                          for tablename in $TABLES
-                            do
-                         #create table
-                            CREATESQL="create table IF NOT EXISTS ${tablename}_${i} like $tablename;"
-                            $MYSQLCMD_C "$CREATESQL"
-                         #truncate table
-                            TRUNCATESQL="truncate ${tablename}_${i}  "
-                            $MYSQLCMD_C "$TRUNCATESQL"
-                         #load table
-                              INSERTSQL="LOAD DATA local INFILE '$TEMPLATES/$i/$tablename.txt' REPLACE INTO TABLE ${tablename}_${i}   FIELDS TERMINATED BY '\t';"
-                                $MYSQLCMD_C "$INSERTSQL"
-                         #update_hostname
-                              UPDATEHOSTNAMESQL="update  ${tablename}_${i}  set hostname='$i'  ; "
-                                $MYSQLCMD_C "$UPDATEHOSTNAMESQL"
-                           done
-                    else
-
-                        echo "couldn't find $TEMPLATES/$i/settings.txt  template to load"
-                    fi
-                    CREATESQL="create table IF NOT EXISTS settings_user1  like settings;"
-                    $MYSQLCMD_C "$CREATESQL"
-                    CREATESQL="create table IF NOT EXISTS settings_user2  like settings;"
-                    $MYSQLCMD_C "$CREATESQL"
-                    CREATESQL="create table IF NOT EXISTS settings_user3  like settings;"
-                    $MYSQLCMD_C "$CREATESQL"
-
-                    CREATESQL="create table IF NOT EXISTS keybindings_user1  like keybindings;"
-                    $MYSQLCMD_C "$CREATESQL"
-                    CREATESQL="create table IF NOT EXISTS keybindings_user2  like keybindings;"
-                    $MYSQLCMD_C "$CREATESQL"
-                    CREATESQL="create table IF NOT EXISTS keybindings_user3  like keybindings;"
-                    $MYSQLCMD_C "$CREATESQL"
-                done
-;;
-
-
-
-        BECONFIG)
-                if [ $SYSTEMTYPE = "master" ]
-                then
-                        $MYSQLCMD_C "UPDATE settings  set data='${IP_ADDRESS}' where value='MasterServerIP';"
-                        $MYSQLCMD_C "delete  from   settings    where value='BackendServerIP'  and  hostname=\"$hostname\";"
-                        $MYSQLCMD_C "REPLACE INTO settings set  data='${IP_ADDRESS}' , value='BackendServerIP' ,  hostname=\"$hostname\";"
-                fi
-
-                if [ $SYSTEMTYPE = "slave" ]
-                then
-                        $MYSQLCMD_C "delete  from   settings    where value='BackendServerIP'  and  hostname=\"$hostname\";"
-	    		        $MYSQLCMD_C "REPLACE INTO settings  set data='${IP_ADDRESS}' , value='BackendServerIP' , hostname=\"$hostname\";"
-                fi
-                ;;
-        ZIP)
-               $MYSQLCMD_C "delete from settings where  value='locale' and  hostname=\"$hostname\";"
-               $MYSQLCMD_C "REPLACE INTO  settings set data='$ZIPCODE'  ,  value='locale' , hostname=\"$hostname\";"
-               $MYSQLCMD_C "delete from settings where  value='MythMovies.ZipCode' and  hostname=\"$hostname\";"
-               $MYSQLCMD_C "REPLACE INTO  settings set data='$ZIPCODE',  value='MythMovies.ZipCode' , hostname=\"$hostname\";"
-                ;;
-        MUSICFRONT)
-                ALSADEVICE
-                $MYSQLCMD_C "delete from settings where value='AudioOutputDevice' and hostname=\"$hostname\";"
-                $MYSQLCMD_C "delete from settings where value='MixerDevice' and hostname=\"$hostname\";"
-                $MYSQLCMD_C "REPLACE INTO  settings set data='$SoundDevice',  value='AudioOutputDevice' , hostname=\"$hostname\";"
-                $MYSQLCMD_C "REPLACE INTO  settings set data='$MixerDevice',  value='MixerDevice' , hostname=\"$hostname\";"
-                #need to reload the settings.
-                systemconfig.sh reloadfe
-                ;;
-        MUSICMYTH)
-            ALSADEVICE
-            $MYSQLCMD_C "delete from settings where value='MusicAudioDevice' and hostname=\"$hostname\";"
-            $MYSQLCMD_C "REPLACE INTO  settings set data='$SoundDevice',  value='MusicAudioDevice' , hostname=\"$hostname\";"
-                ;;
-         uhostname)
-                    #used when the hostname is changed.
-                    TABLES="settings capturecard keybindings storagegroup recorded"
-                    for i in $TABLES
-                    do
-                        USQL="update $i set hostname=\"$oldhostname\"  where hostname=\"$hostname\"  ;"
-                        $MYSQLCMD_C "$USQL"
-                    done
-
-                ;;
-        USERJOBALLOW)
-                SQL="update settings set data='1' where value like  'JobAllowUserJob%' and hostname=\"$hostname\"  ;"
-                $MYSQLCMD_C "$SQL"
-                ;;
-
-        ACCESSCONTROL)
-                LIST="Hostaccessnetwork Hostaccesshostype HostaccesshostypeSystemtype Hostaccessmisc Hostaccesssleep Hostaccessadvanced HostaccessadvancedX Hostaccesssound"
-
-                for i in $LIST
-                do
-                    $MYSQLCMD_C "delete from settings where value=\"$i\" and hostname=\"$hostname\";"
-                    $MYSQLCMD_C "REPLACE INTO  settings set data='1',  value=\"$i\" , hostname=\"$hostname\";"
-                done
-                SQL="update settings set data='0' where value='HostaccesshostypeSystemtype' and hostname=\"$hostname\"  ;"
-                $MYSQLCMD_C "$SQL"
-                SQL="update settings set data='0' where value='Hostaccessuser' and hostname=\"$hostname\"  ;"
-                $MYSQLCMD_C "$SQL"
-                ;;
-	esac
-
-#SELECT * INTO OUTFILE 'data.txt'
-# FIELDS TERMINATED BY ','
-# FROM table2;
-
-
diff --git a/abs/mv-core/MythVantage-config/soundconfig.sh b/abs/mv-core/MythVantage-config/soundconfig.sh
deleted file mode 100755
index 2f4e67c..0000000
--- a/abs/mv-core/MythVantage-config/soundconfig.sh
+++ /dev/null
@@ -1,254 +0,0 @@
-#!/bin/bash
-. /etc/systemconfig
-. /etc/profile
-echo $@ >/tmp/audio.call
-#set -x
-BASE=""
-. /etc/profile
-#TEMPLATES="/usr/share/templates"
-TESTFILE="$TEMPLATES/audio/space_battle_A.wav"
-#TESTFILE="/usr/share/sounds/alsa/Front_Center.wav"
-OSSinstalled="false"
-
-function testaudio () {
-
-ossplay  -d$AUDIODEVICE $TESTFILE
-
-}
-
-function load_alsa() {
-
-    remove_service.sh alsa-utils
-#    cd /lib/modules/2.6.21-STB
-    KER=`uname -r`
-    cd /lib/modules/$KER/kernel/
-    tar -xvf /lib/modules/alsa-$KER.tar
-    pacman -Sf --noconfirm  alsa-lib
-
-    depmod -a
-    cd -
-    udevadm trigger
-    udevadm settle
-    udevadm trigger
-
-    add_service.sh alsa-utils
-    sleep 4
-    sv start alsa-utils
-}
-
-
-function unload_alsa () {
-#kill $(lsof -t /dev/dsp* /dev/audio* /dev/mixer* /dev/snd/*) && modprobe -r $(lsmod |grep ^snd |awk '{print $1}')
-    sv stop alsa-utils
-    remove_service.sh alsa-utils
-    rm -rf /dev/adsp*
-    rm -rf /dev/snd/*
-    rm -rf /dev/audio
-    modprobe -r $(lsmod |grep ^snd |awk '{print $1}')
-}
-
-function unload_oss {
-    sv stop oss
-    soundoff
-    rm -rf /dev/dsp*
-    rm -rf /dev/oss*
-    rm -rf /dev/sndstat
-    remove_service.sh oss
-}
-
-function installOSS {
-    echo "installing oss"
-    pacman -Q oss 2>/dev/null
-    if [  ! $? = 0 ]
-    then
-        pacman --noconfirm -Sf oss
-    fi
-    add_service.sh oss
-    sleep 4
-    sv start oss
-}
-
-
-function SYNCXINE {
-echo "modify xine config file"
-    if [ -f /data/home/mythtv/.xine/config ]
-    then
-        cp -f /data/home/mythtv/.xine/config  $TEMPLATES/xine.config
-    else
-        cp $TEMPLATES/xine.config.template $TEMPLATES/xine.config
-    fi
-
-    if [ x$Audiotype = xOSS ]
-    then
-       DEVICENUMBER=`echo $SoundDevice|awk -F/ ' { print $3  } '|tr -d dsp `
-        sed -e "s/^.*audio.driver.*$/audio.driver:oss/" \
-               -e "s/^.audio.device.oss_device_name.*$/audio.device.oss_device_name:\/dev\/dsp/" \
-               -e "s/^.audio.devic.oss_device_number.*$/audio.device.oss_device_number:$DEVICENUMER/" \
-               -e "s/^.*audio.output.speaker_arrangement:.*$/Audio.output.speaker_arrangement:PassThrough/" \
-                $TEMPLATES/xine.config > /data/home/mythtv/.xine/config
-    else
-        cp $TEMPLATES/xine.config /data/home/mythtv/.xine/config
-    fi
-
-}
-
-function SYNCMPLAYER {
-echo "modify mplayer not implmented yet"
-}
-
-function SYNCMYTHMUSIC {
-echo "sync mythmusic"
-$MV_ROOT/bin/restore_default_settings.sh -c MUSICMYTH
-}
-
-function SYNCMYTHFRONTEND {
-echo "sync mythfrontend"
-$MV_ROOT/bin/restore_default_settings.sh -c MUSICFRONT
-}
-
-
-function checkOSSinstalled () {
- ossinfo |grep Version |grep -q OSS >/dev/null
- resultcode=$?
- echo $resultcode
- if [ $resultcode = 0 ]
- then
-    OSSinstalled='true'
- else
-    OSSinstalled='false'
- fi
-}
-
-function sound_config_system {
-
-    if [ x$syncXine = x1 ]
-    then
-          SYNCXINE
-    fi
-    if [ x$syncMplayer = x1 ]
-    then
-          SYNCMPLAYER
-    fi
-    if [ x$syncMythMusic = x1 ]
-    then
-          SYNCMYTHMUSIC
-    fi
-    if [ x$syncMythFrontend = x1 ]
-    then
-          SYNCMYTHFRONTEND
-    fi
-
-}
-
-function loadsound (){
-        checkOSSinstalled
-        if [  x$AUDIOTYPE = xOSS  -o   x$AUDIOTYPE = xoss ]
-        #then
-        #    if [ $OSSinstalled = "false" ]
-            then
-                while [ $OSSinstalled = "false" ]
-                do
-                    unload_alsa
-                    rm /tmp/.alsatest
-                    installOSS
-                    installOSS
-                    sleep 2
-                    checkOSSinstalled
-                done
-          #  fi
-        else
-            touch /tmp/.alsatest
-            unload_oss
-            load_alsa
-            load_alsa
-            rm /tmp/.alsatest
-
-        fi
-
-}
-
-
-
-
-#####################MAIN PROGRAM##########################
-
-declare -r OPTSTRING="i:t:d:"
-
-if [ $# -eq 0 ]
-then
-    echo "Valid options are:"
-    echo "  -i  (oss|alsa)   oss or alsa subsystem  "
-    echo "  -t  (test|real|LOAD)   "
-    echo "  -d device"
-    exit 1
-fi
-
-
-
-
-while getopts "$OPTSTRING"  SWITCH
-do
-    case $SWITCH in
-          \?)  echo "unkown option"
-                      exit 11 ;;
-            i)   echo "$SWITCH"  "$OPTARG"
-                    AUDIOTYPE="$OPTARG"
-                    ;;
-            d) echo "$SWITCH"  "$OPTARG"
-                    AUDIODEVICE=$OPTARG
-                    ;;
-            t) echo "$SWITCH"  "$OPTARG"
-                SOUNDOPTYPE="$OPTARG"
-                if  [ x"$OPTARG" = xtest ]
-                then
-                    TEST=true
-                else
-                    TEST=false
-                fi
-
-
-                    ;;
-
-            esac
-done
-
-
-
-
-case $SOUNDOPTYPE in
-    REAL|real )
-                    loadsound
-                    sound_config_system
-        ;;
-    test|TEST)
-                echo $@ > /tmp/audio.test
-                #loadsound
-                 if [  x$AUDIOTYPE = xOSS  -o   x$AUDIOTYPE = xoss ]
-                then
-                    echo "testing OSS  $AUDIODEVICE "
-                    ossplay  -d$AUDIODEVICE $TESTFILE
-                else
-                    echo "testing ALSA $AUDIODEVICE "
-                    aplay --device=$AUDIODEVICE $TESTFILE
-                fi
-
-        ;;
-
-    LOAD|load)
-                        loadsound
-        ;;
-    esac
-
-
-exit 0
-
-
-
-
-
-
-
-
-
-
-
diff --git a/abs/mv-core/MythVantage-config/startx b/abs/mv-core/MythVantage-config/startx
deleted file mode 100755
index 0ffdf8c..0000000
--- a/abs/mv-core/MythVantage-config/startx
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-. /etc/profile
-
-export USER=root
-export HOME=/root
-#TEMPLATES=/usr/share/templates
-
-CMDLINE=$(cat /proc/cmdline)
-TEMPVAR=${CMDLINE#*ip=}
-IP=${TEMPVAR%% *}
-echo $CMDLINE |grep -q vnc
-USEVNC=$?
-
-if [ x$USEVNC = x1 ]
-then
-	$MV_ROOT/bin/xconfig.sh
-	cat /etc/X11/xorg.conf | sed -e 's/dev\/mouse/dev\/psaux/g'> /root/xorg.conf.install
-	startx /root/live-install.sh --  -config /root/xorg.conf.install -allowMouseOpenFail
- else
- #VNC
-     pacman -Sf --noconfirm tightvnc
-    cd /root
-    mkdir .vnc
-    echo mythvantage |vncpasswd -f > /root/.vnc/passwd
-    chmod 500 /root/.vnc/passwd
-    rm /root/.vnc/xstartup
-    ln -s /root/live-install.sh /root/.vnc/xstartup
-    vncserver
-fi
diff --git a/abs/mv-core/MythVantage-config/systemconfig.py b/abs/mv-core/MythVantage-config/systemconfig.py
deleted file mode 100755
index c559e09..0000000
--- a/abs/mv-core/MythVantage-config/systemconfig.py
+++ /dev/null
@@ -1,243 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-import sys,  os,  commands,  glob,  time
-import getopt,  re,  MySQLdb
-import logging
-import mv_common , mv_network
-import inspect
-#____________________________________________setup the logging______________________________________________________
-LOG_FILENAME = '/tmp/systemconfig.log'
-DEBUGLOG = '/tmp/systemconfig_debug.log'
-logging.basicConfig(level=logging.DEBUG,
-                    format='%(asctime)s - %(name)s - %(levelname)s - %(message)s',
-                    datefmt='%m-%d %H:%M',
-                    filename=DEBUGLOG,
-                    filemode='w')
-# define a Handler which writes INFO messages or higher to the sys.stderr
-console = logging.StreamHandler()
-console.setLevel(logging.INFO)
-# set a format which is simpler for console use
-#formatter = logging.Formatter('%(name)-12s: %(levelname)-8s %(message)s')
-formatter = logging.Formatter("%(message)s")
-# tell the handler to use this format
-console.setFormatter(formatter)
-# add the handler to the root logger
-logging.getLogger('').addHandler(console)
-
-#infoformatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
-infoformatter = logging.Formatter("%(message)s")
-infofile = logging.FileHandler(LOG_FILENAME, 'w')
-infofile.setFormatter(infoformatter)
-infofile.setLevel(logging.INFO)
-logging.getLogger('').addHandler(infofile)
-
-
-def usage():
-    logging.info("tell people how to use this")
-
-def setup_x(systemconfig):
-    cmd = "%s/bin/xconfig.sh" %systemconfig["MVROOT"]
-    mv_common.runcmd(cmd)
-
-def main(argv):
-    try:
-        MVROOT = os.environ["MV_ROOT"]
-    except:
-        logging.debug("MVROOT was not defined, using the default value")
-        MVROOT = "/usr/MythVantage"
-
-    global cmdmodule
-    global systemconfig
-    systemconfig["MVROOT"]=MVROOT
-    restartlcd = False
-    cmdmodule={"misc":False , "sleep":False , "hostype":False , "hostypec":False , "advanced":False , "audio":False , "network":False , "advancedX":False , "webuser":False , "restartfe":False , "reloadfe":False , "ddns":False , "screensaver":False , "ir":False , "this_is_install":False , "user":False, "software":False, "plugins":False, "smolt":False, "all":False, "dhcp_request":False }
-    try:
-        opts,  args = getopt.getopt(argv,  'c:hm:d:',  ["help","modules" ] )
-    except getopt.GetoptError, why:
-        print why
-        usage()
-        print "exception happened"
-        sys.exit(2)
-    for opt,  arg in opts:
-        if opt in ("-h",  "--help"):
-            usage()
-            sys.exit(0)
-        elif opt in ("-m"):
-            for i in arg.split(","):
-                cmdmodule[i]=True
-        elif opt in ("-d"):
-            dhcp_dev = arg
-
-
-    if cmdmodule["this_is_install"] or cmdmodule["hostypec"]:
-        systemconfig["hostypec"] = True
-        cmdmodule["smolt"] = True
-
-    systemconfig["mythip"] = mv_network.setup_MYTH_IP(systemconfig)
-    systemconfig["mythdhcp"] = mv_network.setup_MYTH_DHCP(systemconfig)
-    systemconfig["mythgw"] = mv_network.setup_MYTH_DHCP(systemconfig)
-    systemconfig["mythdns"] = mv_network.setup_MYTH_DHCP(systemconfig)
-
-    if cmdmodule["all"]:
-        logging.info("***    WILL RUN ALL MODULES   ***")
-        cmdmodule["hostype"] = True
-        cmdmodule["ir"]= True
-        cmdmodule["network"] = True
-        cmdmodule["audio"] = True
-        cmdmodule["misc"] = True
-        cmdmodule["sleep"] = True
-        cmdmodule["webuser"] = True
-        cmdmodule["ddns"] = True
-        cmdmodule["screensaver"] = True
-        cmdmodule["advanced"] = True
-        cmdmodule["software"] = True
-        cmdmodule["advancedX"] = True
-        cmdmodule["smolt"] = True
-        cmdmodule["user"] = True
-
-
-    if cmdmodule["hostype"]:
-        import mv_hostype
-        cmdmodule["advancedX"] = True
-        setup_x(systemconfig)
-        cmdmodule["ir"] = True
-        mv_hostype.hostypeprint(systemconfig)
-        cmdmodule["smolt"] = True
-
-    if cmdmodule["network"]:
-        restartfe = mv_network.setup_network(systemconfig, cmdmodule["this_is_install"])
-        if restartfe == True :
-            logging.debug("    Setting the frontend to restart due to network change")
-            cmdmodule["restartfe"] = True
-
-
-
-    if cmdmodule["ir"] == True:
-        import mv_ir
-        restart = mv_ir.setup_ir(systemconfig,data_config)
-        restartfe = restart[0]
-        restartlcd = restart[1]
-        if restartfe == True :
-            logging.debug("    Setting the frontend to restart due to lirc change")
-            cmdmodule["restartfe"] = True
-        cmdmodule["smolt"] = True
-
-
-    if cmdmodule["audio"] == True:
-        logging.debug("______Start of Audio Configuration______")
-        if not systemconfig["Audiotype"] == "tinker":
-            cmd="%s/bin/soundconfig.sh -t real -i %s -d %s" %(MVROOT,systemconfig["Audiotype"],systemconfig["SoundDevice"])
-            mv_common.runcmd(cmd)
-        else:
-            logging.debug("    Tinker mode(audio), not changing configuration")
-        logging.debug("__End of audio")
-
-    if cmdmodule["misc"]:
-        import mv_misc
-        mv_misc.setup_zip(MVROOT,systemconfig["zipcode"])
-        mv_misc.setup_tz(systemconfig["timezone"],systemconfig["TEMPLATES"])
-        mv_misc.setup_nfs(systemconfig)
-
-    if cmdmodule["sleep"]:
-        import mv_misc
-        mv_misc.setup_sleep(systemconfig)
-
-    if cmdmodule["webuser"]:
-        import mv_webuser
-        mv_webuser.setup_web_auth(systemconfig["UseMythWEB_auth"])
-
-    if cmdmodule["ddns"]:
-        print " LOOK FOR DDNS"
-
-    if cmdmodule["screensaver"]:
-        import mv_screensaver
-        mv_screensaver.setup_screensaver(systemconfig, data_config)
-
-    if cmdmodule["advanced"]:
-        import mv_advanced
-        mv_advanced.setup_advanced(systemconfig, data_config)
-
-    if cmdmodule["software"] or cmdmodule["plugins"]:
-        import mv_software
-        mv_software.setup_software(systemconfig, data_config)
-
-    if cmdmodule["advancedX"]:
-        setup_x(systemconfig)
-
-    if cmdmodule["restartfe"]:
-        mv_common.restartfe(restartlcd)
-
-    if cmdmodule["reloadfe"]:
-        mv_common.reloadfe(systemconfig["dbhost"],restartlcd)
-
-    if cmdmodule["smolt"]:
-        import mv_smolt
-        mv_smolt.setup_smolt_type(systemconfig["SystemType"],
-                                  systemconfig["Remotetype"],
-                                  systemconfig["RunFrontend"],
-                                  data_config.MYTHHOME,
-                                  data_config.SYSTEMTYPE)
-
-    if cmdmodule["user"]:
-        logging.info("____Start of ssh user____")
-        if systemconfig["rootSSH"] == "1" :
-            logging.info("    Allowing ssh access for root")
-            cmd = '''sed -i "s/^.*PermitRootLogin.*$/PermitRootLogin yes/" /etc/ssh/sshd_config'''
-            mv_common.runcmd(cmd)
-        else:
-            logging.info("    Removing ssh access for root")
-            cmd = '''sed -i "s/^.*PermitRootLogin.*$/PermitRootLogin no/" /etc/ssh/sshd_config'''
-            mv_common.runcmd(cmd)
-        logging.info("__End of ssh user\n")
-
-    if cmdmodule["dhcp_request"]:
-        cmd = '''dhcpcd -t4 -h' ' -Td %s > /tmp/mvnetwork.dhcpinfo ''' %dhcp_dev
-        mv_common.runcmd(cmd)
-
-
-if __name__ == "__main__":
-
-    config_file = "mv_config"
-    data_config = __import__(config_file,  globals(),  locals(),  [])
-    #Read in systemconfig
-    global systemconfig
-    systemconfig = {"hostypec":False}
-    file_name = "/etc/systemconfig"
-    try:
-        config_file = open(file_name)
-    except:
-        logging.critical("%s could not be opened", file_name)
-        sys.exit(1)
-
-    for line in config_file:
-        line = line.strip()
-        if line and line[0] is not "#" and line[-1] is not "=":
-            var, val = line.rsplit("=", 1)
-            val = val.strip('"')
-            systemconfig[var.strip()] = val.strip()
-    try:
-        systemconfig["TEMPLATES"] = os.environ["TEMPLATES"]
-    except:
-        logging.critical("    *TEMPLATES is not defined")
-        logging.critical("    *using default value")
-        systemconfig["TEMPLATES"] = "/usr/MythVantage/templates"
-
-    logging.debug("______START OF DEBUG______")
-    main(sys.argv[1:])
-    logging.debug("______cmd line options______")
-    for i in cmdmodule.items():
-        logging.debug (i)
-    logging.debug("______systemconfig______")
-    for i in systemconfig.items():
-        logging.debug(i)
-    #pass
-
-
-
-
-
-
-
-
-
-
diff --git a/abs/mv-core/MythVantage-config/systemconfig.sh b/abs/mv-core/MythVantage-config/systemconfig.sh
deleted file mode 100755
index 218f705..0000000
--- a/abs/mv-core/MythVantage-config/systemconfig.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-###################################################################
-#Script to configure your system based off the values in /etc/systemconfig
-#Any changes made to config files will be removed when systemconfig.sh is run
-#
-#JM
-echo $@ >/tmp/systemconfig.call
-echo "----------------------start of systemconfig $@ ----------------------"
-. /etc/profile
-. $MV_ROOT/bin/networkconfig.sh
-postfix=`cat ${BASE}/usr/local/share/mythtv/.releasetype`
-
-systemconfig.py -m $@
-rc=$?
-echo "systemconfig.py exit code $rc"
-exit $rc
-
-
-
diff --git a/abs/mv-core/MythVantage-config/templates/LCD/Shuttle-SG33/LCDd.conf b/abs/mv-core/MythVantage-config/templates/LCD/Shuttle-SG33/LCDd.conf
deleted file mode 100644
index d49fbf6..0000000
--- a/abs/mv-core/MythVantage-config/templates/LCD/Shuttle-SG33/LCDd.conf
+++ /dev/null
@@ -1,869 +0,0 @@
-# LCDd.conf -- configuration file for the LCDproc server daemon LCDd
-#
-# This file contains the configuration for the LCDd server.
-# 
-# The format is ini-file-like. It is divided into sections that start at
-# markers that look like [section]. Comments are all line-based comments,
-# and are lines that start with '#' or ';'.
-#
-# The server has a 'central' section named [server]. For the menu there is
-# a section called [menu]. Further each driver has a section which
-# defines how the driver acts.
-#
-# The drivers are activated by specifiying them in a driver= line in the
-# server section, like:
-#
-#   Driver=curses
-#
-# This tells LCDd to use the curses driver.
-# The first driver that is loaded and is capable of output defines the
-# size of the display. The default driver to use is curses.
-# If the driver is specified using the -d <driver> command line option,
-# the Driver= options in the config file are ignored.
-#
-# The drivers read their own options from the respective sections.
-
-
-
-## Server section with all kinds of settings for the LCDd server ##
-[server]
-
-# Tells the server to load the given drivers. Multiple lines can be given.
-# The name of the driver is case sensitive and determines the section
-# where to look for further configuration options of the specific driver
-# as well as the name of the dynamic driver module to load at runtime.
-# The latter one can be changed by giving af File= directive in the
-# driver specific section.
-#
-# The following drivers are supported:
-#   bayrad, CFontz, CFontz633, CFontzPacket, curses, CwLnx, EyeboxOne,
-#   g15, glcdlib, glk, hd44780, icp_a106, imon, IOWarrior, irman,
-#   joy, lb216,lcdm001, lcterm, lirc,MD8800, ms6931, mtc_s16209x,
-#   MtxOrb, NoritakeVFD, pyramid, sed1330, sed1520, serialVFD,
-#   sli, stv5730, svga, t6963, text, tyan, ula200, xosd
-Driver=shuttleVFD
-#Driver=curses
-
-# Tells the driver to bind to the given interface
-Bind=127.0.0.1
-
-# Listen on this specified port; defaults to 13666.
-Port=13666
-
-# Sets the reporting level; defaults to 2 (warnings and errors only).
-#ReportLevel=3
-
-# Should we report to syslog instead of stderr ? Default: no
-#ReportToSyslog=yes
-
-# Sets the default time in seconds to displays a screen.
-WaitTime=5
-
-# User to run as.  LCDd will drop its root priviledges,
-# if any, and run as this user instead.
-User=nobody
-
-# If yes, the the serverscreen will be rotated as a usual info screen. If no,
-# it will be a background screen, only visible when no other screens are
-# active.
-#ServerScreen=no
-
-# The server will stay in the foreground if set to true.
-#Foreground=no
-
-# Where can we find the driver modules ?
-# IMPORTANT: Make sure to change this setting to reflect your
-#            specific setup! Otherwise LCDd won't be able to find
-#            the driver modules and will thus not be able to
-#            function properly.
-# NOTE: Always place a slash as last character !
-DriverPath=/usr/lib/lcdproc/
-
-# The "...Key=" lines define what the server does with keypresses that
-# don't go to any client.
-# These are the defaults:
-ToggleRotateKey=Enter
-PrevScreenKey=Left
-NextScreenKey=Right
-#ScrollUpKey=Up
-#ScrollDownKey=Down
-
-# If you have only 4 keys, you can choose to use this:
-#ToggleRotateKey=Enter
-#PrevScreenKey=Up
-#NextScreenKey=Down
-
-# If you have only 3 keys, you can choose to use this:
-#ToggleRotateKey=Enter
-#PrevScreenKey=Up
-
-
-
-## The menu section. The menu is an internal LCDproc client. ##
-[menu]
-# You can configure what keys the menu should use. Note that the MenuKey
-# will be reserved exclusively, the others work in shared mode.
-
-# The following works excellent with 4 keys or more.
-MenuKey=Escape
-EnterKey=Enter
-UpKey=Up
-DownKey=Down
-# If you have 6 keys you may define these as well
-#LeftKey=Left
-#RightKey=Right
-
-# If you have only 3 keys, you could use something like this:
-#MenuKey=Escape
-#EnterKey=Enter
-#DownKey=Down
-
-
-
-### Driver sections are below this line, in alphabetical order  ###
-
-
-## EMAC BayRAD driver ##
-[bayrad]
-
-# Select the output device to use [default: /dev/lcd]
-Device=/dev/lcd
-
-# Set the communication speed [default: 9600; legal:  1200, 2400, 9600, 19200]
-Speed=9600
-
-
-
-## CrystalFontz driver (for CF632 & CF634) ##
-[CFontz]
-
-# Select the output device to use [default: /dev/lcd]
-Device=/dev/ttyS0
-# Select the LCD size [default: 20x4]
-Size=20x4
-# Set the initial contrast [default: 560; legal: 0 - 1000]
-Contrast=350
-# Set the initial brightness [default: 255; legal: 0 - 255]
-Brightness=255
-# Set the initial off-brightness [default: 0; legal: 0 - 255]
-# This value is used when the display is normally
-# switched off in case LCDd is inactive
-OffBrightness=0
-# Set the communication speed [default: 9600; legal: 1200, 2400, 9600, 19200 or 115200]
-Speed=9600
-# Set the firmware version (New means >= 2.0) [default: no; legal: yes, no]
-NewFirmware=no
-# Reinitialize the LCD's BIOS [default: no; legal: yes, no]
-# normally you shouldn't need this
-Reboot=no
-
-
-
-## CrystalFontz633 driver (for CF633 only) ##
-[CFontz633]
-
-# Select the output device to use [default: /dev/lcd]
-Device=/dev/ttyS0
-# Select the LCD type (size) [default: 16x2]
-Size=16x2
-# Set the initial contrast [default: 560; legal: 0 - 1000]
-Contrast=350
-# Set the initial brightness [default: 1000; legal: 0 - 1000]
-Brightness=1000
-# Set the initial off-brightness [default: 0; legal: 0 - 1000]
-# This value is used when the display is normally
-# switched off in case LCDd is inactive
-OffBrightness=50
-# Set the communication speed [default: 9600; legal: 1200, 2400, 9600, 19200, 115200]
-Speed=19200
-# Set the firmware version (New means >= 2.0) [default: no; legal: yes, no]
-# Currently this flag is not in use, there is no such thing as NewFirmware. ;=)
-#NewFirmware=no
-# Reinitialize the LCD's BIOS [default: no; legal: yes, no]
-# I want to reboot the LCD to make sure we start from a known state
-Reboot=yes
-
-
-
-## CrystalFontz packet driver (for CF631, CF633 & CF635) ##
-[CFontzPacket]
-
-# Select the LCD model [default: 633; legal: 631, 633, 635]
-Model=635
-# Select the output device to use [default: /dev/lcd]
-Device=/dev/ttyUSB0
-# Select the LCD size [default: depending on model: 635: 20x4, 631: 20x2, 633: 16x2]
-Size=20x4
-# Set the initial contrast [default: 560; legal: 0 - 1000]
-Contrast=350
-# Set the initial brightness [default: 1000; legal: 0 - 1000]
-Brightness=1000
-# Set the initial off-brightness [default: 0; legal: 0 - 1000]
-# This value is used when the display is normally
-# switched off in case LCDd is inactive
-OffBrightness=50
-# Set the communication speed [default: 9600; legal: 1200, 2400, 9600, 19200, 115200]
-Speed=115200
-# Set the firmware version (New means >= 2.0) [default: no; legal: yes, no]
-# Currently this flag is not in use, there is no such thing as NewFirmware. ;=)
-#NewFirmware=no
-# Reinitialize the LCD's BIOS [default: no; legal: yes, no]
-# I want to reboot the LCD to make sure we start from a known state
-Reboot=yes
-
-
-
-## Curses driver ##
-[curses]
-
-# color settings
-# foreground color [default: blue]
-Foreground=blue
-# background color when "backlight" is off [default: cyan]
-Background=cyan
-# background color when "backlight" is on [default: red]
-Backlight=red
-
-# display size [default: 20x4]
-Size=20x4
-
-# What position (X,Y) to start the left top corner at...
-# Default: (7,7)
-TopLeftX=7
-TopLeftY=7
-
-# use ASC symbols for icons & bars [default: no; legal, yes, no]
-UseACS=no
-
-
-
-## Cwlinux driver ##
-[CwLnx]
-
-# Select the LCD model [default: 12232; legal: 12232, 1602]
-Model=12232
-# Select the output device to use [default: /dev/lcd]
-Device=/dev/ttyUSB0
-
-# Select the LCD size [default: depending on model: 12232: 20x4, 1602: 16x2]
-Size=20x4
-
-# Set the communication speed [default: 19200; legal: 9600, 19200]
-Speed=19200
-
-# Reinitialize the LCD's BIOS [default: no; legal: yes, no]
-# normally you shouldn't need this
-Reboot=no
-
-# If you have a keypad connected. Keypad layout is currently not
-# configureable from the config file.
-Keypad=yes
-
-# If you have a non-standard keypad you can associate any keystrings to keys.
-# There are 6 input keys in the CwLnx hardware that generate characters
-# from 'A' to 'F'.
-#
-# The following is the built-in default mapping hardcoded in the driver.
-# You can leave those unchanged if you have a standard keypad.
-# You can change it if you want to report other keystrings or have a non
-# standard keypad.
-# KeyMap_A=Up
-# KeyMap_B=Down
-# KeyMap_C=Left
-# KeyMap_D=Right
-# KeyMap_E=Enter
-# KeyMap_F=Escape
-
-# keypad_test_mode permits to test keypad assignement
-# Default value is no
-#keypad_test_mode=yes
-
-
-
-## EyeboxOne driver ##
-[EyeboxOne]
-
-# Select the output device to use [default: /dev/ttyS1]
-#Device=/dev/cua01
-Device=/dev/ttyS1
-
-# Set the display size [default: 20x4]
-Size=20x4
-
-# Switch on the backlight? [default: yes]
-Backlight=yes
-
-# Switch on the cursor? [default: no]
-Cursor=no
-
-# Set the communication speed [default: 19200; legal: 1200, 2400, 9600, 19200]
-Speed=19200
-
-# Enter Key is a \r character, so it's hardcoded in the driver
-LeftKey=D
-RightKey=C
-UpKey=A
-DownKey=B
-EscapeKey=P
-
-# You can find out which key of your display sends which
-# character by setting keypad_test_mode to yes and running
-# LCDd. LCDd will output all characters it receives.
-# Afterwards you can modify the settings above and set
-# keypad_set_mode to no again.
-keypad_test_mode=no
-
-
-## g15 driver for Logitech G15 Keyboard LCDs ##
-[g15]
-
-# Display size (currently unused)
-size=20x5
-
-## glcdlib meta driver for graphical LCDs ##
-[glcdlib]
-
-## mandatory:
-
-# which graphical display supported by graphlcd-base to use [default: image]
-# (see /etc/graphlcd.conf for possible drivers)
-Driver=noritake800
-
-# no=use graphlcd bitmap fonts (they have only one size / font file)
-# yes=use fonts supported by FreeType2 (needs Freetype2 support in libglcdprocdriver and its dependants)
-UseFT2=yes
-
-# text resolution in fixed width characters [default: 16x4]
-# (if it won't fit according to available physical pixel resolutioni
-# and the minimum available font face size in pixels, then 
-# 'DebugBorder' will automatically be turned on)
-TextResolution=20x4
-
-# path to font file to use
-FontFile=/usr/share/fonts/corefonts/courbd.ttf
-
-
-## these only apply if UseFT2=yes:
-
-# character encoding to use
-CharEncoding=iso8859-2
-
-# minumum size in pixels in which fonts should be rendered
-MinFontFaceSize=7x12
-
-
-## optional:
-Brightness=50			# Brightness (in %) if applicable
-Contrast=50			# Contrast (in %) if applicable
-Backlight=no			# Backlight if applicable
-UpsideDown=no			# flip image upside down
-Invert=no			# invert light/dark pixels
-ShowDebugFrame=no		# turns on/off 1 pixel thick debugging
-				# border whithin the usable text area,
-				# for setting up TextResolution and
-				# MinFontFaceSize (if using FT2);
-ShowBigBorder=no		# border around the unused area
-ShowThinBorder=yes		# border around the unused area
-PixelShiftX=0
-PixelShiftY=2
-
-
-
-## Matrix Orbital GLK driver ##
-[glk]
-
-# select the serial device to use [default: /dev/lcd]
-Device=/dev/lcd
-
-# set the initial contrast value [default: 560; legal: 0 - 1000]
-Contrast=560
-
-# set the serial port speed [default: 19200; legal: 9600, 19200, 38400]
-Speed=19200
-
-
-
-## Hitachi HD44780 driver ##
-[hd44780]
-
-# Select what type of connection. See documentation for types.
-ConnectionType=4bit
-
-# Port where the LPT is. Usual values are 0x278, 0x378 and 0x3BC
-Port=0x378
-
-# Device of the serial interface (default is /dev/lcd)
-Device=/dev/ttyS0
-
-# Bitrate of the serial port (0 for interface default)
-Speed=0
-
-# If you have a keypad connected.
-# You may also need to configure the keypad layout further on in this file.
-Keypad=no
-
-# set the initial contrast (for bwctusb only) [default: 0; legal: 0 - 1000]
-Contrast=0
-
-# If you have a switchable backlight.
-Backlight=no
-
-# If you have the additional output port ("bargraph") and you want to
-# be able to control it with the lcdproc OUTPUT command
-OutputPort=no
-
-# Specifies if the last line is pixel addressable or it controls an
-# underline effect. [default: true (= pixel addressable); legal: yes, no]
-#Lastline=true
-
-# Specifies the size of the LCD.
-# In case of multiple combined displays, this should be the total size.
-Size=20x4
-
-# For multiple combined displays: how many lines does each display have.
-# Vspan=2,2 means both displays have 2 lines.
-#vspan=2,2
-
-# If you have an HD66712, a KS0073 or an other 'almost HD44780-compatible',
-# set this flag to get into extended mode (4-line linear).
-# This flag is NOT the old obsolete Extended option.
-#ExtendedMode=yes
-
-# Character map to to map ISO-8859-1 to the LCD's character set
-# [default: hd44780_default; legal: hd44780_default, ea_ks0073 ]
-Charmap=hd44780_default
-
-# If your display is slow and cannot keep up with the flow of data from
-# LCDd, garbage can appear on the LCDd. Set this delay factor to 2 or 4
-# to increase the delays. Default: 1.
-#DelayMult=2
-
-# You can reduce the inserted delays by setting this to false.
-# On fast PCs it is possible your LCD does not respond correctly.
-# Default: true.
-DelayBus=true
-
-# If you have a keypad you can assign keystrings to the keys.
-# See documentation for used terms and how to wire it.
-# For example to give directly connected key 4 the string "Enter", use:
-#   KeyDirect_4=Enter
-# For matrix keys use the X and Y coordinates of the key:
-#   KeyMatrix_1_3=Enter
-KeyMatrix_4_1=Enter
-KeyMatrix_4_2=Up
-KeyMatrix_4_3=Down
-KeyMatrix_4_4=Escape
-
-
-
-## ICP A106 driver ##
-[icp_a106]
-Device=/dev/ttyS1
-
-
-
-## Code Mercenaries IO-Warrior driver ##
-[IOWarrior]
-
-# display dimensions
-Size=20x4
-
-# serial number [exactly as listed by usbview]
-# (if not given, the 1st IOWarrior found gets used)
-#SerialNumber=00000674
-
-# Specifies if the last line is pixel addressable or it controls an
-# underline effect. [default: true (= pixel addressable); legal: yes, no]
-#Lastline=true
-
-
-
-## Soundgraph/Ahanix/Silverstone/Uneed/Accent iMON driver ##
-[imon]
-
-# select the device to use
-Device=/dev/lcd0
-
-# display dimensions
-Size=16x2
-
-
-
-## IrMan driver ##
-[IrMan]
-#if in trouble with IrMan, try Lirc emulator for IrMan
-
-# Select the input device to use
-#Device=/dev/irman
-
-# Select the configuration file to use
-#Config=/etc/irman.cfg
-
-
-
-## Joystick driver ##
-[joy]
-
-# Select the input device to use [default: /dev/js0]
-Device=/dev/js0
-
-# set the axis map
-Map_Axis1neg=Left
-Map_Axis1pos=Right
-Map_Axis2neg=Up
-Map_Axis2pos=Down
-
-# set the button map
-Map_Button1=Enter
-Map_Button2=Escape
-
-
-
-## LB216 driver ##
-[lb216]
-
-# Select the output device to use [default: /dev/lcd]
-Device=/dev/lcd
-
-# Set the initial brightness [default: 255; legal: 0 - 255]
-Brightness=255
-
-# Set the communication speed [default: 9600; legal: 2400, 9600]
-Speed=9600
-
-# Reinitialize the LCD's BIOS [default: no; legal: yes, no]
-Reboot=no
-
-
-
-## LCDM001 driver ##
-[lcdm001]
-
-Device=/dev/ttyS1
-
-# keypad settings
-# Keyname      Function
-#              Normal context              Menu context
-# -------      --------------              ------------
-# PauseKey     Pause/Continue              Enter/select
-# BackKey      Back(Go to previous screen) Up/Left
-# ForwardKey   Forward(Go to next screen)  Down/Right
-# MainMenuKey  Open main menu              Exit/Cancel
-PauseKey=LeftKey
-BackKey=UpKey
-ForwardKey=DownKey
-MainMenuKey=RightKey
-
-# You can rearrange the settings here.
-# If your device is broken, have a look at /usr/lib/lcdproc/lcdm001.h
-
-
-
-## HNE LCTerm driver ##
-[lcterm]
-Device=/dev/ttyS1
-Size=16x2
-
-
-
-## LIRC input driver ##
-[lirc]
-
-# Specify an alternative location of the lircrc file [default: ~/.lircrc]
-#lircrc=/etc/lircrc.lcdproc
-
-# Must be the same as in your lircrc
-#prog=lcdd
-
-
-
-##The driver for the VFD of the Medion MD8800 PC ##
-[MD8800]
-# device to use [default: /dev/ttyS1]
-#Device=/dev/ttyS1
-
-# display size [default: 16x2]
-#Size=16x2
-
-# Set the initial brightness [default: 1000; legal: 0 - 1000]
-Brightness=1000
-# Set the initial off-brightness [default: 0; legal: 0 - 1000]
-# This value is used when the display is normally
-# switched off in case LCDd is inactive
-OffBrightness=50
-
-
-
-## MSI MS-6931 driver for displays in 1HU servers ##
-[ms6931]
-
-# device to use [default: /dev/ttyS1]
-Device=/dev/ttyS1
-
-# display size [default: 16x2]
-#Size=16x2
-
-
-
-## MTC-S16209x driver ##
-[mtc_s16209x]
-
-# Select the output device to use [default: /dev/lcd]
-Device=/dev/lcd
-
-# Set the initial brightness [default: 255; legal: 0 - 255]
-Brightness=255
-
-# Reinitialize the LCD's BIOS [default: no; legal: yes, no]
-Reboot=no
-
-
-
-## Matrix Orbital driver ##
-[MtxOrb]
-
-# Select the output device to use [default: /dev/lcd]
-Device=/dev/ttyS0
-
-# Set the display size [default: 20x4]
-Size=20x4
-
-# Switch on the backlight? [default: yes]
-# NOTE: The driver will ignore this if the display is a vfd or vkd
-#       as they crash if the backlight is turned off
-Backlight=yes
-
-# Set the initial contrast [default: 480]
-# NOTE: The driver will ignore this if the display
-#       is a vfd or vkd as they don't have this feature
-Contrast=800
-
-# Set the communication speed [default: 19200; legal: 1200, 2400, 9600, 19200]
-Speed=19200
-
-# Set the display type [default: lcd; legal: lcd, lkd, vfd, vkd]
-Type=lkd
-
-# The following table translates from MtxOrb key letters to logical key namess.
-# By default no keys are mapped, meaning the keypad is not used at all.
-#KeyMap_A=Left
-#KeyMap_B=Right
-#KeyMap_C=Up
-#KeyMap_D=Down
-#KeyMap_E=Enter
-#KeyMap_F=Escape
-# See the [menu] section for an explanation of the key mappings
-
-# You can find out which key of your display sends which
-# character by setting keypad_test_mode to yes and running
-# LCDd. LCDd will output all characters it receives.
-# Afterwards you can modify the settings above and set
-# keypad_set_mode to no again.
-keypad_test_mode=no
-
-
-
-## Noritake VFD driver ##
-[NoritakeVFD]
-# device where the VFD is. Usual values are /dev/ttyS0 and /dev/ttyS1 [default: /dev/lcd]
-Device=/dev/ttyS0
-
-# Specifies the size of the LCD.
-Size=20x4
-
-# set the brightness
-Brightness=255
-
-# set the serial port speed [default: 9600, legal: 1200, 2400, 9600, 19200, 115200]
-Speed=9600
-
-# re-initialize VFD ?
-#Reboot=yes
-
-
-
-## Pyramid LCD driver ##
-[pyramid]
-
-# device to connect to [default: /dev/lcd]
-Device=/dev/ttyUSB0
-
-
-
-## Seiko Epson 1330 driver ##
-[sed1330]
-
-# Port where the LPT is. Common values are 0x278, 0x378 and 0x3BC
-Port=0x378
-
-# Type of LCD module (legal: G321D, G121C, G242C, G191D, G2446)
-# Note: G321D is the only one that is tested currently.
-Type=G321D
-
-
-
-## Seiko Epson 1520 driver ##
-[sed1520]
-
-# Port where the LPT is. Usual values are 0x278, 0x378 and 0x3BC
-Port=0x378
-
-
-
-## Serial VFD driver ##
-## Drives various (see below) serial 5x7dot VFD's.  ##
-[serialVFD]
-
-# Specifies the displaytype.[default: 0]
-# 0 NEC (FIPC8367 based) VFDs.
-# 1 KD Rev 2.1.
-# 2 Noritake VFDs (*).
-# 3 Futaba VFDs
-# (* most should work, not testet yet.)
-Type=0
-
-# "no" if display connected serial, "yes" if connected parallel. [default: no(=serial)]
-use_parallel=no
-
-# Number of Custom-Characters [default: displaytype dependent]
-#Custom-Characters=0
-
-# Portaddress where the LPT is. Used in parallelmode only. Usual values are 0x278, 0x378 and 0x3BC
-Port=0x378
-
-# Device to use in serial mode. Usual values are /dev/ttyS0 and /dev/ttyS1
-Device=/dev/ttyS1
-
-# Specifies the size of the VFD.
-Size=20x2
-
-# Set the initial brightness [default: 1000; legal: 0 - 1000]
-# (4 steps 0-250, 251-500, 501-750, 751-1000)
-Brightness=1000
-# Set the initial off-brightness [default: 0; legal: 0 - 1000]
-# This value is used when the display is normally
-# switched off in case LCDd is inactive
-# (4 steps 0-250, 251-500, 501-750, 751-1000)
-OffBrightness=0
-
-# set the serial port speed [default: 9600; legal: 1200, 2400, 9600, 19200, 115200]
-Speed=9600
-
-# enable ISO 8859 1 compatibility [default: yes; legal: yes, no]
-#ISO_8859_1=yes
-
-
-
-## stv5730 driver ##
-[stv5730]
-
-# Port the device is connected to [default: 0x378]
-Port=0x378
-
-
-
-## SVGAlib driver ##
-[svga]
-
-# svgalib mode to use [default: G320x240x256; legal: supported svgalib modes]
-#Mode=G640x480x256
-
-# set display size [default: 20x4]
-Size=20x4
-
-# Set the initial contrast [default: 500; legal: 0 - 1000]
-# Can be set but does not change anything internally
-Contrast=500
-
-# Set the initial brightness [default: 1000; legal: 1 - 1000]
-Brightness=1000
-
-# Set the initial off-brightness [default: 500; legal: 1 - 1000]
-# This value is used when the display is normally
-# switched off in case LCDd is inactive
-OffBrightness=500
-
-
-
-## Text driver ##
-[text]
-# Set the display size [default: 20x4]
-Size=20x4
-
-
-
-## Toshiba T6963 driver ##
-[t6963]
-
-# set display size [default: 20x6]
-Size=20x6
-
-# port to use [default: 0x378; legal: 0x200 - 0x400]
-Port=0x378
-
-# Is ECP mode on? [default: yes; legal: yes, no]
-#ECPlpt=yes
-
-# Use graphics? [default: no; legal: yes, no]
-#graphic=no
-
-
-
-## Tyan Barebones LCD driver (GS10 & GS12 series) ##
-[tyan]
-
-# Select the output device to use [default: /dev/lcd]
-Device=/dev/lcd
-
-# Set the communication speed [default: 9600; legal: 4800, 9600]
-Speed=9600
-
-# set display size [default: 16x2]
-Size=16x2
-
-
-
-## ELV ula200 driver ##
-[ula200]
-
-# Select the LCD size [default: 20x4]
-Size=20x4
-
-# If you have a non standard keypad you can associate any keystrings to keys.
-# There are 6 input key in the CwLnx hardware that generate characters
-# from 'A' to 'F'.
-#
-# The following it the built-in default mapping hardcoded in the driver.
-# You can leave those unchanged if you have a standard keypad.
-# You can change it if you want to report other keystrings or have a non
-# standard keypad.
-# KeyMap_A=Up
-# KeyMap_B=Down
-# KeyMap_C=Left
-# KeyMap_D=Right
-# KeyMap_E=Enter
-# KeyMap_F=Escape
-
-
-
-## Wirz SLI LCD driver ##
-[sli]
-
-# Select the output device to use [default: /dev/lcd]
-Device=/dev/lcd
-
-# Set the communication speed [default: 19200; legal: 1200, 2400, 9600, 19200, 38400, 57600, 115200]
-Speed=19200
-
-
-
-## OnScreen Display using libxosd ##
-[xosd]
-
-# set display size [default: 20x4]
-Size=20x4
-
-# font to use
-Font=-*-terminus-*-r-*-*-*-320-*-*-*-*-*
-
-# EOF
diff --git a/abs/mv-core/MythVantage-config/templates/LCD/Silverstone/LCDd.conf b/abs/mv-core/MythVantage-config/templates/LCD/Silverstone/LCDd.conf
deleted file mode 100644
index 2596c25..0000000
--- a/abs/mv-core/MythVantage-config/templates/LCD/Silverstone/LCDd.conf
+++ /dev/null
@@ -1,869 +0,0 @@
-# LCDd.conf -- configuration file for the LCDproc server daemon LCDd
-#
-# This file contains the configuration for the LCDd server.
-# 
-# The format is ini-file-like. It is divided into sections that start at
-# markers that look like [section]. Comments are all line-based comments,
-# and are lines that start with '#' or ';'.
-#
-# The server has a 'central' section named [server]. For the menu there is
-# a section called [menu]. Further each driver has a section which
-# defines how the driver acts.
-#
-# The drivers are activated by specifiying them in a driver= line in the
-# server section, like:
-#
-#   Driver=curses
-#
-# This tells LCDd to use the curses driver.
-# The first driver that is loaded and is capable of output defines the
-# size of the display. The default driver to use is curses.
-# If the driver is specified using the -d <driver> command line option,
-# the Driver= options in the config file are ignored.
-#
-# The drivers read their own options from the respective sections.
-
-
-
-## Server section with all kinds of settings for the LCDd server ##
-[server]
-
-# Tells the server to load the given drivers. Multiple lines can be given.
-# The name of the driver is case sensitive and determines the section
-# where to look for further configuration options of the specific driver
-# as well as the name of the dynamic driver module to load at runtime.
-# The latter one can be changed by giving af File= directive in the
-# driver specific section.
-#
-# The following drivers are supported:
-#   bayrad, CFontz, CFontz633, CFontzPacket, curses, CwLnx, EyeboxOne,
-#   g15, glcdlib, glk, hd44780, icp_a106, imon, IOWarrior, irman,
-#   joy, lb216,lcdm001, lcterm, lirc,MD8800, ms6931, mtc_s16209x,
-#   MtxOrb, NoritakeVFD, pyramid, sed1330, sed1520, serialVFD,
-#   sli, stv5730, svga, t6963, text, tyan, ula200, xosd
-Driver=imon
-#Driver=curses
-
-# Tells the driver to bind to the given interface
-Bind=127.0.0.1
-
-# Listen on this specified port; defaults to 13666.
-Port=13666
-
-# Sets the reporting level; defaults to 2 (warnings and errors only).
-#ReportLevel=3
-
-# Should we report to syslog instead of stderr ? Default: no
-#ReportToSyslog=yes
-
-# Sets the default time in seconds to displays a screen.
-WaitTime=5
-
-# User to run as.  LCDd will drop its root priviledges,
-# if any, and run as this user instead.
-User=nobody
-
-# If yes, the the serverscreen will be rotated as a usual info screen. If no,
-# it will be a background screen, only visible when no other screens are
-# active.
-#ServerScreen=no
-
-# The server will stay in the foreground if set to true.
-#Foreground=no
-
-# Where can we find the driver modules ?
-# IMPORTANT: Make sure to change this setting to reflect your
-#            specific setup! Otherwise LCDd won't be able to find
-#            the driver modules and will thus not be able to
-#            function properly.
-# NOTE: Always place a slash as last character !
-DriverPath=/usr/lib/lcdproc/
-
-# The "...Key=" lines define what the server does with keypresses that
-# don't go to any client.
-# These are the defaults:
-ToggleRotateKey=Enter
-PrevScreenKey=Left
-NextScreenKey=Right
-#ScrollUpKey=Up
-#ScrollDownKey=Down
-
-# If you have only 4 keys, you can choose to use this:
-#ToggleRotateKey=Enter
-#PrevScreenKey=Up
-#NextScreenKey=Down
-
-# If you have only 3 keys, you can choose to use this:
-#ToggleRotateKey=Enter
-#PrevScreenKey=Up
-
-
-
-## The menu section. The menu is an internal LCDproc client. ##
-[menu]
-# You can configure what keys the menu should use. Note that the MenuKey
-# will be reserved exclusively, the others work in shared mode.
-
-# The following works excellent with 4 keys or more.
-MenuKey=Escape
-EnterKey=Enter
-UpKey=Up
-DownKey=Down
-# If you have 6 keys you may define these as well
-#LeftKey=Left
-#RightKey=Right
-
-# If you have only 3 keys, you could use something like this:
-#MenuKey=Escape
-#EnterKey=Enter
-#DownKey=Down
-
-
-
-### Driver sections are below this line, in alphabetical order  ###
-
-
-## EMAC BayRAD driver ##
-[bayrad]
-
-# Select the output device to use [default: /dev/lcd]
-Device=/dev/lcd
-
-# Set the communication speed [default: 9600; legal:  1200, 2400, 9600, 19200]
-Speed=9600
-
-
-
-## CrystalFontz driver (for CF632 & CF634) ##
-[CFontz]
-
-# Select the output device to use [default: /dev/lcd]
-Device=/dev/ttyS0
-# Select the LCD size [default: 20x4]
-Size=20x4
-# Set the initial contrast [default: 560; legal: 0 - 1000]
-Contrast=350
-# Set the initial brightness [default: 255; legal: 0 - 255]
-Brightness=255
-# Set the initial off-brightness [default: 0; legal: 0 - 255]
-# This value is used when the display is normally
-# switched off in case LCDd is inactive
-OffBrightness=0
-# Set the communication speed [default: 9600; legal: 1200, 2400, 9600, 19200 or 115200]
-Speed=9600
-# Set the firmware version (New means >= 2.0) [default: no; legal: yes, no]
-NewFirmware=no
-# Reinitialize the LCD's BIOS [default: no; legal: yes, no]
-# normally you shouldn't need this
-Reboot=no
-
-
-
-## CrystalFontz633 driver (for CF633 only) ##
-[CFontz633]
-
-# Select the output device to use [default: /dev/lcd]
-Device=/dev/ttyS0
-# Select the LCD type (size) [default: 16x2]
-Size=16x2
-# Set the initial contrast [default: 560; legal: 0 - 1000]
-Contrast=350
-# Set the initial brightness [default: 1000; legal: 0 - 1000]
-Brightness=1000
-# Set the initial off-brightness [default: 0; legal: 0 - 1000]
-# This value is used when the display is normally
-# switched off in case LCDd is inactive
-OffBrightness=50
-# Set the communication speed [default: 9600; legal: 1200, 2400, 9600, 19200, 115200]
-Speed=19200
-# Set the firmware version (New means >= 2.0) [default: no; legal: yes, no]
-# Currently this flag is not in use, there is no such thing as NewFirmware. ;=)
-#NewFirmware=no
-# Reinitialize the LCD's BIOS [default: no; legal: yes, no]
-# I want to reboot the LCD to make sure we start from a known state
-Reboot=yes
-
-
-
-## CrystalFontz packet driver (for CF631, CF633 & CF635) ##
-[CFontzPacket]
-
-# Select the LCD model [default: 633; legal: 631, 633, 635]
-Model=635
-# Select the output device to use [default: /dev/lcd]
-Device=/dev/ttyUSB0
-# Select the LCD size [default: depending on model: 635: 20x4, 631: 20x2, 633: 16x2]
-Size=20x4
-# Set the initial contrast [default: 560; legal: 0 - 1000]
-Contrast=350
-# Set the initial brightness [default: 1000; legal: 0 - 1000]
-Brightness=1000
-# Set the initial off-brightness [default: 0; legal: 0 - 1000]
-# This value is used when the display is normally
-# switched off in case LCDd is inactive
-OffBrightness=50
-# Set the communication speed [default: 9600; legal: 1200, 2400, 9600, 19200, 115200]
-Speed=115200
-# Set the firmware version (New means >= 2.0) [default: no; legal: yes, no]
-# Currently this flag is not in use, there is no such thing as NewFirmware. ;=)
-#NewFirmware=no
-# Reinitialize the LCD's BIOS [default: no; legal: yes, no]
-# I want to reboot the LCD to make sure we start from a known state
-Reboot=yes
-
-
-
-## Curses driver ##
-[curses]
-
-# color settings
-# foreground color [default: blue]
-Foreground=blue
-# background color when "backlight" is off [default: cyan]
-Background=cyan
-# background color when "backlight" is on [default: red]
-Backlight=red
-
-# display size [default: 20x4]
-Size=20x4
-
-# What position (X,Y) to start the left top corner at...
-# Default: (7,7)
-TopLeftX=7
-TopLeftY=7
-
-# use ASC symbols for icons & bars [default: no; legal, yes, no]
-UseACS=no
-
-
-
-## Cwlinux driver ##
-[CwLnx]
-
-# Select the LCD model [default: 12232; legal: 12232, 1602]
-Model=12232
-# Select the output device to use [default: /dev/lcd]
-Device=/dev/ttyUSB0
-
-# Select the LCD size [default: depending on model: 12232: 20x4, 1602: 16x2]
-Size=20x4
-
-# Set the communication speed [default: 19200; legal: 9600, 19200]
-Speed=19200
-
-# Reinitialize the LCD's BIOS [default: no; legal: yes, no]
-# normally you shouldn't need this
-Reboot=no
-
-# If you have a keypad connected. Keypad layout is currently not
-# configureable from the config file.
-Keypad=yes
-
-# If you have a non-standard keypad you can associate any keystrings to keys.
-# There are 6 input keys in the CwLnx hardware that generate characters
-# from 'A' to 'F'.
-#
-# The following is the built-in default mapping hardcoded in the driver.
-# You can leave those unchanged if you have a standard keypad.
-# You can change it if you want to report other keystrings or have a non
-# standard keypad.
-# KeyMap_A=Up
-# KeyMap_B=Down
-# KeyMap_C=Left
-# KeyMap_D=Right
-# KeyMap_E=Enter
-# KeyMap_F=Escape
-
-# keypad_test_mode permits to test keypad assignement
-# Default value is no
-#keypad_test_mode=yes
-
-
-
-## EyeboxOne driver ##
-[EyeboxOne]
-
-# Select the output device to use [default: /dev/ttyS1]
-#Device=/dev/cua01
-Device=/dev/ttyS1
-
-# Set the display size [default: 20x4]
-Size=20x4
-
-# Switch on the backlight? [default: yes]
-Backlight=yes
-
-# Switch on the cursor? [default: no]
-Cursor=no
-
-# Set the communication speed [default: 19200; legal: 1200, 2400, 9600, 19200]
-Speed=19200
-
-# Enter Key is a \r character, so it's hardcoded in the driver
-LeftKey=D
-RightKey=C
-UpKey=A
-DownKey=B
-EscapeKey=P
-
-# You can find out which key of your display sends which
-# character by setting keypad_test_mode to yes and running
-# LCDd. LCDd will output all characters it receives.
-# Afterwards you can modify the settings above and set
-# keypad_set_mode to no again.
-keypad_test_mode=no
-
-
-## g15 driver for Logitech G15 Keyboard LCDs ##
-[g15]
-
-# Display size (currently unused)
-size=20x5
-
-## glcdlib meta driver for graphical LCDs ##
-[glcdlib]
-
-## mandatory:
-
-# which graphical display supported by graphlcd-base to use [default: image]
-# (see /etc/graphlcd.conf for possible drivers)
-Driver=noritake800
-
-# no=use graphlcd bitmap fonts (they have only one size / font file)
-# yes=use fonts supported by FreeType2 (needs Freetype2 support in libglcdprocdriver and its dependants)
-UseFT2=yes
-
-# text resolution in fixed width characters [default: 16x4]
-# (if it won't fit according to available physical pixel resolutioni
-# and the minimum available font face size in pixels, then 
-# 'DebugBorder' will automatically be turned on)
-TextResolution=20x4
-
-# path to font file to use
-FontFile=/usr/share/fonts/corefonts/courbd.ttf
-
-
-## these only apply if UseFT2=yes:
-
-# character encoding to use
-CharEncoding=iso8859-2
-
-# minumum size in pixels in which fonts should be rendered
-MinFontFaceSize=7x12
-
-
-## optional:
-Brightness=50			# Brightness (in %) if applicable
-Contrast=50			# Contrast (in %) if applicable
-Backlight=no			# Backlight if applicable
-UpsideDown=no			# flip image upside down
-Invert=no			# invert light/dark pixels
-ShowDebugFrame=no		# turns on/off 1 pixel thick debugging
-				# border whithin the usable text area,
-				# for setting up TextResolution and
-				# MinFontFaceSize (if using FT2);
-ShowBigBorder=no		# border around the unused area
-ShowThinBorder=yes		# border around the unused area
-PixelShiftX=0
-PixelShiftY=2
-
-
-
-## Matrix Orbital GLK driver ##
-[glk]
-
-# select the serial device to use [default: /dev/lcd]
-Device=/dev/lcd
-
-# set the initial contrast value [default: 560; legal: 0 - 1000]
-Contrast=560
-
-# set the serial port speed [default: 19200; legal: 9600, 19200, 38400]
-Speed=19200
-
-
-
-## Hitachi HD44780 driver ##
-[hd44780]
-
-# Select what type of connection. See documentation for types.
-ConnectionType=4bit
-
-# Port where the LPT is. Usual values are 0x278, 0x378 and 0x3BC
-Port=0x378
-
-# Device of the serial interface (default is /dev/lcd)
-Device=/dev/ttyS0
-
-# Bitrate of the serial port (0 for interface default)
-Speed=0
-
-# If you have a keypad connected.
-# You may also need to configure the keypad layout further on in this file.
-Keypad=no
-
-# set the initial contrast (for bwctusb only) [default: 0; legal: 0 - 1000]
-Contrast=0
-
-# If you have a switchable backlight.
-Backlight=no
-
-# If you have the additional output port ("bargraph") and you want to
-# be able to control it with the lcdproc OUTPUT command
-OutputPort=no
-
-# Specifies if the last line is pixel addressable or it controls an
-# underline effect. [default: true (= pixel addressable); legal: yes, no]
-#Lastline=true
-
-# Specifies the size of the LCD.
-# In case of multiple combined displays, this should be the total size.
-Size=20x4
-
-# For multiple combined displays: how many lines does each display have.
-# Vspan=2,2 means both displays have 2 lines.
-#vspan=2,2
-
-# If you have an HD66712, a KS0073 or an other 'almost HD44780-compatible',
-# set this flag to get into extended mode (4-line linear).
-# This flag is NOT the old obsolete Extended option.
-#ExtendedMode=yes
-
-# Character map to to map ISO-8859-1 to the LCD's character set
-# [default: hd44780_default; legal: hd44780_default, ea_ks0073 ]
-Charmap=hd44780_default
-
-# If your display is slow and cannot keep up with the flow of data from
-# LCDd, garbage can appear on the LCDd. Set this delay factor to 2 or 4
-# to increase the delays. Default: 1.
-#DelayMult=2
-
-# You can reduce the inserted delays by setting this to false.
-# On fast PCs it is possible your LCD does not respond correctly.
-# Default: true.
-DelayBus=true
-
-# If you have a keypad you can assign keystrings to the keys.
-# See documentation for used terms and how to wire it.
-# For example to give directly connected key 4 the string "Enter", use:
-#   KeyDirect_4=Enter
-# For matrix keys use the X and Y coordinates of the key:
-#   KeyMatrix_1_3=Enter
-KeyMatrix_4_1=Enter
-KeyMatrix_4_2=Up
-KeyMatrix_4_3=Down
-KeyMatrix_4_4=Escape
-
-
-
-## ICP A106 driver ##
-[icp_a106]
-Device=/dev/ttyS1
-
-
-
-## Code Mercenaries IO-Warrior driver ##
-[IOWarrior]
-
-# display dimensions
-Size=20x4
-
-# serial number [exactly as listed by usbview]
-# (if not given, the 1st IOWarrior found gets used)
-#SerialNumber=00000674
-
-# Specifies if the last line is pixel addressable or it controls an
-# underline effect. [default: true (= pixel addressable); legal: yes, no]
-#Lastline=true
-
-
-
-## Soundgraph/Ahanix/Silverstone/Uneed/Accent iMON driver ##
-[imon]
-
-# select the device to use
-Device=/dev/lcd0
-
-# display dimensions
-Size=16x2
-
-
-
-## IrMan driver ##
-[IrMan]
-#if in trouble with IrMan, try Lirc emulator for IrMan
-
-# Select the input device to use
-#Device=/dev/irman
-
-# Select the configuration file to use
-#Config=/etc/irman.cfg
-
-
-
-## Joystick driver ##
-[joy]
-
-# Select the input device to use [default: /dev/js0]
-Device=/dev/js0
-
-# set the axis map
-Map_Axis1neg=Left
-Map_Axis1pos=Right
-Map_Axis2neg=Up
-Map_Axis2pos=Down
-
-# set the button map
-Map_Button1=Enter
-Map_Button2=Escape
-
-
-
-## LB216 driver ##
-[lb216]
-
-# Select the output device to use [default: /dev/lcd]
-Device=/dev/lcd
-
-# Set the initial brightness [default: 255; legal: 0 - 255]
-Brightness=255
-
-# Set the communication speed [default: 9600; legal: 2400, 9600]
-Speed=9600
-
-# Reinitialize the LCD's BIOS [default: no; legal: yes, no]
-Reboot=no
-
-
-
-## LCDM001 driver ##
-[lcdm001]
-
-Device=/dev/ttyS1
-
-# keypad settings
-# Keyname      Function
-#              Normal context              Menu context
-# -------      --------------              ------------
-# PauseKey     Pause/Continue              Enter/select
-# BackKey      Back(Go to previous screen) Up/Left
-# ForwardKey   Forward(Go to next screen)  Down/Right
-# MainMenuKey  Open main menu              Exit/Cancel
-PauseKey=LeftKey
-BackKey=UpKey
-ForwardKey=DownKey
-MainMenuKey=RightKey
-
-# You can rearrange the settings here.
-# If your device is broken, have a look at /usr/lib/lcdproc/lcdm001.h
-
-
-
-## HNE LCTerm driver ##
-[lcterm]
-Device=/dev/ttyS1
-Size=16x2
-
-
-
-## LIRC input driver ##
-[lirc]
-
-# Specify an alternative location of the lircrc file [default: ~/.lircrc]
-#lircrc=/etc/lircrc.lcdproc
-
-# Must be the same as in your lircrc
-#prog=lcdd
-
-
-
-##The driver for the VFD of the Medion MD8800 PC ##
-[MD8800]
-# device to use [default: /dev/ttyS1]
-#Device=/dev/ttyS1
-
-# display size [default: 16x2]
-#Size=16x2
-
-# Set the initial brightness [default: 1000; legal: 0 - 1000]
-Brightness=1000
-# Set the initial off-brightness [default: 0; legal: 0 - 1000]
-# This value is used when the display is normally
-# switched off in case LCDd is inactive
-OffBrightness=50
-
-
-
-## MSI MS-6931 driver for displays in 1HU servers ##
-[ms6931]
-
-# device to use [default: /dev/ttyS1]
-Device=/dev/ttyS1
-
-# display size [default: 16x2]
-#Size=16x2
-
-
-
-## MTC-S16209x driver ##
-[mtc_s16209x]
-
-# Select the output device to use [default: /dev/lcd]
-Device=/dev/lcd
-
-# Set the initial brightness [default: 255; legal: 0 - 255]
-Brightness=255
-
-# Reinitialize the LCD's BIOS [default: no; legal: yes, no]
-Reboot=no
-
-
-
-## Matrix Orbital driver ##
-[MtxOrb]
-
-# Select the output device to use [default: /dev/lcd]
-Device=/dev/ttyS0
-
-# Set the display size [default: 20x4]
-Size=20x4
-
-# Switch on the backlight? [default: yes]
-# NOTE: The driver will ignore this if the display is a vfd or vkd
-#       as they crash if the backlight is turned off
-Backlight=yes
-
-# Set the initial contrast [default: 480]
-# NOTE: The driver will ignore this if the display
-#       is a vfd or vkd as they don't have this feature
-Contrast=800
-
-# Set the communication speed [default: 19200; legal: 1200, 2400, 9600, 19200]
-Speed=19200
-
-# Set the display type [default: lcd; legal: lcd, lkd, vfd, vkd]
-Type=lkd
-
-# The following table translates from MtxOrb key letters to logical key namess.
-# By default no keys are mapped, meaning the keypad is not used at all.
-#KeyMap_A=Left
-#KeyMap_B=Right
-#KeyMap_C=Up
-#KeyMap_D=Down
-#KeyMap_E=Enter
-#KeyMap_F=Escape
-# See the [menu] section for an explanation of the key mappings
-
-# You can find out which key of your display sends which
-# character by setting keypad_test_mode to yes and running
-# LCDd. LCDd will output all characters it receives.
-# Afterwards you can modify the settings above and set
-# keypad_set_mode to no again.
-keypad_test_mode=no
-
-
-
-## Noritake VFD driver ##
-[NoritakeVFD]
-# device where the VFD is. Usual values are /dev/ttyS0 and /dev/ttyS1 [default: /dev/lcd]
-Device=/dev/ttyS0
-
-# Specifies the size of the LCD.
-Size=20x4
-
-# set the brightness
-Brightness=255
-
-# set the serial port speed [default: 9600, legal: 1200, 2400, 9600, 19200, 115200]
-Speed=9600
-
-# re-initialize VFD ?
-#Reboot=yes
-
-
-
-## Pyramid LCD driver ##
-[pyramid]
-
-# device to connect to [default: /dev/lcd]
-Device=/dev/ttyUSB0
-
-
-
-## Seiko Epson 1330 driver ##
-[sed1330]
-
-# Port where the LPT is. Common values are 0x278, 0x378 and 0x3BC
-Port=0x378
-
-# Type of LCD module (legal: G321D, G121C, G242C, G191D, G2446)
-# Note: G321D is the only one that is tested currently.
-Type=G321D
-
-
-
-## Seiko Epson 1520 driver ##
-[sed1520]
-
-# Port where the LPT is. Usual values are 0x278, 0x378 and 0x3BC
-Port=0x378
-
-
-
-## Serial VFD driver ##
-## Drives various (see below) serial 5x7dot VFD's.  ##
-[serialVFD]
-
-# Specifies the displaytype.[default: 0]
-# 0 NEC (FIPC8367 based) VFDs.
-# 1 KD Rev 2.1.
-# 2 Noritake VFDs (*).
-# 3 Futaba VFDs
-# (* most should work, not testet yet.)
-Type=0
-
-# "no" if display connected serial, "yes" if connected parallel. [default: no(=serial)]
-use_parallel=no
-
-# Number of Custom-Characters [default: displaytype dependent]
-#Custom-Characters=0
-
-# Portaddress where the LPT is. Used in parallelmode only. Usual values are 0x278, 0x378 and 0x3BC
-Port=0x378
-
-# Device to use in serial mode. Usual values are /dev/ttyS0 and /dev/ttyS1
-Device=/dev/ttyS1
-
-# Specifies the size of the VFD.
-Size=20x2
-
-# Set the initial brightness [default: 1000; legal: 0 - 1000]
-# (4 steps 0-250, 251-500, 501-750, 751-1000)
-Brightness=1000
-# Set the initial off-brightness [default: 0; legal: 0 - 1000]
-# This value is used when the display is normally
-# switched off in case LCDd is inactive
-# (4 steps 0-250, 251-500, 501-750, 751-1000)
-OffBrightness=0
-
-# set the serial port speed [default: 9600; legal: 1200, 2400, 9600, 19200, 115200]
-Speed=9600
-
-# enable ISO 8859 1 compatibility [default: yes; legal: yes, no]
-#ISO_8859_1=yes
-
-
-
-## stv5730 driver ##
-[stv5730]
-
-# Port the device is connected to [default: 0x378]
-Port=0x378
-
-
-
-## SVGAlib driver ##
-[svga]
-
-# svgalib mode to use [default: G320x240x256; legal: supported svgalib modes]
-#Mode=G640x480x256
-
-# set display size [default: 20x4]
-Size=20x4
-
-# Set the initial contrast [default: 500; legal: 0 - 1000]
-# Can be set but does not change anything internally
-Contrast=500
-
-# Set the initial brightness [default: 1000; legal: 1 - 1000]
-Brightness=1000
-
-# Set the initial off-brightness [default: 500; legal: 1 - 1000]
-# This value is used when the display is normally
-# switched off in case LCDd is inactive
-OffBrightness=500
-
-
-
-## Text driver ##
-[text]
-# Set the display size [default: 20x4]
-Size=20x4
-
-
-
-## Toshiba T6963 driver ##
-[t6963]
-
-# set display size [default: 20x6]
-Size=20x6
-
-# port to use [default: 0x378; legal: 0x200 - 0x400]
-Port=0x378
-
-# Is ECP mode on? [default: yes; legal: yes, no]
-#ECPlpt=yes
-
-# Use graphics? [default: no; legal: yes, no]
-#graphic=no
-
-
-
-## Tyan Barebones LCD driver (GS10 & GS12 series) ##
-[tyan]
-
-# Select the output device to use [default: /dev/lcd]
-Device=/dev/lcd
-
-# Set the communication speed [default: 9600; legal: 4800, 9600]
-Speed=9600
-
-# set display size [default: 16x2]
-Size=16x2
-
-
-
-## ELV ula200 driver ##
-[ula200]
-
-# Select the LCD size [default: 20x4]
-Size=20x4
-
-# If you have a non standard keypad you can associate any keystrings to keys.
-# There are 6 input key in the CwLnx hardware that generate characters
-# from 'A' to 'F'.
-#
-# The following it the built-in default mapping hardcoded in the driver.
-# You can leave those unchanged if you have a standard keypad.
-# You can change it if you want to report other keystrings or have a non
-# standard keypad.
-# KeyMap_A=Up
-# KeyMap_B=Down
-# KeyMap_C=Left
-# KeyMap_D=Right
-# KeyMap_E=Enter
-# KeyMap_F=Escape
-
-
-
-## Wirz SLI LCD driver ##
-[sli]
-
-# Select the output device to use [default: /dev/lcd]
-Device=/dev/lcd
-
-# Set the communication speed [default: 19200; legal: 1200, 2400, 9600, 19200, 38400, 57600, 115200]
-Speed=19200
-
-
-
-## OnScreen Display using libxosd ##
-[xosd]
-
-# set display size [default: 20x4]
-Size=20x4
-
-# font to use
-Font=-*-terminus-*-r-*-*-*-320-*-*-*-*-*
-
-# EOF
diff --git a/abs/mv-core/MythVantage-config/templates/LCD/Silverstone/modules b/abs/mv-core/MythVantage-config/templates/LCD/Silverstone/modules
deleted file mode 100644
index cd576c3..0000000
--- a/abs/mv-core/MythVantage-config/templates/LCD/Silverstone/modules
+++ /dev/null
@@ -1 +0,0 @@
-lirc_imon	#LCD
diff --git a/abs/mv-core/MythVantage-config/templates/LCD/antec_fusion/LCDd.conf b/abs/mv-core/MythVantage-config/templates/LCD/antec_fusion/LCDd.conf
deleted file mode 100644
index 2596c25..0000000
--- a/abs/mv-core/MythVantage-config/templates/LCD/antec_fusion/LCDd.conf
+++ /dev/null
@@ -1,869 +0,0 @@
-# LCDd.conf -- configuration file for the LCDproc server daemon LCDd
-#
-# This file contains the configuration for the LCDd server.
-# 
-# The format is ini-file-like. It is divided into sections that start at
-# markers that look like [section]. Comments are all line-based comments,
-# and are lines that start with '#' or ';'.
-#
-# The server has a 'central' section named [server]. For the menu there is
-# a section called [menu]. Further each driver has a section which
-# defines how the driver acts.
-#
-# The drivers are activated by specifiying them in a driver= line in the
-# server section, like:
-#
-#   Driver=curses
-#
-# This tells LCDd to use the curses driver.
-# The first driver that is loaded and is capable of output defines the
-# size of the display. The default driver to use is curses.
-# If the driver is specified using the -d <driver> command line option,
-# the Driver= options in the config file are ignored.
-#
-# The drivers read their own options from the respective sections.
-
-
-
-## Server section with all kinds of settings for the LCDd server ##
-[server]
-
-# Tells the server to load the given drivers. Multiple lines can be given.
-# The name of the driver is case sensitive and determines the section
-# where to look for further configuration options of the specific driver
-# as well as the name of the dynamic driver module to load at runtime.
-# The latter one can be changed by giving af File= directive in the
-# driver specific section.
-#
-# The following drivers are supported:
-#   bayrad, CFontz, CFontz633, CFontzPacket, curses, CwLnx, EyeboxOne,
-#   g15, glcdlib, glk, hd44780, icp_a106, imon, IOWarrior, irman,
-#   joy, lb216,lcdm001, lcterm, lirc,MD8800, ms6931, mtc_s16209x,
-#   MtxOrb, NoritakeVFD, pyramid, sed1330, sed1520, serialVFD,
-#   sli, stv5730, svga, t6963, text, tyan, ula200, xosd
-Driver=imon
-#Driver=curses
-
-# Tells the driver to bind to the given interface
-Bind=127.0.0.1
-
-# Listen on this specified port; defaults to 13666.
-Port=13666
-
-# Sets the reporting level; defaults to 2 (warnings and errors only).
-#ReportLevel=3
-
-# Should we report to syslog instead of stderr ? Default: no
-#ReportToSyslog=yes
-
-# Sets the default time in seconds to displays a screen.
-WaitTime=5
-
-# User to run as.  LCDd will drop its root priviledges,
-# if any, and run as this user instead.
-User=nobody
-
-# If yes, the the serverscreen will be rotated as a usual info screen. If no,
-# it will be a background screen, only visible when no other screens are
-# active.
-#ServerScreen=no
-
-# The server will stay in the foreground if set to true.
-#Foreground=no
-
-# Where can we find the driver modules ?
-# IMPORTANT: Make sure to change this setting to reflect your
-#            specific setup! Otherwise LCDd won't be able to find
-#            the driver modules and will thus not be able to
-#            function properly.
-# NOTE: Always place a slash as last character !
-DriverPath=/usr/lib/lcdproc/
-
-# The "...Key=" lines define what the server does with keypresses that
-# don't go to any client.
-# These are the defaults:
-ToggleRotateKey=Enter
-PrevScreenKey=Left
-NextScreenKey=Right
-#ScrollUpKey=Up
-#ScrollDownKey=Down
-
-# If you have only 4 keys, you can choose to use this:
-#ToggleRotateKey=Enter
-#PrevScreenKey=Up
-#NextScreenKey=Down
-
-# If you have only 3 keys, you can choose to use this:
-#ToggleRotateKey=Enter
-#PrevScreenKey=Up
-
-
-
-## The menu section. The menu is an internal LCDproc client. ##
-[menu]
-# You can configure what keys the menu should use. Note that the MenuKey
-# will be reserved exclusively, the others work in shared mode.
-
-# The following works excellent with 4 keys or more.
-MenuKey=Escape
-EnterKey=Enter
-UpKey=Up
-DownKey=Down
-# If you have 6 keys you may define these as well
-#LeftKey=Left
-#RightKey=Right
-
-# If you have only 3 keys, you could use something like this:
-#MenuKey=Escape
-#EnterKey=Enter
-#DownKey=Down
-
-
-
-### Driver sections are below this line, in alphabetical order  ###
-
-
-## EMAC BayRAD driver ##
-[bayrad]
-
-# Select the output device to use [default: /dev/lcd]
-Device=/dev/lcd
-
-# Set the communication speed [default: 9600; legal:  1200, 2400, 9600, 19200]
-Speed=9600
-
-
-
-## CrystalFontz driver (for CF632 & CF634) ##
-[CFontz]
-
-# Select the output device to use [default: /dev/lcd]
-Device=/dev/ttyS0
-# Select the LCD size [default: 20x4]
-Size=20x4
-# Set the initial contrast [default: 560; legal: 0 - 1000]
-Contrast=350
-# Set the initial brightness [default: 255; legal: 0 - 255]
-Brightness=255
-# Set the initial off-brightness [default: 0; legal: 0 - 255]
-# This value is used when the display is normally
-# switched off in case LCDd is inactive
-OffBrightness=0
-# Set the communication speed [default: 9600; legal: 1200, 2400, 9600, 19200 or 115200]
-Speed=9600
-# Set the firmware version (New means >= 2.0) [default: no; legal: yes, no]
-NewFirmware=no
-# Reinitialize the LCD's BIOS [default: no; legal: yes, no]
-# normally you shouldn't need this
-Reboot=no
-
-
-
-## CrystalFontz633 driver (for CF633 only) ##
-[CFontz633]
-
-# Select the output device to use [default: /dev/lcd]
-Device=/dev/ttyS0
-# Select the LCD type (size) [default: 16x2]
-Size=16x2
-# Set the initial contrast [default: 560; legal: 0 - 1000]
-Contrast=350
-# Set the initial brightness [default: 1000; legal: 0 - 1000]
-Brightness=1000
-# Set the initial off-brightness [default: 0; legal: 0 - 1000]
-# This value is used when the display is normally
-# switched off in case LCDd is inactive
-OffBrightness=50
-# Set the communication speed [default: 9600; legal: 1200, 2400, 9600, 19200, 115200]
-Speed=19200
-# Set the firmware version (New means >= 2.0) [default: no; legal: yes, no]
-# Currently this flag is not in use, there is no such thing as NewFirmware. ;=)
-#NewFirmware=no
-# Reinitialize the LCD's BIOS [default: no; legal: yes, no]
-# I want to reboot the LCD to make sure we start from a known state
-Reboot=yes
-
-
-
-## CrystalFontz packet driver (for CF631, CF633 & CF635) ##
-[CFontzPacket]
-
-# Select the LCD model [default: 633; legal: 631, 633, 635]
-Model=635
-# Select the output device to use [default: /dev/lcd]
-Device=/dev/ttyUSB0
-# Select the LCD size [default: depending on model: 635: 20x4, 631: 20x2, 633: 16x2]
-Size=20x4
-# Set the initial contrast [default: 560; legal: 0 - 1000]
-Contrast=350
-# Set the initial brightness [default: 1000; legal: 0 - 1000]
-Brightness=1000
-# Set the initial off-brightness [default: 0; legal: 0 - 1000]
-# This value is used when the display is normally
-# switched off in case LCDd is inactive
-OffBrightness=50
-# Set the communication speed [default: 9600; legal: 1200, 2400, 9600, 19200, 115200]
-Speed=115200
-# Set the firmware version (New means >= 2.0) [default: no; legal: yes, no]
-# Currently this flag is not in use, there is no such thing as NewFirmware. ;=)
-#NewFirmware=no
-# Reinitialize the LCD's BIOS [default: no; legal: yes, no]
-# I want to reboot the LCD to make sure we start from a known state
-Reboot=yes
-
-
-
-## Curses driver ##
-[curses]
-
-# color settings
-# foreground color [default: blue]
-Foreground=blue
-# background color when "backlight" is off [default: cyan]
-Background=cyan
-# background color when "backlight" is on [default: red]
-Backlight=red
-
-# display size [default: 20x4]
-Size=20x4
-
-# What position (X,Y) to start the left top corner at...
-# Default: (7,7)
-TopLeftX=7
-TopLeftY=7
-
-# use ASC symbols for icons & bars [default: no; legal, yes, no]
-UseACS=no
-
-
-
-## Cwlinux driver ##
-[CwLnx]
-
-# Select the LCD model [default: 12232; legal: 12232, 1602]
-Model=12232
-# Select the output device to use [default: /dev/lcd]
-Device=/dev/ttyUSB0
-
-# Select the LCD size [default: depending on model: 12232: 20x4, 1602: 16x2]
-Size=20x4
-
-# Set the communication speed [default: 19200; legal: 9600, 19200]
-Speed=19200
-
-# Reinitialize the LCD's BIOS [default: no; legal: yes, no]
-# normally you shouldn't need this
-Reboot=no
-
-# If you have a keypad connected. Keypad layout is currently not
-# configureable from the config file.
-Keypad=yes
-
-# If you have a non-standard keypad you can associate any keystrings to keys.
-# There are 6 input keys in the CwLnx hardware that generate characters
-# from 'A' to 'F'.
-#
-# The following is the built-in default mapping hardcoded in the driver.
-# You can leave those unchanged if you have a standard keypad.
-# You can change it if you want to report other keystrings or have a non
-# standard keypad.
-# KeyMap_A=Up
-# KeyMap_B=Down
-# KeyMap_C=Left
-# KeyMap_D=Right
-# KeyMap_E=Enter
-# KeyMap_F=Escape
-
-# keypad_test_mode permits to test keypad assignement
-# Default value is no
-#keypad_test_mode=yes
-
-
-
-## EyeboxOne driver ##
-[EyeboxOne]
-
-# Select the output device to use [default: /dev/ttyS1]
-#Device=/dev/cua01
-Device=/dev/ttyS1
-
-# Set the display size [default: 20x4]
-Size=20x4
-
-# Switch on the backlight? [default: yes]
-Backlight=yes
-
-# Switch on the cursor? [default: no]
-Cursor=no
-
-# Set the communication speed [default: 19200; legal: 1200, 2400, 9600, 19200]
-Speed=19200
-
-# Enter Key is a \r character, so it's hardcoded in the driver
-LeftKey=D
-RightKey=C
-UpKey=A
-DownKey=B
-EscapeKey=P
-
-# You can find out which key of your display sends which
-# character by setting keypad_test_mode to yes and running
-# LCDd. LCDd will output all characters it receives.
-# Afterwards you can modify the settings above and set
-# keypad_set_mode to no again.
-keypad_test_mode=no
-
-
-## g15 driver for Logitech G15 Keyboard LCDs ##
-[g15]
-
-# Display size (currently unused)
-size=20x5
-
-## glcdlib meta driver for graphical LCDs ##
-[glcdlib]
-
-## mandatory:
-
-# which graphical display supported by graphlcd-base to use [default: image]
-# (see /etc/graphlcd.conf for possible drivers)
-Driver=noritake800
-
-# no=use graphlcd bitmap fonts (they have only one size / font file)
-# yes=use fonts supported by FreeType2 (needs Freetype2 support in libglcdprocdriver and its dependants)
-UseFT2=yes
-
-# text resolution in fixed width characters [default: 16x4]
-# (if it won't fit according to available physical pixel resolutioni
-# and the minimum available font face size in pixels, then 
-# 'DebugBorder' will automatically be turned on)
-TextResolution=20x4
-
-# path to font file to use
-FontFile=/usr/share/fonts/corefonts/courbd.ttf
-
-
-## these only apply if UseFT2=yes:
-
-# character encoding to use
-CharEncoding=iso8859-2
-
-# minumum size in pixels in which fonts should be rendered
-MinFontFaceSize=7x12
-
-
-## optional:
-Brightness=50			# Brightness (in %) if applicable
-Contrast=50			# Contrast (in %) if applicable
-Backlight=no			# Backlight if applicable
-UpsideDown=no			# flip image upside down
-Invert=no			# invert light/dark pixels
-ShowDebugFrame=no		# turns on/off 1 pixel thick debugging
-				# border whithin the usable text area,
-				# for setting up TextResolution and
-				# MinFontFaceSize (if using FT2);
-ShowBigBorder=no		# border around the unused area
-ShowThinBorder=yes		# border around the unused area
-PixelShiftX=0
-PixelShiftY=2
-
-
-
-## Matrix Orbital GLK driver ##
-[glk]
-
-# select the serial device to use [default: /dev/lcd]
-Device=/dev/lcd
-
-# set the initial contrast value [default: 560; legal: 0 - 1000]
-Contrast=560
-
-# set the serial port speed [default: 19200; legal: 9600, 19200, 38400]
-Speed=19200
-
-
-
-## Hitachi HD44780 driver ##
-[hd44780]
-
-# Select what type of connection. See documentation for types.
-ConnectionType=4bit
-
-# Port where the LPT is. Usual values are 0x278, 0x378 and 0x3BC
-Port=0x378
-
-# Device of the serial interface (default is /dev/lcd)
-Device=/dev/ttyS0
-
-# Bitrate of the serial port (0 for interface default)
-Speed=0
-
-# If you have a keypad connected.
-# You may also need to configure the keypad layout further on in this file.
-Keypad=no
-
-# set the initial contrast (for bwctusb only) [default: 0; legal: 0 - 1000]
-Contrast=0
-
-# If you have a switchable backlight.
-Backlight=no
-
-# If you have the additional output port ("bargraph") and you want to
-# be able to control it with the lcdproc OUTPUT command
-OutputPort=no
-
-# Specifies if the last line is pixel addressable or it controls an
-# underline effect. [default: true (= pixel addressable); legal: yes, no]
-#Lastline=true
-
-# Specifies the size of the LCD.
-# In case of multiple combined displays, this should be the total size.
-Size=20x4
-
-# For multiple combined displays: how many lines does each display have.
-# Vspan=2,2 means both displays have 2 lines.
-#vspan=2,2
-
-# If you have an HD66712, a KS0073 or an other 'almost HD44780-compatible',
-# set this flag to get into extended mode (4-line linear).
-# This flag is NOT the old obsolete Extended option.
-#ExtendedMode=yes
-
-# Character map to to map ISO-8859-1 to the LCD's character set
-# [default: hd44780_default; legal: hd44780_default, ea_ks0073 ]
-Charmap=hd44780_default
-
-# If your display is slow and cannot keep up with the flow of data from
-# LCDd, garbage can appear on the LCDd. Set this delay factor to 2 or 4
-# to increase the delays. Default: 1.
-#DelayMult=2
-
-# You can reduce the inserted delays by setting this to false.
-# On fast PCs it is possible your LCD does not respond correctly.
-# Default: true.
-DelayBus=true
-
-# If you have a keypad you can assign keystrings to the keys.
-# See documentation for used terms and how to wire it.
-# For example to give directly connected key 4 the string "Enter", use:
-#   KeyDirect_4=Enter
-# For matrix keys use the X and Y coordinates of the key:
-#   KeyMatrix_1_3=Enter
-KeyMatrix_4_1=Enter
-KeyMatrix_4_2=Up
-KeyMatrix_4_3=Down
-KeyMatrix_4_4=Escape
-
-
-
-## ICP A106 driver ##
-[icp_a106]
-Device=/dev/ttyS1
-
-
-
-## Code Mercenaries IO-Warrior driver ##
-[IOWarrior]
-
-# display dimensions
-Size=20x4
-
-# serial number [exactly as listed by usbview]
-# (if not given, the 1st IOWarrior found gets used)
-#SerialNumber=00000674
-
-# Specifies if the last line is pixel addressable or it controls an
-# underline effect. [default: true (= pixel addressable); legal: yes, no]
-#Lastline=true
-
-
-
-## Soundgraph/Ahanix/Silverstone/Uneed/Accent iMON driver ##
-[imon]
-
-# select the device to use
-Device=/dev/lcd0
-
-# display dimensions
-Size=16x2
-
-
-
-## IrMan driver ##
-[IrMan]
-#if in trouble with IrMan, try Lirc emulator for IrMan
-
-# Select the input device to use
-#Device=/dev/irman
-
-# Select the configuration file to use
-#Config=/etc/irman.cfg
-
-
-
-## Joystick driver ##
-[joy]
-
-# Select the input device to use [default: /dev/js0]
-Device=/dev/js0
-
-# set the axis map
-Map_Axis1neg=Left
-Map_Axis1pos=Right
-Map_Axis2neg=Up
-Map_Axis2pos=Down
-
-# set the button map
-Map_Button1=Enter
-Map_Button2=Escape
-
-
-
-## LB216 driver ##
-[lb216]
-
-# Select the output device to use [default: /dev/lcd]
-Device=/dev/lcd
-
-# Set the initial brightness [default: 255; legal: 0 - 255]
-Brightness=255
-
-# Set the communication speed [default: 9600; legal: 2400, 9600]
-Speed=9600
-
-# Reinitialize the LCD's BIOS [default: no; legal: yes, no]
-Reboot=no
-
-
-
-## LCDM001 driver ##
-[lcdm001]
-
-Device=/dev/ttyS1
-
-# keypad settings
-# Keyname      Function
-#              Normal context              Menu context
-# -------      --------------              ------------
-# PauseKey     Pause/Continue              Enter/select
-# BackKey      Back(Go to previous screen) Up/Left
-# ForwardKey   Forward(Go to next screen)  Down/Right
-# MainMenuKey  Open main menu              Exit/Cancel
-PauseKey=LeftKey
-BackKey=UpKey
-ForwardKey=DownKey
-MainMenuKey=RightKey
-
-# You can rearrange the settings here.
-# If your device is broken, have a look at /usr/lib/lcdproc/lcdm001.h
-
-
-
-## HNE LCTerm driver ##
-[lcterm]
-Device=/dev/ttyS1
-Size=16x2
-
-
-
-## LIRC input driver ##
-[lirc]
-
-# Specify an alternative location of the lircrc file [default: ~/.lircrc]
-#lircrc=/etc/lircrc.lcdproc
-
-# Must be the same as in your lircrc
-#prog=lcdd
-
-
-
-##The driver for the VFD of the Medion MD8800 PC ##
-[MD8800]
-# device to use [default: /dev/ttyS1]
-#Device=/dev/ttyS1
-
-# display size [default: 16x2]
-#Size=16x2
-
-# Set the initial brightness [default: 1000; legal: 0 - 1000]
-Brightness=1000
-# Set the initial off-brightness [default: 0; legal: 0 - 1000]
-# This value is used when the display is normally
-# switched off in case LCDd is inactive
-OffBrightness=50
-
-
-
-## MSI MS-6931 driver for displays in 1HU servers ##
-[ms6931]
-
-# device to use [default: /dev/ttyS1]
-Device=/dev/ttyS1
-
-# display size [default: 16x2]
-#Size=16x2
-
-
-
-## MTC-S16209x driver ##
-[mtc_s16209x]
-
-# Select the output device to use [default: /dev/lcd]
-Device=/dev/lcd
-
-# Set the initial brightness [default: 255; legal: 0 - 255]
-Brightness=255
-
-# Reinitialize the LCD's BIOS [default: no; legal: yes, no]
-Reboot=no
-
-
-
-## Matrix Orbital driver ##
-[MtxOrb]
-
-# Select the output device to use [default: /dev/lcd]
-Device=/dev/ttyS0
-
-# Set the display size [default: 20x4]
-Size=20x4
-
-# Switch on the backlight? [default: yes]
-# NOTE: The driver will ignore this if the display is a vfd or vkd
-#       as they crash if the backlight is turned off
-Backlight=yes
-
-# Set the initial contrast [default: 480]
-# NOTE: The driver will ignore this if the display
-#       is a vfd or vkd as they don't have this feature
-Contrast=800
-
-# Set the communication speed [default: 19200; legal: 1200, 2400, 9600, 19200]
-Speed=19200
-
-# Set the display type [default: lcd; legal: lcd, lkd, vfd, vkd]
-Type=lkd
-
-# The following table translates from MtxOrb key letters to logical key namess.
-# By default no keys are mapped, meaning the keypad is not used at all.
-#KeyMap_A=Left
-#KeyMap_B=Right
-#KeyMap_C=Up
-#KeyMap_D=Down
-#KeyMap_E=Enter
-#KeyMap_F=Escape
-# See the [menu] section for an explanation of the key mappings
-
-# You can find out which key of your display sends which
-# character by setting keypad_test_mode to yes and running
-# LCDd. LCDd will output all characters it receives.
-# Afterwards you can modify the settings above and set
-# keypad_set_mode to no again.
-keypad_test_mode=no
-
-
-
-## Noritake VFD driver ##
-[NoritakeVFD]
-# device where the VFD is. Usual values are /dev/ttyS0 and /dev/ttyS1 [default: /dev/lcd]
-Device=/dev/ttyS0
-
-# Specifies the size of the LCD.
-Size=20x4
-
-# set the brightness
-Brightness=255
-
-# set the serial port speed [default: 9600, legal: 1200, 2400, 9600, 19200, 115200]
-Speed=9600
-
-# re-initialize VFD ?
-#Reboot=yes
-
-
-
-## Pyramid LCD driver ##
-[pyramid]
-
-# device to connect to [default: /dev/lcd]
-Device=/dev/ttyUSB0
-
-
-
-## Seiko Epson 1330 driver ##
-[sed1330]
-
-# Port where the LPT is. Common values are 0x278, 0x378 and 0x3BC
-Port=0x378
-
-# Type of LCD module (legal: G321D, G121C, G242C, G191D, G2446)
-# Note: G321D is the only one that is tested currently.
-Type=G321D
-
-
-
-## Seiko Epson 1520 driver ##
-[sed1520]
-
-# Port where the LPT is. Usual values are 0x278, 0x378 and 0x3BC
-Port=0x378
-
-
-
-## Serial VFD driver ##
-## Drives various (see below) serial 5x7dot VFD's.  ##
-[serialVFD]
-
-# Specifies the displaytype.[default: 0]
-# 0 NEC (FIPC8367 based) VFDs.
-# 1 KD Rev 2.1.
-# 2 Noritake VFDs (*).
-# 3 Futaba VFDs
-# (* most should work, not testet yet.)
-Type=0
-
-# "no" if display connected serial, "yes" if connected parallel. [default: no(=serial)]
-use_parallel=no
-
-# Number of Custom-Characters [default: displaytype dependent]
-#Custom-Characters=0
-
-# Portaddress where the LPT is. Used in parallelmode only. Usual values are 0x278, 0x378 and 0x3BC
-Port=0x378
-
-# Device to use in serial mode. Usual values are /dev/ttyS0 and /dev/ttyS1
-Device=/dev/ttyS1
-
-# Specifies the size of the VFD.
-Size=20x2
-
-# Set the initial brightness [default: 1000; legal: 0 - 1000]
-# (4 steps 0-250, 251-500, 501-750, 751-1000)
-Brightness=1000
-# Set the initial off-brightness [default: 0; legal: 0 - 1000]
-# This value is used when the display is normally
-# switched off in case LCDd is inactive
-# (4 steps 0-250, 251-500, 501-750, 751-1000)
-OffBrightness=0
-
-# set the serial port speed [default: 9600; legal: 1200, 2400, 9600, 19200, 115200]
-Speed=9600
-
-# enable ISO 8859 1 compatibility [default: yes; legal: yes, no]
-#ISO_8859_1=yes
-
-
-
-## stv5730 driver ##
-[stv5730]
-
-# Port the device is connected to [default: 0x378]
-Port=0x378
-
-
-
-## SVGAlib driver ##
-[svga]
-
-# svgalib mode to use [default: G320x240x256; legal: supported svgalib modes]
-#Mode=G640x480x256
-
-# set display size [default: 20x4]
-Size=20x4
-
-# Set the initial contrast [default: 500; legal: 0 - 1000]
-# Can be set but does not change anything internally
-Contrast=500
-
-# Set the initial brightness [default: 1000; legal: 1 - 1000]
-Brightness=1000
-
-# Set the initial off-brightness [default: 500; legal: 1 - 1000]
-# This value is used when the display is normally
-# switched off in case LCDd is inactive
-OffBrightness=500
-
-
-
-## Text driver ##
-[text]
-# Set the display size [default: 20x4]
-Size=20x4
-
-
-
-## Toshiba T6963 driver ##
-[t6963]
-
-# set display size [default: 20x6]
-Size=20x6
-
-# port to use [default: 0x378; legal: 0x200 - 0x400]
-Port=0x378
-
-# Is ECP mode on? [default: yes; legal: yes, no]
-#ECPlpt=yes
-
-# Use graphics? [default: no; legal: yes, no]
-#graphic=no
-
-
-
-## Tyan Barebones LCD driver (GS10 & GS12 series) ##
-[tyan]
-
-# Select the output device to use [default: /dev/lcd]
-Device=/dev/lcd
-
-# Set the communication speed [default: 9600; legal: 4800, 9600]
-Speed=9600
-
-# set display size [default: 16x2]
-Size=16x2
-
-
-
-## ELV ula200 driver ##
-[ula200]
-
-# Select the LCD size [default: 20x4]
-Size=20x4
-
-# If you have a non standard keypad you can associate any keystrings to keys.
-# There are 6 input key in the CwLnx hardware that generate characters
-# from 'A' to 'F'.
-#
-# The following it the built-in default mapping hardcoded in the driver.
-# You can leave those unchanged if you have a standard keypad.
-# You can change it if you want to report other keystrings or have a non
-# standard keypad.
-# KeyMap_A=Up
-# KeyMap_B=Down
-# KeyMap_C=Left
-# KeyMap_D=Right
-# KeyMap_E=Enter
-# KeyMap_F=Escape
-
-
-
-## Wirz SLI LCD driver ##
-[sli]
-
-# Select the output device to use [default: /dev/lcd]
-Device=/dev/lcd
-
-# Set the communication speed [default: 19200; legal: 1200, 2400, 9600, 19200, 38400, 57600, 115200]
-Speed=19200
-
-
-
-## OnScreen Display using libxosd ##
-[xosd]
-
-# set display size [default: 20x4]
-Size=20x4
-
-# font to use
-Font=-*-terminus-*-r-*-*-*-320-*-*-*-*-*
-
-# EOF
diff --git a/abs/mv-core/MythVantage-config/templates/LCD/antec_fusion/lircd.conf b/abs/mv-core/MythVantage-config/templates/LCD/antec_fusion/lircd.conf
deleted file mode 100644
index ce64936..0000000
--- a/abs/mv-core/MythVantage-config/templates/LCD/antec_fusion/lircd.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-
-# Please make this file available to others
-# by sending it to <lirc@bartelmus.de>
-#
-# this config file was automatically generated
-# using lirc-0.8.1(default) on Thu Sep  6 09:06:50 2007
-#
-# contributed by 
-#
-# brand:                       /tmp/out
-# model no. of remote control: 
-# devices being controlled by this remote:
-#
-
-begin remote
-
-  name  Antec_fusion_silver_v1
-  bits           16
-  eps            30
-  aeps          100
-
-  one             0     0
-  zero            0     0
-  post_data_bits  16
-  post_data      0xFF
-  gap          131985
-  min_repeat      6
-  toggle_bit      0
-
-
-      begin codes
-          CW                       0x0001
-          CCW                      0x0100
-      end codes
-
-end remote
-
-
diff --git a/abs/mv-core/MythVantage-config/templates/LCD/antec_fusion/lircrc b/abs/mv-core/MythVantage-config/templates/LCD/antec_fusion/lircrc
deleted file mode 100644
index 7a39704..0000000
--- a/abs/mv-core/MythVantage-config/templates/LCD/antec_fusion/lircrc
+++ /dev/null
@@ -1,15 +0,0 @@
-begin
-  remote =   Antec_fusion_silver_v1
-  prog = mythtv
-  button = CW
-  repeat = 1
-  config = ]
-end
- 
-begin
-  remote =   Antec_fusion_silver_v1
-  prog = mythtv
-  button = CCW
-  repeat = 1
-  config = [
-end
diff --git a/abs/mv-core/MythVantage-config/templates/LCD/antec_fusion/modules b/abs/mv-core/MythVantage-config/templates/LCD/antec_fusion/modules
deleted file mode 100644
index cd576c3..0000000
--- a/abs/mv-core/MythVantage-config/templates/LCD/antec_fusion/modules
+++ /dev/null
@@ -1 +0,0 @@
-lirc_imon	#LCD
diff --git a/abs/mv-core/MythVantage-config/templates/LCD/xosd/LCDd.conf b/abs/mv-core/MythVantage-config/templates/LCD/xosd/LCDd.conf
deleted file mode 100644
index 5b37bd7..0000000
--- a/abs/mv-core/MythVantage-config/templates/LCD/xosd/LCDd.conf
+++ /dev/null
@@ -1,957 +0,0 @@
-# LCDd.conf -- configuration file for the LCDproc server daemon LCDd
-#
-# This file contains the configuration for the LCDd server.
-# 
-# The format is ini-file-like. It is divided into sections that start at
-# markers that look like [section]. Comments are all line-based comments,
-# and are lines that start with '#' or ';'.
-#
-# The server has a 'central' section named [server]. For the menu there is
-# a section called [menu]. Further each driver has a section which
-# defines how the driver acts.
-#
-# The drivers are activated by specifiying them in a driver= line in the
-# server section, like:
-#
-#   Driver=curses
-#
-# This tells LCDd to use the curses driver.
-# The first driver that is loaded and is capable of output defines the
-# size of the display. The default driver to use is curses.
-# If the driver is specified using the -d <driver> command line option,
-# the Driver= options in the config file are ignored.
-#
-# The drivers read their own options from the respective sections.
-
-
-
-## Server section with all kinds of settings for the LCDd server ##
-[server]
-
-# Tells the server to load the given drivers. Multiple lines can be given.
-# The name of the driver is case sensitive and determines the section
-# where to look for further configuration options of the specific driver
-# as well as the name of the dynamic driver module to load at runtime.
-# The latter one can be changed by giving af File= directive in the
-# driver specific section.
-#
-# The following drivers are supported:
-#   bayrad, CFontz, CFontz633, CFontzPacket, curses, CwLnx, ea65, 
-#   EyeboxOne, g15, glcdlib, glk, hd44780, icp_a106, imon, IOWarrior,
-#   irman, joy, lb216, lcdm001, lcterm, lirc, MD8800, ms6931, mtc_s16209x,
-#   MtxOrb, NoritakeVFD, picolcd, pyramid, sed1330, sed1520, serialPOS,
-#   serialVFD, sli, stv5730, svga, t6963, text, tyan, ula200, xosd
-Driver=xosd
-
-# Tells the driver to bind to the given interface
-Bind=127.0.0.1
-
-# Listen on this specified port; defaults to 13666.
-Port=13666
-
-# Sets the reporting level; defaults to 2 (warnings and errors only).
-ReportLevel=3
-
-# Should we report to syslog instead of stderr ? Default: no
-#ReportToSyslog=yes
-
-# Sets the default time in seconds to displays a screen.
-WaitTime=5
-
-# User to run as.  LCDd will drop its root priviledges,
-# if any, and run as this user instead.
-User=nobody
-
-# If yes, the the serverscreen will be rotated as a usual info screen. If no,
-# it will be a background screen, only visible when no other screens are
-# active.
-#ServerScreen=no
-
-# The server will stay in the foreground if set to true.
-#Foreground=no
-
-# Where can we find the driver modules ?
-# IMPORTANT: Make sure to change this setting to reflect your
-#            specific setup! Otherwise LCDd won't be able to find
-#            the driver modules and will thus not be able to
-#            function properly.
-# NOTE: Always place a slash as last character !
-DriverPath=/usr/lib/lcdproc/
-
-# GoodBye message: each entry represents a display line; default: builtin
-#GoodBye="Thanks for using"
-#GoodBye="   LCDproc!"
-
-# The "...Key=" lines define what the server does with keypresses that
-# don't go to any client.
-# These are the defaults:
-ToggleRotateKey=Enter
-PrevScreenKey=Left
-NextScreenKey=Right
-#ScrollUpKey=Up
-#ScrollDownKey=Down
-
-# If you have only 4 keys, you can choose to use this:
-#ToggleRotateKey=Enter
-#PrevScreenKey=Up
-#NextScreenKey=Down
-
-# If you have only 3 keys, you can choose to use this:
-#ToggleRotateKey=Enter
-#PrevScreenKey=Up
-
-
-
-## The menu section. The menu is an internal LCDproc client. ##
-[menu]
-# You can configure what keys the menu should use. Note that the MenuKey
-# will be reserved exclusively, the others work in shared mode.
-
-# The following works excellent with 4 keys or more.
-MenuKey=Escape
-EnterKey=Enter
-UpKey=Up
-DownKey=Down
-# If you have 6 keys you may define these as well
-#LeftKey=Left
-#RightKey=Right
-
-# If you have only 3 keys, you could use something like this:
-#MenuKey=Escape
-#EnterKey=Enter
-#DownKey=Down
-
-
-
-### Driver sections are below this line, in alphabetical order  ###
-
-
-## EMAC BayRAD driver ##
-[bayrad]
-
-# Select the output device to use [default: /dev/lcd]
-Device=/dev/lcd
-
-# Set the communication speed [default: 9600; legal:  1200, 2400, 9600, 19200]
-Speed=9600
-
-
-
-## CrystalFontz driver (for CF632 & CF634) ##
-[CFontz]
-
-# Select the output device to use [default: /dev/lcd]
-Device=/dev/ttyS0
-# Select the LCD size [default: 20x4]
-Size=20x4
-# Set the initial contrast [default: 560; legal: 0 - 1000]
-Contrast=350
-# Set the initial brightness [default: 1000; legal: 0 - 1000]
-Brightness=1000
-# Set the initial off-brightness [default: 0; legal: 0 - 1000]
-# This value is used when the display is normally
-# switched off in case LCDd is inactive
-OffBrightness=0
-# Set the communication speed [default: 9600; legal: 1200, 2400, 9600, 19200 or 115200]
-Speed=9600
-# Set the firmware version (New means >= 2.0) [default: no; legal: yes, no]
-NewFirmware=no
-# Reinitialize the LCD's BIOS [default: no; legal: yes, no]
-# normally you shouldn't need this
-Reboot=no
-
-
-
-## CrystalFontz633 driver (for CF633 only) ##
-[CFontz633]
-
-# Select the output device to use [default: /dev/lcd]
-Device=/dev/ttyS0
-# Select the LCD type (size) [default: 16x2]
-Size=16x2
-# Set the initial contrast [default: 560; legal: 0 - 1000]
-Contrast=350
-# Set the initial brightness [default: 1000; legal: 0 - 1000]
-Brightness=1000
-# Set the initial off-brightness [default: 0; legal: 0 - 1000]
-# This value is used when the display is normally
-# switched off in case LCDd is inactive
-OffBrightness=50
-# Set the communication speed [default: 9600; legal: 1200, 2400, 9600, 19200, 115200]
-Speed=19200
-# Set the firmware version (New means >= 2.0) [default: no; legal: yes, no]
-# Currently this flag is not in use, there is no such thing as NewFirmware. ;=)
-#NewFirmware=no
-# Reinitialize the LCD's BIOS [default: no; legal: yes, no]
-# I want to reboot the LCD to make sure we start from a known state
-Reboot=yes
-
-
-
-## CrystalFontz packet driver (for CF631, CF633 & CF635) ##
-[CFontzPacket]
-
-# Select the LCD model [default: 633; legal: 631, 633, 635]
-Model=635
-# Select the output device to use [default: /dev/lcd]
-Device=/dev/ttyUSB0
-# Select the LCD size [default: depending on model: 635: 20x4, 631: 20x2, 633: 16x2]
-Size=20x4
-# Set the initial contrast [default: 560; legal: 0 - 1000]
-Contrast=350
-# Set the initial brightness [default: 1000; legal: 0 - 1000]
-Brightness=1000
-# Set the initial off-brightness [default: 0; legal: 0 - 1000]
-# This value is used when the display is normally
-# switched off in case LCDd is inactive
-OffBrightness=50
-# Set the communication speed [default: 9600; legal: 1200, 2400, 9600, 19200, 115200]
-Speed=115200
-# Set the firmware version (New means >= 2.0) [default: no; legal: yes, no]
-# Currently this flag is not in use, there is no such thing as NewFirmware. ;=)
-#NewFirmware=no
-# Reinitialize the LCD's BIOS [default: no; legal: yes, no]
-# I want to reboot the LCD to make sure we start from a known state
-Reboot=yes
-
-
-
-## Curses driver ##
-[curses]
-
-# color settings
-# foreground color [default: blue]
-Foreground=blue
-# background color when "backlight" is off [default: cyan]
-Background=cyan
-# background color when "backlight" is on [default: red]
-Backlight=red
-
-# display size [default: 20x4]
-Size=20x4
-
-# What position (X,Y) to start the left top corner at...
-# Default: (7,7)
-TopLeftX=7
-TopLeftY=7
-
-# use ASC symbols for icons & bars [default: no; legal, yes, no]
-UseACS=no
-
-
-
-## Cwlinux driver ##
-[CwLnx]
-
-# Select the LCD model [default: 12232; legal: 12232, 1602]
-Model=12232
-
-# Select the output device to use [default: /dev/lcd]
-Device=/dev/ttyUSB0
-
-# Select the LCD size [default: depending on model: 12232: 20x4, 1602: 16x2]
-Size=20x4
-
-# Set the communication speed [default: 19200; legal: 9600, 19200]
-Speed=19200
-
-# Reinitialize the LCD's BIOS [default: no; legal: yes, no]
-# normally you shouldn't need this
-Reboot=no
-
-# If you have a keypad connected. Keypad layout is currently not
-# configureable from the config file.
-Keypad=yes
-
-# If you have a non-standard keypad you can associate any keystrings to keys.
-# There are 6 input keys in the CwLnx hardware that generate characters
-# from 'A' to 'F'.
-#
-# The following is the built-in default mapping hardcoded in the driver.
-# You can leave those unchanged if you have a standard keypad.
-# You can change it if you want to report other keystrings or have a non
-# standard keypad.
-# KeyMap_A=Up
-# KeyMap_B=Down
-# KeyMap_C=Left
-# KeyMap_D=Right
-# KeyMap_E=Enter
-# KeyMap_F=Escape
-
-# keypad_test_mode permits to test keypad assignement
-# Default value is no
-#keypad_test_mode=yes
-
-
-
-## ea65 driver for the display in AOpen XC Cube AV EA65 media barebones ##
-[ea65]
-
-# Device is fixed /dev/ttyS1
-# Width and Height are fixed 9x1
-
-# As the VFD is self luminescent we don't have a backlight
-# But we can use the backlight functions to control the front LEDs
-# Brightness 0 to 299 -> LEDs off
-# Brightness 300 to 699 -> LEDs half bright
-# Brightness 700 to 1000 -> LEDs full bright
-Brightness=500
-# OffBrightness is the the value used for the 'backlight off' state
-OffBrightness=0
-
-
-
-## EyeboxOne driver ##
-[EyeboxOne]
-
-# Select the output device to use [default: /dev/ttyS1]
-#Device=/dev/cua01
-Device=/dev/ttyS1
-
-# Set the display size [default: 20x4]
-Size=20x4
-
-# Switch on the backlight? [default: yes]
-Backlight=yes
-
-# Switch on the cursor? [default: no]
-Cursor=no
-
-# Set the communication speed [default: 19200; legal: 1200, 2400, 9600, 19200]
-Speed=19200
-
-# Enter Key is a \r character, so it's hardcoded in the driver
-LeftKey=D
-RightKey=C
-UpKey=A
-DownKey=B
-EscapeKey=P
-
-# You can find out which key of your display sends which
-# character by setting keypad_test_mode to yes and running
-# LCDd. LCDd will output all characters it receives.
-# Afterwards you can modify the settings above and set
-# keypad_set_mode to no again.
-keypad_test_mode=no
-
-
-
-## g15 driver for Logitech G15 Keyboard LCDs ##
-[g15]
-
-# Display size (currently unused)
-size=20x5
-
-## glcdlib meta driver for graphical LCDs ##
-[glcdlib]
-
-## mandatory:
-
-# which graphical display supported by graphlcd-base to use [default: image]
-# (see /etc/graphlcd.conf for possible drivers)
-Driver=noritake800
-
-# no=use graphlcd bitmap fonts (they have only one size / font file)
-# yes=use fonts supported by FreeType2 (needs Freetype2 support in libglcdprocdriver and its dependants)
-UseFT2=yes
-
-# text resolution in fixed width characters [default: 16x4]
-# (if it won't fit according to available physical pixel resolutioni
-# and the minimum available font face size in pixels, then 
-# 'DebugBorder' will automatically be turned on)
-TextResolution=20x4
-
-# path to font file to use
-FontFile=/usr/share/fonts/corefonts/courbd.ttf
-
-## these only apply if UseFT2=yes:
-
-# character encoding to use
-CharEncoding=iso8859-2
-
-# minumum size in pixels in which fonts should be rendered
-MinFontFaceSize=7x12
-
-## optional:
-Brightness=50                   # Brightness (in %) if applicable
-Contrast=50                     # Contrast (in %) if applicable
-Backlight=no                    # Backlight if applicable
-UpsideDown=no                   # flip image upside down
-Invert=no                       # invert light/dark pixels
-ShowDebugFrame=no               # turns on/off 1 pixel thick debugging
-                                # border whithin the usable text area,
-                                # for setting up TextResolution and
-                                # MinFontFaceSize (if using FT2);
-ShowBigBorder=no                # border around the unused area
-ShowThinBorder=yes              # border around the unused area
-PixelShiftX=0
-PixelShiftY=2
-
-
-
-## Matrix Orbital GLK driver ##
-[glk]
-
-# select the serial device to use [default: /dev/lcd]
-Device=/dev/lcd
-
-# set the initial contrast value [default: 560; legal: 0 - 1000]
-Contrast=560
-
-# set the serial port speed [default: 19200; legal: 9600, 19200, 38400]
-Speed=19200
-
-
-
-## Hitachi HD44780 driver ##
-[hd44780]
-
-# Select what type of connection. See documentation for types.
-ConnectionType=4bit
-
-# Port where the LPT is. Usual values are 0x278, 0x378 and 0x3BC
-Port=0x378
-
-# Device of the serial interface (default is /dev/lcd)
-Device=/dev/ttyS0
-
-# Bitrate of the serial port (0 for interface default)
-Speed=0
-
-# If you have a keypad connected.
-# You may also need to configure the keypad layout further on in this file.
-Keypad=no
-
-# set the initial contrast (for bwctusb only) [default: 0; legal: 0 - 1000]
-Contrast=0
-
-# If you have a switchable backlight.
-Backlight=no
-
-# If you have the additional output port ("bargraph") and you want to
-# be able to control it with the lcdproc OUTPUT command
-OutputPort=no
-
-# Specifies if the last line is pixel addressable or it controls an
-# underline effect. [default: true (= pixel addressable); legal: yes, no]
-#Lastline=true
-
-# Specifies the size of the LCD.
-# In case of multiple combined displays, this should be the total size.
-Size=20x4
-
-# For multiple combined displays: how many lines does each display have.
-# Vspan=2,2 means both displays have 2 lines.
-#vspan=2,2
-
-# If you have an HD66712, a KS0073 or an other 'almost HD44780-compatible',
-# set this flag to get into extended mode (4-line linear).
-# This flag is NOT the old obsolete Extended option.
-#ExtendedMode=yes
-
-# Character map to to map ISO-8859-1 to the LCD's character set
-# [default: hd44780_default; legal: hd44780_default, ea_ks0073, sed1278f_0b ]
-Charmap=hd44780_default
-
-# If your display is slow and cannot keep up with the flow of data from
-# LCDd, garbage can appear on the LCDd. Set this delay factor to 2 or 4
-# to increase the delays. Default: 1.
-#DelayMult=2
-
-# Some displays (e.g. vdr-wakeup) need a message from the driver to that it
-# is still alive. When set to a value bigger then null the character in the
-# upper left corner is updated every <KeepAliveDisplay> seconds. Default: 0.
-#KeepAliveDisplay=0
-
-# If you experience occasional garbage on your display you can use this
-# option as workaround. If set to a value bigger than null it forces a
-# full screen refresh <RefreshDiplay> seconds. Default: 0.
-#RefreshDisplay=5
-
-# You can reduce the inserted delays by setting this to false.
-# On fast PCs it is possible your LCD does not respond correctly.
-# Default: true.
-DelayBus=true
-
-# If you have a keypad you can assign keystrings to the keys.
-# See documentation for used terms and how to wire it.
-# For example to give directly connected key 4 the string "Enter", use:
-#   KeyDirect_4=Enter
-# For matrix keys use the X and Y coordinates of the key:
-#   KeyMatrix_1_3=Enter
-KeyMatrix_4_1=Enter
-KeyMatrix_4_2=Up
-KeyMatrix_4_3=Down
-KeyMatrix_4_4=Escape
-
-
-
-## ICP A106 driver ##
-[icp_a106]
-Device=/dev/ttyS1
-
-
-
-## Code Mercenaries IO-Warrior driver ##
-[IOWarrior]
-
-# display dimensions
-Size=20x4
-
-# serial number [exactly as listed by usbview]
-# (if not given, the 1st IOWarrior found gets used)
-#SerialNumber=00000674
-
-# Specifies if the last line is pixel addressable or it controls an
-# underline effect. [default: true (= pixel addressable); legal: yes, no]
-#Lastline=true
-
-
-
-## Soundgraph/Ahanix/Silverstone/Uneed/Accent iMON driver ##
-[imon]
-
-# select the device to use
-Device=/dev/lcd0
-
-# display dimensions
-Size=16x2
-
-
-
-## IrMan driver ##
-[IrMan]
-#if in trouble with IrMan, try Lirc emulator for IrMan
-
-# Select the input device to use
-#Device=/dev/irman
-
-# Select the configuration file to use
-#Config=/etc/irman.cfg
-
-
-
-## Joystick driver ##
-[joy]
-
-# Select the input device to use [default: /dev/js0]
-Device=/dev/js0
-
-# set the axis map
-Map_Axis1neg=Left
-Map_Axis1pos=Right
-Map_Axis2neg=Up
-Map_Axis2pos=Down
-
-# set the button map
-Map_Button1=Enter
-Map_Button2=Escape
-
-
-
-## LB216 driver ##
-[lb216]
-
-# Select the output device to use [default: /dev/lcd]
-Device=/dev/lcd
-
-# Set the initial brightness [default: 255; legal: 0 - 255]
-Brightness=255
-
-# Set the communication speed [default: 9600; legal: 2400, 9600]
-Speed=9600
-
-# Reinitialize the LCD's BIOS [default: no; legal: yes, no]
-Reboot=no
-
-
-
-## LCDM001 driver ##
-[lcdm001]
-
-Device=/dev/ttyS1
-
-# keypad settings
-# Keyname      Function
-#              Normal context              Menu context
-# -------      --------------              ------------
-# PauseKey     Pause/Continue              Enter/select
-# BackKey      Back(Go to previous screen) Up/Left
-# ForwardKey   Forward(Go to next screen)  Down/Right
-# MainMenuKey  Open main menu              Exit/Cancel
-PauseKey=LeftKey
-BackKey=UpKey
-ForwardKey=DownKey
-MainMenuKey=RightKey
-
-# You can rearrange the settings here.
-# If your device is broken, have a look at /usr/lib/lcdproc/lcdm001.h
-
-
-
-## HNE LCTerm driver ##
-[lcterm]
-Device=/dev/ttyS1
-Size=16x2
-
-
-
-## LIRC input driver ##
-[lirc]
-
-# Specify an alternative location of the lircrc file [default: ~/.lircrc]
-#lircrc=/etc/lircrc.lcdproc
-
-# Must be the same as in your lircrc
-#prog=lcdd
-
-
-
-##The driver for the VFD of the Medion MD8800 PC ##
-[MD8800]
-# device to use [default: /dev/ttyS1]
-#Device=/dev/ttyS1
-
-# display size [default: 16x2]
-#Size=16x2
-
-# Set the initial brightness [default: 1000; legal: 0 - 1000]
-Brightness=1000
-# Set the initial off-brightness [default: 0; legal: 0 - 1000]
-# This value is used when the display is normally
-# switched off in case LCDd is inactive
-OffBrightness=50
-
-
-
-## MSI MS-6931 driver for displays in 1HU servers ##
-[ms6931]
-
-# device to use [default: /dev/ttyS1]
-Device=/dev/ttyS1
-
-# display size [default: 16x2]
-#Size=16x2
-
-
-
-## MTC-S16209x driver ##
-[mtc_s16209x]
-
-# Select the output device to use [default: /dev/lcd]
-Device=/dev/lcd
-
-# Set the initial brightness [default: 255; legal: 0 - 255]
-Brightness=255
-
-# Reinitialize the LCD's BIOS [default: no; legal: yes, no]
-Reboot=no
-
-
-
-## Matrix Orbital driver ##
-[MtxOrb]
-
-# Select the output device to use [default: /dev/lcd]
-Device=/dev/ttyS0
-
-# Set the display size [default: 20x4]
-Size=20x4
-
-# Set the display type [default: lcd; legal: lcd, lkd, vfd, vkd]
-Type=lkd
-
-# Set the initial contrast [default: 480]
-# NOTE: The driver will ignore this if the display
-#       is a vfd or vkd as they don't have this feature
-Contrast=480
-
-# Set the initial brightness [default: 1000; legal: 0 - 1000]
-Brightness=1000
-# Set the initial off-brightness [default: 0; legal: 0 - 1000]
-# This value is used when the display is normally
-# switched off in case LCDd is inactive
-OffBrightness=0
-
-# Set the communication speed [default: 19200; legal: 1200, 2400, 9600, 19200]
-Speed=19200
-
-# The following table translates from MtxOrb key letters to logical key names.
-# By default no keys are mapped, meaning the keypad is not used at all.
-#KeyMap_A=Left
-#KeyMap_B=Right
-#KeyMap_C=Up
-#KeyMap_D=Down
-#KeyMap_E=Enter
-#KeyMap_F=Escape
-# See the [menu] section for an explanation of the key mappings
-
-# You can find out which key of your display sends which
-# character by setting keypad_test_mode to yes and running
-# LCDd. LCDd will output all characters it receives.
-# Afterwards you can modify the settings above and set
-# keypad_set_mode to no again.
-keypad_test_mode=no
-
-
-
-## Noritake VFD driver ##
-[NoritakeVFD]
-# device where the VFD is. Usual values are /dev/ttyS0 and /dev/ttyS1 [default: /dev/lcd]
-Device=/dev/ttyS0
-
-# Specifies the size of the LCD.
-Size=20x4
-
-# set the brightness
-Brightness=255
-
-# set the serial port speed [default: 9600, legal: 1200, 2400, 9600, 19200, 115200]
-Speed=9600
-
-# re-initialize VFD ?
-#Reboot=yes
-
-
-
-## Mini-box.com picoLCD (usblcd) driver ##
-[picolcd]
-# This is for the Mini-Box.com usblcd device that ships with the M300.  It can 
-# also be purchased separately but this driver has only been tested on the M300 
-# setup.
-
-# KeyTimeout is the time that LCDd spends waiting for a key press before cycling 
-# through other duties.  Higher values make LCDd use less CPU time and make 
-# key presses more detectable.  Lower values make LCDd more responsive but a 
-# little prone to missing key presses.  500 (.5 second) is the default and a
-# balanced value.
-KeyTimeout=500
-
-# Contrast: [default: 1000; legal: 0 - 1000]
-Contrast=1000
-
-# Light the keys? i[default: on; legal: on, off]
-Keylights=on
-
-# If Keylights is on, the you can unlight specific keys below:
-# Key0 is the directional pad.  Key1 - Key5 correspond to the F1 - F5 keys.  
-# There is no LED for the +/- keys.  This is a handy way to indicate to users 
-# which keys are disabled.  [default: on; legal: on, off]
-Key0Light=on
-Key1Light=on
-Key2Light=on
-Key3Light=on
-Key4Light=on
-Key5Light=on
-
-
-
-## Pyramid LCD driver ##
-[pyramid]
-
-# device to connect to [default: /dev/lcd]
-Device=/dev/ttyUSB0
-
-
-
-## Seiko Epson 1330 driver ##
-[sed1330]
-
-# Port where the LPT is. Common values are 0x278, 0x378 and 0x3BC
-Port=0x378
-
-# Type of LCD module (legal: G321D, G121C, G242C, G191D, G2446, SP14Q002)
-# Note: Currently only tested with G321D & SP14Q002.
-Type=G321D
-
-# Width x Height of a character cell in pixels [legal: 6x7 - 8x16; default: 6x10]
-CellSize=6x10
-
-# Select what type of connection [legal: classic, bitshaker; default: classic]
-ConnectionType=classic
-
-
-## Seiko Epson 1520 driver ##
-[sed1520]
-
-# Port where the LPT is. Usual values are 0x278, 0x378 and 0x3BC
-Port=0x378
-
-
-
-## serial POS display driver ##
-[serialPOS]
-
-# Device to use in serial modea [default: /dev/lcd]
-Device=/dev/lcd
-
-# Specifies the size of the display in characters. [default: 16x2]
-Size=16x2
-
-# Set the communication protocol to use with the POS display.
-# [default: AEDEX; legal: IEE, Epson, Emax, IBM, LogicControls, Ultimate]
-Type=AEDEX
-
-# communication baud rate with the display [default: 9600; legal: 1200, 2400, 19200, 115200]
-Speed=9600
-
-
-
-## Serial VFD driver ##
-## Drives various (see below) serial 5x7dot VFD's.  ##
-[serialVFD]
-
-# Specifies the displaytype.[default: 0]
-# 0 NEC (FIPC8367 based) VFDs.
-# 1 KD Rev 2.1.
-# 2 Noritake VFDs (*).
-# 3 Futaba VFDs
-# (* most should work, not testet yet.)
-Type=0
-
-# "no" if display connected serial, "yes" if connected parallel. [default: no(=serial)]
-use_parallel=no
-
-# Number of Custom-Characters [default: displaytype dependent]
-#Custom-Characters=0
-
-# Portaddress where the LPT is. Used in parallelmode only. Usual values are 0x278, 0x378 and 0x3BC
-Port=0x378
-
-# Device to use in serial mode. Usual values are /dev/ttyS0 and /dev/ttyS1
-Device=/dev/ttyS1
-
-# Specifies the size of the VFD.
-Size=20x2
-
-# Set the initial brightness [default: 1000; legal: 0 - 1000]
-# (4 steps 0-250, 251-500, 501-750, 751-1000)
-Brightness=1000
-# Set the initial off-brightness [default: 0; legal: 0 - 1000]
-# This value is used when the display is normally
-# switched off in case LCDd is inactive
-# (4 steps 0-250, 251-500, 501-750, 751-1000)
-OffBrightness=0
-
-# set the serial port speed [default: 9600; legal: 1200, 2400, 9600, 19200, 115200]
-Speed=9600
-
-# enable ISO 8859 1 compatibility [default: yes; legal: yes, no]
-#ISO_8859_1=yes
-
-
-
-## stv5730 driver ##
-[stv5730]
-
-# Port the device is connected to [default: 0x378]
-Port=0x378
-
-
-
-## SVGAlib driver ##
-[svga]
-
-# svgalib mode to use [default: G320x240x256; legal: supported svgalib modes]
-#Mode=G640x480x256
-
-# set display size [default: 20x4]
-Size=20x4
-
-# Set the initial contrast [default: 500; legal: 0 - 1000]
-# Can be set but does not change anything internally
-Contrast=500
-
-# Set the initial brightness [default: 1000; legal: 1 - 1000]
-Brightness=1000
-
-# Set the initial off-brightness [default: 500; legal: 1 - 1000]
-# This value is used when the display is normally
-# switched off in case LCDd is inactive
-OffBrightness=500
-
-
-
-## Text driver ##
-[text]
-# Set the display size [default: 20x4]
-Size=20x4
-
-
-
-## Toshiba T6963 driver ##
-[t6963]
-
-# set display size [default: 20x6]
-Size=20x6
-
-# port to use [default: 0x378; legal: 0x200 - 0x400]
-Port=0x378
-
-# Is ECP mode on? [default: yes; legal: yes, no]
-#ECPlpt=yes
-
-# Use graphics? [default: no; legal: yes, no]
-#graphic=no
-
-
-
-## Tyan Barebones LCD driver (GS10 & GS12 series) ##
-[tyan]
-
-# Select the output device to use [default: /dev/lcd]
-Device=/dev/lcd
-
-# Set the communication speed [default: 9600; legal: 4800, 9600]
-Speed=9600
-
-# set display size [default: 16x2]
-Size=16x2
-
-
-
-## ELV ula200 driver ##
-[ula200]
-
-# Select the LCD size [default: 20x4]
-Size=20x4
-
-# If you have a non standard keypad you can associate any keystrings to keys.
-# There are 6 input key in the CwLnx hardware that generate characters
-# from 'A' to 'F'.
-#
-# The following it the built-in default mapping hardcoded in the driver.
-# You can leave those unchanged if you have a standard keypad.
-# You can change it if you want to report other keystrings or have a non
-# standard keypad.
-# KeyMap_A=Up
-# KeyMap_B=Down
-# KeyMap_C=Left
-# KeyMap_D=Right
-# KeyMap_E=Enter
-# KeyMap_F=Escape
-
-
-
-## Wirz SLI LCD driver ##
-[sli]
-
-# Select the output device to use [default: /dev/lcd]
-Device=/dev/lcd
-
-# Set the communication speed [default: 19200; legal: 1200, 2400, 9600, 19200, 38400, 57600, 115200]
-Speed=19200
-
-
-
-## OnScreen Display using libxosd ##
-[xosd]
-
-# set display size [default: 20x4]
-Size=20x4
-
-# font to use, in XLFD format, as given by "xfontsel"
-Font=-*-clean-*-*-*-*-*-160-*-*-*-*-*-*
-
-
-# EOF
diff --git a/abs/mv-core/MythVantage-config/templates/audio/space_battle_A.wav b/abs/mv-core/MythVantage-config/templates/audio/space_battle_A.wav
deleted file mode 100644
index 3f1dd1c..0000000
--- a/abs/mv-core/MythVantage-config/templates/audio/space_battle_A.wav
+++ /dev/null
diff --git a/abs/mv-core/MythVantage-config/templates/cc.orig.sh b/abs/mv-core/MythVantage-config/templates/cc.orig.sh
deleted file mode 100755
index d8fd2dc..0000000
--- a/abs/mv-core/MythVantage-config/templates/cc.orig.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/perl
-# rwraithr added segment for 4 digit channels
-# make sure to set this string to
-# the corresponding remote in /etc/remoted.conf
-#$remote_name = "RC-u43c-1h";
-$remote_name = "$REMOTE_NAME";
-
-sub change_channel {
-        my($channel_digit) = @_;
-        system ("/usr/bin/irsend SEND_ONCE $remote_name $channel_digit");
-        sleep .5;
-}
-
-$channel=$ARGV[0];
-sleep 1;
-if (length($channel) > 3) {
-        change_channel(substr($channel,0,1));
-        change_channel(substr($channel,1,1));
-        change_channel(substr($channel,2,1));
-        change_channel(substr($channel,3,1));
-} elsif (length($channel) > 2) {
-        change_channel(substr($channel,0,1));
-        change_channel(substr($channel,1,1));
-        change_channel(substr($channel,2,1));
-} elsif (length($channel) > 1) {
-        change_channel(substr($channel,0,1));
-        change_channel(substr($channel,1,1));
-} else {
-        change_channel(substr($channel,0,1));
-}
-system ("/usr/bin/irsend SEND_ONCE $remote_name SELECT");
-
-#system ("sleep 2");
-#system ("/usr/bin/ivtvctl -p 2 -d /dev/video2");
-#system ("/usr/bin/ivtvctl -p 1 -d /dev/video2");
diff --git a/abs/mv-core/MythVantage-config/templates/cc.sh b/abs/mv-core/MythVantage-config/templates/cc.sh
deleted file mode 100755
index 0cce308..0000000
--- a/abs/mv-core/MythVantage-config/templates/cc.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-/usr/local/bin/cc.orig.sh $@  &
-/usr/local/bin/cc_vol.sh &
-
-
diff --git a/abs/mv-core/MythVantage-config/templates/cc_vol.sh b/abs/mv-core/MythVantage-config/templates/cc_vol.sh
deleted file mode 100755
index 819008d..0000000
--- a/abs/mv-core/MythVantage-config/templates/cc_vol.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-sleep 2
-/usr/local/bin/ivtvctl -p 2 -d /dev/video2
-/usr/local/bin/ivtvctl -p 1 -d /dev/video2
-
diff --git a/abs/mv-core/MythVantage-config/templates/change_chan.sh b/abs/mv-core/MythVantage-config/templates/change_chan.sh
deleted file mode 100755
index 5ad8765..0000000
--- a/abs/mv-core/MythVantage-config/templates/change_chan.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-REMOTE_NAME=SA3250
-cmd="$1"
-
-case $cmd in
-	    [0-9]*)
-	        for digit in $(echo $1 | sed -e 's/./& /g'); do 
-		        irsend SEND_ONCE $REMOTE_NAME $digit
-		        sleep  0.3
-	        # If things work OK with sleep 1, try this for faster channel changes:
-	        # sleep 0.3
-	    done
-	        ;;
-
-	   *)
-	           irsend SEND_ONCE $REMOTE_NAME $cmd
-									            ;;
-    esac
-#    /usr/bin/fix_audio.sh &
diff --git a/abs/mv-core/MythVantage-config/templates/cron.template b/abs/mv-core/MythVantage-config/templates/cron.template
deleted file mode 100644
index 3fcea10..0000000
--- a/abs/mv-core/MythVantage-config/templates/cron.template
+++ /dev/null
@@ -1,4 +0,0 @@
-# <minute> <hour> <day> <month> <dow> <command>
-
-
-00 HOUR * * *  /usr/bin/sudo /sbin/halt-runit >/dev/null 2>&1
\ No newline at end of file
diff --git a/abs/mv-core/MythVantage-config/templates/etcnet/eth/ipv4address b/abs/mv-core/MythVantage-config/templates/etcnet/eth/ipv4address
deleted file mode 100644
index 1df28d2..0000000
--- a/abs/mv-core/MythVantage-config/templates/etcnet/eth/ipv4address
+++ /dev/null
@@ -1,2 +0,0 @@
-192.168.1.158/24
-
diff --git a/abs/mv-core/MythVantage-config/templates/etcnet/eth/ipv4route b/abs/mv-core/MythVantage-config/templates/etcnet/eth/ipv4route
deleted file mode 100644
index 373a4d1..0000000
--- a/abs/mv-core/MythVantage-config/templates/etcnet/eth/ipv4route
+++ /dev/null
@@ -1,2 +0,0 @@
-default via 192.168.1.1 
-
diff --git a/abs/mv-core/MythVantage-config/templates/etcnet/eth/iwconfig b/abs/mv-core/MythVantage-config/templates/etcnet/eth/iwconfig
deleted file mode 100644
index b1f14e0..0000000
--- a/abs/mv-core/MythVantage-config/templates/etcnet/eth/iwconfig
+++ /dev/null
@@ -1,2 +0,0 @@
-essid home_lan
-#key ababababab
diff --git a/abs/mv-core/MythVantage-config/templates/etcnet/eth/options b/abs/mv-core/MythVantage-config/templates/etcnet/eth/options
deleted file mode 100644
index 929da58..0000000
--- a/abs/mv-core/MythVantage-config/templates/etcnet/eth/options
+++ /dev/null
@@ -1,7 +0,0 @@
-# If you want to change current interface name, edit /etc/net/iftab,
-# rename current directory and uncomment this line:
-TYPE=eth
-DISABLED=no
-BOOTPROTO=dhcp
-ONBOOT=yes
-CONFIG_WIRELESS=no
diff --git a/abs/mv-core/MythVantage-config/templates/evrouter/MythVantage-4 b/abs/mv-core/MythVantage-config/templates/evrouter/MythVantage-4
deleted file mode 100644
index e69de29..0000000
--- a/abs/mv-core/MythVantage-config/templates/evrouter/MythVantage-4
+++ /dev/null
diff --git a/abs/mv-core/MythVantage-config/templates/evrouter/MythVantage-8 b/abs/mv-core/MythVantage-config/templates/evrouter/MythVantage-8
deleted file mode 100644
index e69de29..0000000
--- a/abs/mv-core/MythVantage-config/templates/evrouter/MythVantage-8
+++ /dev/null
diff --git a/abs/mv-core/MythVantage-config/templates/evrouter/MythVantage-Full b/abs/mv-core/MythVantage-config/templates/evrouter/MythVantage-Full
deleted file mode 100644
index e69de29..0000000
--- a/abs/mv-core/MythVantage-config/templates/evrouter/MythVantage-Full
+++ /dev/null
diff --git a/abs/mv-core/MythVantage-config/templates/evrouter/MythVantage8-minipac b/abs/mv-core/MythVantage-config/templates/evrouter/MythVantage8-minipac
deleted file mode 100644
index 0e3a708..0000000
--- a/abs/mv-core/MythVantage-config/templates/evrouter/MythVantage8-minipac
+++ /dev/null
@@ -1,3 +0,0 @@
-"Ultimarc Button/Joystick/Trackball Interface " "" none key/127 "Shell//usr/bin/restartfrontend.sh" 
-"Ultimarc Button/Joystick/Trackball Interface " "" none key/18 "Shell/eject"
-
diff --git a/abs/mv-core/MythVantage-config/templates/evrouter/MythVantage8-uhid b/abs/mv-core/MythVantage-config/templates/evrouter/MythVantage8-uhid
deleted file mode 100644
index 7cb2e34..0000000
--- a/abs/mv-core/MythVantage-config/templates/evrouter/MythVantage8-uhid
+++ /dev/null
@@ -1,3 +0,0 @@
-"Universal Human Interface Device Universal Human Interface Device" "" none key/125 "Shell//usr/bin/restartfrontend.sh" 
-"Universal Human Interface Device Universal Human Interface Device" "" none key/18 "Shell/eject"
-
diff --git a/abs/mv-core/MythVantage-config/templates/exports.template b/abs/mv-core/MythVantage-config/templates/exports.template
deleted file mode 100644
index b946287..0000000
--- a/abs/mv-core/MythVantage-config/templates/exports.template
+++ /dev/null
@@ -1,8 +0,0 @@
-# /etc/exports
-#
-# See exports(5) for a description.
-
-# use exportfs -arv to reread
-/data/media    REPLACEME(rw,all_squash,anonuid=1000,anongid=1000)
-/data/var/cache    REPLACEME(rw,all_squash,anonuid=1000,anongid=1000)
-
diff --git a/abs/mv-core/MythVantage-config/templates/fstab.conf.template b/abs/mv-core/MythVantage-config/templates/fstab.conf.template
deleted file mode 100755
index d27bcd9..0000000
--- a/abs/mv-core/MythVantage-config/templates/fstab.conf.template
+++ /dev/null
@@ -1,16 +0,0 @@
-# 
-# /etc/fstab: static file system information
-#
-# <file system>        <dir>         <type>    <options>          <dump> <pass>
-none                   /dev/pts      devpts    defaults            0      0
-none                   /dev/shm      tmpfs     defaults            0      0
-
-/dev/cdrom             /mnt/cd   iso9660   ro,user,noauto,unhide   0      0
-/dev/dvd               /mnt/dvd  udf       ro,user,noauto,unhide   0      0
-/dev/fd0               /mnt/fl   vfat      user,noauto             0      0
-
-/dev/sda1 / reiserfs defaults 0 1
-/dev/sda2 swap swap defaults 0 0
-/dev/sda3 /data reiserfs defaults 0 0
-192.168.1.6:/media  /data/media nfs
-
diff --git a/abs/mv-core/MythVantage-config/templates/modules/lirc_i2c.conf b/abs/mv-core/MythVantage-config/templates/modules/lirc_i2c.conf
deleted file mode 100644
index 7b99f78..0000000
--- a/abs/mv-core/MythVantage-config/templates/modules/lirc_i2c.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-alias char-major-61 lirc_i2c
-options lirc_i2c debug=0 minor=3	
diff --git a/abs/mv-core/MythVantage-config/templates/mysql.service b/abs/mv-core/MythVantage-config/templates/mysql.service
deleted file mode 100644
index 160450e..0000000
--- a/abs/mv-core/MythVantage-config/templates/mysql.service
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" standalone='no'?><!--*-nxml-*-->
-<!DOCTYPE service-group SYSTEM "avahi-service.dtd">
-
-<service-group>
-
-  <name replace-wildcards="yes">mysql_myth on %h</name>
-
-  <service>
-    <type>_mysql._tcp</type>
-    <port>3306</port>
-  </service>
-
-</service-group>
diff --git a/abs/mv-core/MythVantage-config/templates/mysql.txt b/abs/mv-core/MythVantage-config/templates/mysql.txt
deleted file mode 100755
index 04531b5..0000000
--- a/abs/mv-core/MythVantage-config/templates/mysql.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-DBHostName=127.0.0.1
-DBUserName=mythtv
-DBPassword=mythtv
-DBName=mythconverg
-DBType=QMYSQL3
-
-# Set the following if you want to use something other than the
-# machine's real hostname for identifying settings in the database.
-# This is useful if your hostname changes often, as otherwise
-# you'll need to reconfigure mythtv (or futz with the DB) every time.
-# TWO HOSTS MUST NOT USE THE SAME VALUE
-#
-#LocalHostName=my-unique-identifier-goes-here
-
-# If you want your frontend to be able to wake your MySQL server
-# using WakeOnLan, have a look at the following settings:
-#
-# Set the time the frontend waits (in seconds) between reconnect tries.
-# This should be the rough time your MySQL server needs for startup
-#WOLsqlReconnectWaitTime=0
-#
-#
-# This is the amount of retries to wake the MySQL server until the frontend
-# gives up
-#WOLsqlConnectRetry=5
-#
-#
-# This is the command executed to wake your MySQL server.
-#WOLsqlCommand=echo 'WOLsqlServerCommand not set'
diff --git a/abs/mv-core/MythVantage-config/templates/ncid.conf.template b/abs/mv-core/MythVantage-config/templates/ncid.conf.template
deleted file mode 100755
index 43ef490..0000000
--- a/abs/mv-core/MythVantage-config/templates/ncid.conf.template
+++ /dev/null
@@ -1,51 +0,0 @@
-# tcl/tk configuration file
-
-# Directory NCID uses to find the helper scripts
-set ProgDir     /usr/share/ncid
-
-# default helper script
-set EXTPROG     ncid-osd
-
-# Set Host to the NCID server address
-# Host defaults to 127.0.0.1
-#set Host        127.0.0.1
-set Host        192.168.1.5
-
-# The NCID port default is 3333
-set Port        3333
-
-# If the connection to the server is lost,
-# try every Delay seconds to reconnect
-# The Default: 60
-set Delay       20
-
-# If set to 1, display raw data received from the NCID server
-# If set to 0, do not display raw data received from the NCID server
-# Default: 0
-set Raw         0
-
-# If set to 1, output: date time number name
-# If set to 0, output: name number
-# Default: 0
-set All         1
-
-# If set to 1, display formatted CID, and CID log file on connect
-# If set to 0, ddo not isplay formatted CID, and CID log file on connect
-# Default: 0
-set Verbose     0
-
-# If set to 1, display information in terminal progran or external program
-# If set to 0, display information using a GUI
-# Default: 0
-set NoGUI       1
-
-# output name and number to external program
-# Default: 0
-set Callprog    1
-
-# ring number to call external program
-# Default: 0
-set CallOnRing  0
-
-# external called program
-set Program     [list $ProgDir/$EXTPROG]
diff --git a/abs/mv-core/MythVantage-config/templates/ncidd.conf.template b/abs/mv-core/MythVantage-config/templates/ncidd.conf.template
deleted file mode 100644
index daa2e79..0000000
--- a/abs/mv-core/MythVantage-config/templates/ncidd.conf.template
+++ /dev/null
@@ -1,143 +0,0 @@
-# ncid - Network CallerID Server Config File
-
-################################
-# Definitions and Line formats #
-################################
-
-# lines can be blank, or start with the words: send, set #
-#
-# A line is divided into words, separated by spaces
-#
-# A word is either a string of non-blank characters, everything
-# between double quotes, or an equal sign.
-#
-# SEND LINE FORMAT:
-#   send DATATYPE [DATATYPE] ...
-#        where DATATYPE = cidlog, cidinfo
-#
-# SET LINE FORMAT:
-#   set ITEM = VALUE [ITEM = VALUE] ...
-#       where ITEM = cidalias, cidlog, datalog, initcid, initstr,
-#                    lockfile, port, ttyclocal, ttyport, ttyspeed,
-#                    nomodem
-
-############################
-# Log and Info for Clients #
-############################
-
-# Send the call log to a client when connected
-# The default is not to send the call log file
-send cidlog
-
-# Send call info (LINE and RING) to a client at each ring
-# The default is not to send the call info line
-send cidinfo
-
-############################
-# NCID Communications Port #
-############################
-
-# The default TCP/IP port is 3333
- set port = 3333
-
-#######################
-# Alias and Log Files #
-#######################
-
-# The default CID alias file: /etc/ncid/ncidd.alias
-# set cidalias = /etc/ncid/ncidd.alias
-
-# The default CID call log file: /var/log/cidcall.log
-# the log file must exist, ncidd will not create it
-# (also make the change in /etc/logrotate.d/ncidd
-#  and also /etc/ncid/ncidrotate.conf)
-# set cidlog = /var/log/cidcall.log
-
-# The default tty data log file: /var/log/ciddata.log
-# the log file must exist, ncidd will not create it
-#  (also make the change in /etc/logrotate.d/ncidd
-#   and also /etc/ncid/ncidrotate.conf)
-# set datalog = /var/log/ciddata.log
-
-#####################
-# TTY Configuration #
-#####################
-
-# The default tty port: /dev/modem
-# set ttyport = /dev/cu.modem # Macintosh OS X
- set ttyport = /dev/ttyS1
-
-# The default tty port speed: 19200
-# The tty speed can be one of: 38400, 19200, 9600, 4800
-# set ttyspeed = 4800 # NetCallerID port speed
-
-# Ignore tty control signals for internal modems and 3 wire serial cables
-#   Disable tty control signals: ttyclocal = 1
-#   Enable tty control signals: ttyclocal = 0 (default)
-# set ttyclocal = 1
-
-# The lockfile name is generated automatically
-# If tty port is /dev/modem, lockfile is: /var/lock/LCK..modem
-# set lockfile = /var/lock/LCK..ttyS0
-
-#####################
-# Modem or No Modem #
-#####################
-
-# Obtain CallerID from a CID device or a modem
-#  device: nomodem = 1 (do not send AT commands)
-#  modem: nomodem = 0 (default - send AT commands)
-# set nomodem = 1
-
-########################
-# Modem Initialization #
-########################
-
-# The default modem initialization is: "AT Z S0=0 E1 V1 Q0"
-# set initstr = "ATE1V1Q0"
-#
-# Alternate modem initialization string
-# set initstr = "AT&FE1V1Q0+VIP"
-
-# Addon strings to set modem for Distinctive Ring:
-#   http://www.modemsite.com/56k/dring.asp
-#
-# 3Com/USR/TI chipset: ATS41=1
-#   Reported Ring Codes: RING A, RING B, RING C
-# Rockwell/Conexant chipset: AT-SDR=7
-#   Reported Ring Codes: RING 1, RING 2, RING 3
-# Lucent/Agere chipset: AT+VDR=1,0
-#   Reported DROF/DRON messages: DRON=5 DROF=11, DRON=5 DROF=34
-#
-# Example adds 3Com DR to the default modem initialization
-# set initstr = "ATE1V1Q0S41=1"
-
-# The default for ncidd is to try two CID strings to setup
-# CallerID: "AT+VCID=1" and if that fails: "AT#CID=1".
-# set initcid = "AT#CID=1"
-#
-# Alternate CID strings to try if default does not work:
-# set initcid = "AT+FCLASS=8;+VCID=1"
-# set initcid = "AT-STE=1;+VCID=1"
-# set initcid = "AT-STE=1;#CID=1"
-
-#################
-# TiVo Settings #
-#################
-# set ttyclocal = 1 # TiVo requires CLOCAL
-# set ttyport = /dev/ttyS1 # TiVo Modem Port
-# set lockfile = /var/tmp/modemlock # needed for TiVo Modem Port
-#
-# To use a modem on the TiVo serial port
-#   Tivo (stereo mini jack) ->
-#   -> (stereo mini plug) TiVo serial cable (9-pin male) ->
-#   -> (9-pin Female) PC modem cable (25-pin Male ->
-#   -> (25-pin Female) Modem
-# if the modem has switches, disable DTR
-# Use this string to set the modem before attaching it to the TiVo:
-#   AT&F0&D0&B1&W
-#
-# set ttyport = /dev/ttyS3 # TiVo Serial Port
-#
-# End TiVo Settings
-
diff --git a/abs/mv-core/MythVantage-config/templates/real_change_chan.sh b/abs/mv-core/MythVantage-config/templates/real_change_chan.sh
deleted file mode 100755
index efeba88..0000000
--- a/abs/mv-core/MythVantage-config/templates/real_change_chan.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-REMOTE_NAME=SA3250
-cmd="$1"
-
-case $cmd in
-	    [0-9]*)
-	        for digit in $(echo $1 | sed -e 's/./& /g'); do 
-		        irsend SEND_ONCE $REMOTE_NAME $digit
-		        sleep  0.3
-	        # If things work OK with sleep 1, try this for faster channel changes:
-	        # sleep 0.3
-	    done
-	        ;;
-
-	   *)
-	           irsend SEND_ONCE $REMOTE_NAME $cmd
-									            ;;
-    esac
-    /usr/bin/fix_audio.sh &
diff --git a/abs/mv-core/MythVantage-config/templates/remotes/ATI_wonder/lircd.ATI.conf b/abs/mv-core/MythVantage-config/templates/remotes/ATI_wonder/lircd.ATI.conf
deleted file mode 100644
index e7c1539..0000000
--- a/abs/mv-core/MythVantage-config/templates/remotes/ATI_wonder/lircd.ATI.conf
+++ /dev/null
@@ -1,357 +0,0 @@
-
-# Please make this file available to others
-# by sending it to <lirc@bartelmus.de>
-#
-# this config file was automatically generated
-# using lirc-0.7.0pre2(atiusb) on Fri Jan  2 19:09:02 2004
-#
-# contributed by 
-#
-# brand:     ATI Remote Wonder
-# model no. of remote control: 
-# devices being controlled by this remote:
-#
-
-begin remote
-
-  name  wonder
-  bits           32
-  eps            30
-  aeps          100
-
-  one             0     0
-  zero            0     0
-  gap          147987
-  toggle_bit      0
-
-
-      begin codes
-          A                        0x0000000014C500F0
-          B                        0x0000000014C601F0
-          POWER                    0x0000000014C702F0
-          TV                       0x0000000014C803F0
-          DVD                      0x0000000014C904F0
-          WEB                      0x0000000014CA05F0
-          GUIDE                    0x0000000014CB06F0
-          GRAB                     0x0000000014CC07F0
-          VOL_DOWN                 0x0000000014CE09F0
-          VOL_UP                   0x0000000014CD08F0
-          MUTE                     0x0000000014CF0AF0
-          CH_DOWN                  0x0000000014D10CF0
-          CH_UP                    0x0000000014D00BF0
-          A                        0x0000000014C500F0
-          B                        0x0000000014C601F0
-          1                        0x0000000014D20DF0
-          2                        0x0000000014D30EF0
-          3                        0x0000000014D40FF0
-          4                        0x0000000014D510F0
-          5                        0x0000000014D611F0
-          6                        0x0000000014D712F0
-          7                        0x0000000014D813F0
-          8                        0x0000000014D914F0
-          9                        0x0000000014DA15F0
-          0                        0x0000000014DC17F0
-          MENU                     0x0000000014DB16F0
-          CHECK                    0x0000000014DD18F0
-          C                        0x0000000014DE19F0
-          D                        0x0000000014E01BF0
-          UP                       0x0000000014DF1AF0
-          LEFT                     0x0000000014E21DF0
-          DOWN                     0x0000000014E722F0
-          RIGHT                    0x0000000014E41FF0
-          OK                       0x0000000014E31EF0
-          REPLAY                   0x0000000014E11CF0
-          FULLSCREEN               0x0000000014E520F0
-          E                        0x0000000014E621F0
-          F                        0x0000000014E823F0
-          REWIND                   0x0000000014E924F0
-          FORWARD                  0x0000000014EB26F0
-          PLAY                     0x0000000014EA25F0
-          RECORD                   0x0000000014EC27F0
-          STOP                     0x0000000014ED28F0
-          PAUSE                    0x0000000014EE29F0
-      end codes
-
-end remote
-
-
-
-# this config file was automatically generated
-# using lirc-0.7.0(atiusb) on Sat Feb 12 13:22:29 2005
-#
-# contributed by Steffen
-#
-# brand: ATI Sapphire Remote Bob II USB
-# model no. of remote control: 5000024400
-# devices being controlled by this remote: MythTV
-#
-
-begin remote
-
-name       wonder II
-bits       16
-eps        30
-aeps       100
-
-one            0 0
-zero           0 0
-pre_data_bits  8
-pre_data       0x0
-post_data_bits 16
-post_data      0x0
-gap            299851
-toggle_bit     0
-
-
-begin codes
-aux1                0x023F
-aux2                0x023F
-aux3                0x023F
-aux4                0x023F
-mouse_left_btn      0x02A9
-mouse_right_btn     0x02AA
-a                   0x0278
-b                   0x0279
-power               0x020C
-dvd                 0x0238
-tv                  0x0239
-help                0x02BE
-pc                  0x023F
-resize              0x02D5
-hand                0x02D0
-ati                 0x028E
-vol_up              0x0210
-vol_down            0x0211
-mute                0x020D
-ch_up               0x0220
-ch_down             0x0221
-mouse_up            0x013F
-mouse_down          0x013F
-mouse_left          0x013F
-mouse_right         0x013F
-1                   0x0201
-2                   0x0202
-3                   0x0203
-4                   0x0204
-5                   0x0205
-6                   0x0206
-7                   0x0207
-8                   0x0208
-9                   0x0209
-0                   0x0200
-list                0x0254
-check               0x0282
-info                0x02F9
-timer               0x0296
-arrow_up            0x0258
-arrow_left          0x025A
-arrow_right         0x025B
-arrow_down          0x0259
-ok                  0x025C
-c                   0x017A
-d                   0x027B
-play                0x022C
-e                   0x027C
-f                   0x027D
-rewind              0x0229
-rec                 0x0237
-stop                0x0231
-pause               0x0230
-ffwd                0x0228
-end codes
-
-end remote
-
-
-# Please make this file available to others
-# by sending it to <lirc at bartelmus.de>
-#
-# this config file was automatically generated
-# using lirc-0.7.0-CVS(atiusb) on Sat Jun 19 16:27:14 2004
-#
-# contributed by gLaNDix
-#
-# brand: ATI
-# model no. of remote control: 5000023600
-# devices being controlled by this remote: MythTV 0.14
-#
-# USB ID: 0bc7:0004
-#
-
-begin remote
-
-   name           REMOTE_WONDER
-   bits           16
-   eps            30
-   aeps          100
-
-   one             0     0
-   zero            0     0
-   pre_data_bits   8
-   pre_data       0x14
-   post_data_bits  16
-   post_data      0x0
-   gap          227933
-   toggle_bit      0
-
-
-       begin codes
-           A                        0x000000000000D500
-           B                        0x000000000000D601
-           C                        0x000000000000EE19
-           D                        0x000000000000F01B
-           E                        0x000000000000F621
-           F                        0x000000000000F823
-           POWER                    0x000000000000D702
-           TV                       0x000000000000D803
-           DVD                      0x000000000000D904
-           WEB                      0x000000000000DA05
-           BOOK                     0x000000000000DB06
-           HAND                     0x000000000000DC07
-           MOUSE_LEFT_BTN	          0x0000000000004D78
-           MOUSE_LEFTBUTTONUP       0x0000000000004E79
-           MOUSE_LEFTBUTTONDBLCLICK 0x0000000000004E79
-           MOUSE_RIGHT_BTN          0x000000000000517C
-           MOUSE_RIGHTBUTTONUP      0x000000000000527D
-           MOUSE_RIGHTBUTTONDBLCLICK 0x000000000000537E
-           MOUSE_LEFT               0x0000000000004570
-           MOUSE_RIGHT              0x0000000000004671
-           MOUSE_UP                 0x0000000000004772
-           MOUSE_DOWN               0x0000000000004873
-           MOUSE_UPRIGHT            0x0000000000004A75
-           MOUSE_DOWNRIGHT          0x0000000000004B76
-           MOUSE_DOWNLEFT           0x0000000000004C77
-           MOUSE_UPLEFT             0x0000000000004974
-           VOL_UP                   0x000000000000DD08
-           VOL_DOWN                 0x000000000000DE09
-           MUTE                     0x000000000000DF0A
-           CH_DOWN                  0x000000000000E10C
-           CH_UP                    0x000000000000E00B
-           1                        0x000000000000E20D
-           2                        0x000000000000E30E
-           3                        0x000000000000E40F
-           4                        0x000000000000E510
-           5                        0x000000000000E611
-           6                        0x000000000000E712
-           7                        0x000000000000E813
-           8                        0x000000000000E914
-           9                        0x000000000000EA15
-           0                        0x000000000000EC17
-           DVD_ROOTMENU             0x000000000000EB16
-           SETUP                    0x000000000000ED18
-           ARROW_UP                 0x000000000000EF1A
-           ARROW_RIGHT              0x000000000000F41F
-           ARROW_DOWN               0x000000000000F722
-           ARROW_LEFT               0x000000000000F21D
-           OK                       0x000000000000F31E
-           MAXAMIZE                 0x000000000000F520
-           TV_ON_DEMAND             0x000000000000F11C
-           BACK                     0x000000000000F924
-           PLAY                     0x000000000000FA25
-           NEXT                     0x000000000000FB26
-           RECORD                   0x000000000000FC27
-           STOP                     0x000000000000FD28
-           PAUSE                    0x000000000000FE29
-       end codes
-
-end remote
-
-
-# Please make this file available to others
-# by sending it to <lirc@bartelmus.de>
-#
-# this config file was automatically generated
-# using lirc-0.7.0pre1(atiusb) on Fri Nov 28 16:56:46 2003
-#
-# contributed by Jason Piterak
-#
-# brand:                       ati
-#                                   This uses the atiusb driver
-#=20
-# model no. of remote control: 5000022000
-#
-# devices being controlled by this remote:
-# MythTV PVR using knopmyth by Cecil and Dale at
-#  http://mysettopbox.tv
-# Key map names are as per ATI's website:
-#http://www.ati.com/support/connectors/remotecontrol/atiremotecontrolbutton=s.html
-# Feel free to change them as you see fit :-)
-#
-# NOTE:  There are 16 channels for this remote; this file only
-# supports one channel.  See the GATOS project for information
-# on how to change the channel.  Not tested.  Unknown channel.
-#
-
-begin remote
-
-  name  atiusb
-  bits           16
-  eps            30
-  aeps          100
-
-  one             0     0
-  zero            0     0
-  pre_data_bits   8
-  pre_data       0x14
-  post_data_bits  16
-  post_data      0xF000
-  gap          139891
-  toggle_bit      0
-
-
-      begin codes
-          a                        0x000000000000C500
-          b                        0x000000000000C601
-          power                    0x000000000000C702
-          tv                       0x000000000000C803
-          dvd                      0x000000000000C904
-          web                      0x000000000000CA05
-          media_library            0x000000000000CB06
-          drag                     0x000000000000CC07
-          mouse-button_left        0x0000000000003D78
-          mouse-button_right       0x000000000000417C
-          mouse-up                 0x0000000000003772
-          mouse-down               0x0000000000003873
-          mouse-left               0x0000000000003570
-          mouse-right              0x0000000000003671
-          mouse-left_up            0x0000000000003974
-          mouse-right_up           0x0000000000003A75
-          mouse-left_down          0x0000000000003C77
-          mouse-right_down         0x0000000000003B76
-          vol-up                   0x000000000000CD08
-          vol-down                 0x000000000000CE09
-          mute                     0x000000000000CF0A
-          chan-up                  0x000000000000D00B
-          chan-down                0x000000000000D10C
-          1                        0x000000000000D20D
-          2                        0x000000000000D30E
-          3                        0x000000000000D40F
-          4                        0x000000000000D510
-          5                        0x000000000000D611
-          6                        0x000000000000D712
-          7                        0x000000000000D813
-          8                        0x000000000000D914
-          9                        0x000000000000DA15
-          0                        0x000000000000DC17
-          dvd-root_menu            0x000000000000DB16
-          launch_setup             0x000000000000DD18
-          c                        0x000000000000DE19
-          d                        0x000000000000E01B
-          tv_on_demand             0x000000000000E11C
-          max_window               0x000000000000E520
-          cursor-up                0x000000000000DF1A
-          cursor-down              0x000000000000E722
-          cursor-left              0x000000000000E21D
-          cursor-right             0x000000000000E41F
-          ok                       0x000000000000E31E
-          e                        0x000000000000E621
-          f                        0x000000000000E823
-          rewind                   0x000000000000E924
-          play                     0x000000000000EA25
-          fast_forward             0x000000000000EB26
-          record                   0x000000000000EC27
-          stop                     0x000000000000ED28
-          pause                    0x000000000000EE29
-      end codes
-
-end remote
diff --git a/abs/mv-core/MythVantage-config/templates/remotes/ATI_wonder/lircrc-atiwonder.txt b/abs/mv-core/MythVantage-config/templates/remotes/ATI_wonder/lircrc-atiwonder.txt
deleted file mode 100644
index 80eec07..0000000
--- a/abs/mv-core/MythVantage-config/templates/remotes/ATI_wonder/lircrc-atiwonder.txt
+++ /dev/null
@@ -1,922 +0,0 @@
-# ~/.mythtv/lircrc
-# 
-# MythTV native LIRC config file for
-# the ATI-Wonder Remote
-# using lirc_atiusb driver
-# 
-
-begin
-prog = mythtv
-button = a
-config = E
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = A
-config = E
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = b
-config = O
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = B
-config = O
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = B
-config = O
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = stop
-config = Esc
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = STOP
-config = Esc
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = ffwd
-config = Right
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = FORWARD
-config = Right
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = rewind
-config = Left
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = REWIND
-config = Left
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = pause
-config = P
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = PAUSE
-config = P
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = play
-config = P
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = PLAY
-config = P
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = mute
-config = |
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = MUTE
-config = |
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = vol_down
-config = F10
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = VOL_DOWN
-config = F10
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = vol_up
-config = F11
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = VOL_UP
-config = F11
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = f
-config = PgDown
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = F
-config = PgDown
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = e
-config = Esc
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = E
-config = Esc
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = ch_up
-config = Up
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = CH_UP
-config = Up
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = ch_down
-config = Down
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = CH_DOWN
-config = Down
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = ok
-config = Enter
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = OK
-config = Enter
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 1
-config = 1
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 2
-config = 2
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 3
-config = 3
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 4
-config = 4
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 5
-config = 5
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 6
-config = 6
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 7
-config = 7
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 8
-config = 8
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 9
-config = 9
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 0
-config = 0
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = rec
-config = R
-repeat = 5
-end 
-
-begin
-prog = mythtv
-button = RECORD
-config = R
-repeat = 5
-end 
-
-
-# ~/.mythtv/lircrc
-# 
-# MythTV native LIRC config file for
-# the ATI-Wonder Remote
-# using lirc_atiusb driver
-# 
-
-begin
-#Jumppoint for Program Guide created in Mythweb
-    prog = mythtv
-    button = TV
-    config = ! 
-end
-
-begin
-#Jumppoint for DVD playback created in Mythweb
-    prog = mythtv
-    button = DVD
-    config = @
-end
-
-begin
-    prog = mythtv
-#Jumppoint for MythWeater created in Mythweb
-    button = WEB
-    config = #
-end
-
-begin
-    prog = mythtv
-#Jumppoint for MythVideo created in Mythweb
-    button = BOOK
-    config = $
-end
-
-begin
-    prog = mythtv
-#Jumppoint for MythWeater created in Mythweb
-    button = HAND
-    config = %
-end
-
-begin
-prog = mythtv
-button = 1
-config = 1
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 2
-config = 2
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 3
-config = 3
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 4
-config = 4
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 5
-config = 5
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 6
-config = 6
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 7
-config = 7
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 8
-config = 8
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 9
-config = 9
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 0
-config = 0
-repeat = 5
-end
-
-begin
-    prog = mythtv
-    button = MOUSE_UP
-    config = Up
-end
-
-begin
-    prog = mythtv
-    button = MOUSE_DOWN
-    config = Down
-end
-
-begin
-    prog = mythtv
-    button = MOUSE_LEFT
-    config = Left
-end
-
-begin
-    prog = mythtv
-    button = MOUSE_RIGHT 
-    config = Right
-end
-
-begin
-    prog = mythtv
-    button = MOUSE_RIGHT_BTN
-    config = Esc
-end
-
-begin
-    prog = mythtv
-# Enter button
-    button = MOUSE_LEFT_BTN 
-    config = Return
-end
-
-begin
-    prog = mythtv
-    button = POWER
-    config = Esc
-end
-
-begin
-    prog = mythtv
-# Enter button
-    button = OK
-    config = Return
-end
-
-begin
-    prog = mythtv
-    button = ARROW_UP
-    config = Up
-end
-
-begin
-    prog = mythtv
-    button = ARROW_DOWN
-    config = Down
-end
-
-begin
-    prog = mythtv
-    button = ARROW_LEFT
-    config = Left
-end
-
-begin
-    prog = mythtv
-    button = ARROW_RIGHT 
-    config = Right
-end
-
-begin
-    prog = mythtv
-    button = D
-    config = Esc
-end
-
-begin
-prog = mythtv
-button = CH_UP
-config = Up
-end
-
-begin
-prog = mythtv
-button = CH_DOWN
-config = Down
-end
-
-begin
-  prog = mythtv
-  button = VOL_DOWN
-  repeat = 3
-  config = F10  
-end
-
-begin
-  prog = mythtv
-  button = VOL_UP
-  repeat = 3
-  config = F11  
-end
-
-begin
-    prog = mythtv
-    button = MUTE
-    config = |  
-end
-
-begin
-    prog = mythtv
-    button = DVD_ROOTMENU
-    config = M  
-end
-
-begin
-    prog = mythtv
-# Enter button
-    button = SETUP 
-    config = Return
-end
-
-
-begin
-    prog = mythtv
-    button = A 
-    config = S  
-end
-
-begin
-    prog = mythtv
-    button = B
-    config = I   
-end
-
-begin
-    prog = mythtv
-    button = C
-    config = T   
-end
-
-begin
-prog = mythtv
-# Change focus for PiP (to change channel in the other window)
-button = MAXAMIZE
-config = B
-end
-
-begin
-prog = mythtv
-# Toggle PiP on/off
-button = TV_ON_DEMAND
-config = V
-end
-
-begin
-    prog = mythtv
-    button = BACK
-    config = <  
-end
-
-begin
-    prog = mythtv
-    button = NEXT
-    config = >  
-end
-
-begin
-    prog = mythtv
-    button = BACK
-    config = Left  
-end
-
-
-begin
-    prog = mythtv
-    button = NEXT
-    config = Right  
-end
-
-begin
-prog = mythtv
-button = RECORD
-config = R
-end
-
-begin
-prog = mythtv
-button = STOP
-config = Esc
-end
-
-begin
-prog = mythtv
-button = PLAY
-config = P
-end
-
-begin
-prog = mythtv
-button = PAUSE
-config = P
-end
-
-#Page Up/Down
-begin
-prog = mythtv
-button = E
-config = PgUp
-end
-
-begin
-prog = mythtv
-button = F
-config = PgDown
-end
-
-begin
-prog = mythtv
-button = E
-# Use for backwards commercial skip
-config = Q
-end
-
-begin
-prog = mythtv
-button = F
-# Use for forward commercial skip
-config = Z
-end
-
-#Mplayer
-
-begin
-prog = mplayer
-button = PLAY
-config = pause
-end
-
-begin
-prog = mplayer
-button = PAUSE
-config = pause
-end
-
-begin
-prog = mplayer
-button = STOP
-config = quit
-end
-
-begin
-prog = mplayer
-button = POWER
-config = quit
-end
-
-begin
-prog = mplayer
-button = D
-config = quit
-end
-
-begin
-prog = mplayer
-button = MOUSE_RIGHT_BTN
-config = quit
-end
-
-begin
-prog = mplayer
-button = MUTE
-config = mute
-end
-
-begin
-prog = mplayer
-button = E
-repeat = 6
-config = seek -10
-end
-
-begin
-prog = mplayer
-button = F
-repeat = 6
-config = seek 10
-end
-
-begin
-prog = mplayer
-button = BACK
-repeat = 6
-config = seek -70
-end
-
-begin
-prog = mplayer
-button = NEXT
-repeat = 6
-config = seek 70
-end
-
-begin
-prog = mplayer
-button = VOL_DOWN
-repeat = 6
-config = volume -1
-end
-
-begin
-prog = mplayer
-button = VOL_UP
-repeat = 6
-config = volume 1
-end
-
-#Xine
-
-begin
-prog = xine
-button = PLAY
-config = Play
-end
-
-begin
-prog = xine
-button = PAUSE
-config = PAUSE
-end
-
-begin
-prog = xine
-button = Mute
-config = Mute
-end
-
-begin
-prog = xine
-button = STOP
-config = Stop
-end
-
-begin
-prog = xine
-button = POWER
-config = Quit
-end
-
-begin
-prog = xine
-button = D
-config = quit
-end
-
-begin
-prog = xine
-button = MOUSE_RIGHT_BTN
-config = quit
-end
-
-begin
-prog = xine
-button = ARROW_UP
-repeat = 4
-config = EventUp
-end
-
-begin
-prog = xine
-button = ARROW_DOWN
-repeat = 4
-config = EventDown
-end
-
-begin
-prog = xine
-button = ARROW_LEFT
-repeat = 4
-config = EventLeft
-end
-
-begin
-prog = xine
-button = ARROW_RIGHT
-repeat = 4
-config = EventRight
-end
-
-begin
-prog = xine
-button = OK
-repeat = 0
-config = EventSelect
-end
-
-begin
-prog = xine
-button = MOUSE_UP
-repeat = 4
-config = EventUp
-end
-
-begin
-prog = xine
-button = MOUSE_DOWN
-repeat = 4
-config = EventDown
-end
-
-begin
-prog = xine
-button = MOUSE_LEFT
-repeat = 4
-config = EventLeft
-end
-
-begin
-prog = xine
-button = MOUSE_RIGHT
-repeat = 4
-config = EventRight
-end
-
-begin
-prog = xine
-button = MOUSE_LEFT_BTN
-repeat = 0
-config = EventSelect
-end
-
-begin
-prog = xine
-button = DVD_ROOTMENU
-repeat = 0
-config = Menu
-end
-
-#vol down
-begin
-prog = xine
-button = VOL_DOWN
-repeat = 1
-config = Volume-
-end
-
-#vol up
-begin
-prog = xine
-button = VOL_UP
-repeat = 1
-config = Volume+
-end
-
-begin
-prog = xine
-button = TV_ON_DEMAND
-repeat = 1
-config = ZoomIn
-end
-
-begin
-prog = xine
-button = MAXAMIZE
-repeat = 1
-config = ZoomOut
-end
-
-#skip chapter forward
-begin
-prog = xine
-button = NEXT
-repeat = 1
-config = EventNext
-end
-
-#skip chapter backward
-begin
-prog = xine
-button = BACK
-repeat = 1
-config = EventPrior
-end
-
-begin
-prog = xine
-button = F
-repeat = 2
-config = SeekRelative+45
-end
-
-begin
-prog = xine
-button = E
-repeat = 2
-config = SeekRelative-45
-end 
-
diff --git a/abs/mv-core/MythVantage-config/templates/remotes/ATI_wonder/preview.jpg b/abs/mv-core/MythVantage-config/templates/remotes/ATI_wonder/preview.jpg
deleted file mode 100644
index 351a111..0000000
--- a/abs/mv-core/MythVantage-config/templates/remotes/ATI_wonder/preview.jpg
+++ /dev/null
diff --git a/abs/mv-core/MythVantage-config/templates/remotes/MX-500-jams/lircd.conf.MX-500-JAMS b/abs/mv-core/MythVantage-config/templates/remotes/MX-500-jams/lircd.conf.MX-500-JAMS
deleted file mode 100644
index b76d32c..0000000
--- a/abs/mv-core/MythVantage-config/templates/remotes/MX-500-jams/lircd.conf.MX-500-JAMS
+++ /dev/null
@@ -1,115 +0,0 @@
-#
-# this config file was automatically generated
-# using lirc-0.7.1-CVS(serial) on Fri Feb  4 23:20:56 2005
-#
-# contributed by Christoph Bartelmus
-#
-# brand:                       Streamzap
-# model no. of remote control: PC Remote
-# devices being controlled by this remote: USB receiver
-#
-
-begin remote
-
-  name  Streamzap_PC_Remote
-  bits            6
-  flags RC5|CONST_LENGTH
-  eps            30
-  aeps          100
-
-  one           889  889
-  zero          889  889
-  plead         889
-  pre_data_bits   8
-  pre_data       0xA3
-  gap          108344
-  toggle_bit      2
-
-
-      begin codes
-          0                        0x00
-          1                        0x01
-          2                        0x02
-          3                        0x03
-          4                        0x04
-          5                        0x05
-          6                        0x06
-          7                        0x07
-          8                        0x08
-          9                        0x09
-          POWER                    0x0A
-          MUTE                     0x0B
-          CH_UP                    0x0C
-          VOL_UP                   0x0D
-          CH_DOWN                  0x0E
-          VOL_DOWN                 0x0F
-          UP                       0x10
-          LEFT                     0x11
-          OK                       0x12
-          RIGHT                    0x13
-          DOWN                     0x14
-          MENU                     0x15
-          EXIT                     0x16
-          PLAY                     0x17
-          PAUSE                    0x18
-          STOP                     0x19
-          |<<                      0x1A
-          >>|                      0x1B
-          RECORD                   0x1C
-          <<                       0x1D
-          >>                       0x1E
-          RED                      0x20
-          GREEN                    0x21
-          YELLOW                   0x22
-          BLUE                     0x23
-      end codes
-
-end remote
-
-
-
-# Please make this file available to others
-# by sending it to <lirc@bartelmus.de>
-#
-# this config file was automatically generated
-# using lirc-0.7.2(streamzap) on Mon Dec  5 08:45:02 2005
-#
-# contributed by 
-#
-# brand:                       RS_LD_120-MX500
-# model no. of remote control: 
-# devices being controlled by this remote:
-#
-
-begin remote
-
-  name  RS_LD
-  bits           15
-  flags SPACE_ENC|CONST_LENGTH
-  eps            30
-  aeps          100
-
-  one           384  1920
-  zero          384   896
-  ptrail        384
-  gap          70400
-  min_repeat      2
-  toggle_bit      0
-
-
-      begin codes
-          RESET 	   0x19FD
-          TIME             0X1902
-          BLANK            0X1B02
-          PICTURE          0X1882
-          ASPECT           0X1A82
-          BROWSE           0X1982
-          DELETE           0X1B82
-          CARD             0X1842
-          CARD_SOURCE      0X1A42
-          SPARE1           0X1942
-      end codes
-
-end remote
-
-
diff --git a/abs/mv-core/MythVantage-config/templates/remotes/MX-500-jams/lircrc b/abs/mv-core/MythVantage-config/templates/remotes/MX-500-jams/lircrc
deleted file mode 100644
index 5e668b5..0000000
--- a/abs/mv-core/MythVantage-config/templates/remotes/MX-500-jams/lircrc
+++ /dev/null
@@ -1,832 +0,0 @@
-# StreamZap Remote
-# 'config' must either be a literal key, e.g. 'config = l' or must
-# refer to a defined key in MythTV, e.g. 'config = PLAY'a
-
-
-#restart frontend
-begin
-        remote = RS_LD
-        button = RESET
-        prog   = irexec
-        repeat = 0
-        config = /usr/bin/restartfrontend.sh
-end
-
-#time
-begin
-        remote = RS_LD
-        button = TIME
-        prog   = irexec
-        repeat = 10
-        config = /usr/bin/saytime.sh
-end
-
-#screen blank
-begin
-        remote = RS_LD
-        button = BLANK
-        prog   = irexec
-        repeat = 0
-#      config  = ls
-        config = xset s activate ; xset s blank
-end
-
-
-#picture
-begin
-REMOTE = RS_LD
-prog = mythtv
-button = PICTURE
-repeat = 4
-config = f
-end
-
-#change aspect
-begin
-remote = RS_LD
-prog = mythtv
-button = ASPECT
-# change aspect ratio
-config = w
-end
-
-#Browse
-begin
-remote = RS_LD
-prog = mythtv
-button = BROWSE
-repeat = 8
-config = o
-end
-
-# delete key
-begin
-remote = RS_LD
-prog = mythtv
-button = DELETE
-repeat = 8
-config = d
-end
-
-
-#change card
-begin
-remote = RS_LD
-prog = mythtv
-button = CARD
-repeat = 8
-config = y
-end
-
-# Change TV card input
-begin
-remote = RS_LD
-prog = mythtv
-button = CARD_SOURCE
-repeat = 4
-config = C
-end
-
-
-
-# Cycle through channel history
-begin
-remote = Streamzap_PC_Remote
-prog = mythtv
-button = BLUE
-repeat = 4
-config = H
-end
-
-# Bring up OSD info
-begin
-remote =  Streamzap_PC_Remote
-prog = mythtv
-button = YELLOW
-repeat = 4
-config = i
-end
-
-
-
-
-begin
-prog = mythtv
-button = 0
-config = 0
-end
-
-begin
-prog = mythtv
-button = 1
-config = 1
-end
-
-begin
-prog = mythtv
-button = 2
-config = 2
-end
-
-begin
-prog = mythtv
-button = 3
-config = 3
-end
-
-begin
-prog = mythtv
-button = 4
-config = 4
-end
-
-begin
-prog = mythtv
-button = 5
-config = 5
-end
-
-begin
-prog = mythtv
-button = 6
-config = 6
-end
-
-begin
-prog = mythtv
-button = 7
-config = 7
-end
-
-begin
-prog = mythtv
-button = 8
-config = 8
-end
-
-begin
-prog = mythtv
-button = 9
-config = 9
-end
-
-begin
-prog = mythtv
-button = POWER
-config = Esc
-end
-
-# ???
-begin
-prog = mythtv
-button = MUTE
-config = F9
-end
-
-begin
-prog = mythtv
-button = CH_UP
-repeat = 3
-config = PgUp
-end
-
-begin
-prog = mythtv
-button = VOL_UP
-repeat = 3
-config = ]
-end
-
-begin
-prog = mythtv
-button = CH_DOWN
-repeat = 3
-config = PgDown
-end
-
-begin
-prog = mythtv
-button = VOL_DOWN
-repeat = 3
-config = [
-end
-
-begin
-prog = mythtv
-button = UP
-repeat = 3
-config = Up
-end
-
-begin
-prog = mythtv
-button = LEFT
-# navigates, or skips back during playback or live tv.
-config = Left
-end
-
-begin
-prog = mythtv
-button = OK
-config = Return
-end
-
-begin
-prog = mythtv
-button = RIGHT
-# navigates, or skips forwards during playback or live tv.
-config = Right
-end
-
-begin
-prog = mythtv
-button = DOWN
-repeat = 3
-config = Down
-end
-
-begin
-prog = mythtv
-button = MENU
-config = m
-end
-
-begin
-prog = mythtv
-button = EXIT
-config = Esc
-end
-
-begin
-prog = mythtv
-button = PLAY
-config = Space
-end
-
-begin
-prog = mythtv
-button = PAUSE
-config = p
-end
-
-begin
-prog = mythtv
-button = STOP
-config = Esc
-end
-
-begin
-prog = mythtv
-# skip backward
-button = |<<
-config = PgUp
-end
-
-begin
-prog = mythtv
-# skip forward
-button = >>|
-config = PgDown
-end
-
-begin
-prog = mythtv
-button = RECORD
-config = r
-end
-
-begin
-prog = mythtv
-# rewind
-button = <<
-config = Home
-end
-
-begin
-prog = mythtv
-# fast forward
-button = >>
-config = End
-end
-
-begin
-prog = mythtv
-button = RED
-# Delete
-config = d
-end
-
-begin
-prog = mythtv
-button = GREEN
-# Info
-config = i
-end
-
-#begin
-#prog = mythtv
-#button = YELLOW
-# change aspect ratio
-#config = w
-#end
-
-begin
-prog = mythtv
-button = BLUE
-config = Tab
-end
-
-# MPLAYER
-begin
-prog = mplayer
-button = POWER
-config = quit
-end
-
-begin
-prog = mplayer
-button = MUTE
-config = mute
-end
-
-begin
-prog = mplayer
-button = VOL_UP
-repeat = 3
-config = volume +1
-end
-
-begin
-prog = mplayer
-button = VOL_DOWN
-repeat = 3
-config = volume -1
-end
-
-begin
-prog = mplayer
-button = UP
-repeat = 3
-config = seek +10
-end
-
-begin
-prog = mplayer
-button = LEFT
-# navigates, or skips back during playback or live tv.
-config = seek -60
-end
-
-begin
-prog = mplayer
-button = RIGHT
-# navigates, or skips forwards during playback or live tv.
-config = seek +60
-end
-
-begin
-prog = mplayer
-button = DOWN
-repeat = 3
-config = seek -10
-end
-
-begin
-prog = mplayer
-button = EXIT
-config = quit
-end
-
-begin
-prog = mplayer
-button = play
-config = speed_set 1.0
-end
-
-begin
-    prog = mplayer
-    button = pause
-    config = pause
-end
-
-begin
-prog = mplayer
-button = STOP
-config = quit
-end
-
-begin
-prog = mplayer
-# skip backward
-button = |<<
-config = seek -600
-end
-
-begin
-prog = mplayer
-# skip forward
-button = >>|
-config = seek +600
-end
-
-begin
-prog = mplayer
-# slow forward
-button = <<
-config = speed_mult 0.5
-end
-
-begin
-prog = mplayer
-# fast forward
-button = >>
-config = speed_mult 2.0
-end
-
-### xine  commands
-
-begin
-prog = xine
-button = YELLOW
-repeat = 4
-#config = ToggleVisiblity
-config = OSDStreamInfos
-end
-
-begin
-prog = xine
-button = MENU
-repeat = 4
-config = SeekRelative+60
-end
-
-# increase brightness by 10
-begin
-        button = DELETE
-        prog   = xine
-        repeat = 4
-        config = BrightnessControl+
-end
-
-# decrease brightness by 10
-begin
-        button = PICTURE
-        prog   = xine
-        repeat = 4
-        config = BrightnessControl-
-end
-
-
-begin
-prog = xine
-button = PAUSE
-repeat = 4
-config = Pause
-end
-
-begin
-prog = xine
-button = PLAY
-repeat = 4
-config = Play
-end
-
-begin
-prog = xine
-button = STOP
-repeat = 4
-config = quit
-end
-
-begin
-prog = xine
-button = MUTE
-repeat = 4
-config = mute
-end
-
-begin
-prog = xine
-button = <<
-repeat = 4
-config = SeekRelative-30
-end
-
-begin
-prog = xine
-button =  >>
-repeat = 4
-#config = SeekRelative+30
-config =  SpeedFaster
-end
-
-begin
-prog = xine
-button = POWER
-repeat = 4
-config = quit
-end
-
-begin
-prog = xine
-button = EXIT
-repeat = 4
-config = quit
-end
-
-
-begin
-prog = xine
-button = FREEZE
-repeat = 4
-config =  SeekRelative+1200
-end
-
-begin
-prog = xine
-button = MOVE
-repeat = 4
-config =  SeekRelative-1200
-end
-
-begin
-prog   = xine
-button = 3
-config = SpuNext
-repeat = 0
-end
-
-# Select previous sub picture (subtitle) channel.
-begin
-button = 1
-prog   = xine
-repeat = 0
-config = SpuPrior
-end
-
-# Select next audio channel.
-begin
-button = 9
-prog   = xine
-repeat = 0
-config = AudioChannelNext
-end
-
-# Select previous audio channel.
-begin
-button = 7
-prog   = xine
-repeat = 0
-config = AudioChannelPrior
-end
-
-
-
-# Up event.
-begin
-
-button = UP
-prog   = xine
-repeat = 8
-config = EventUp
-end
-
-# Down event.
-begin
-
-button = DOWN
-prog   = xine
-repeat = 8
-config = EventDown
-end
-
-# Left event.
-begin
-
-button = LEFT
-prog   = xine
-repeat = 8
-config = EventLeft
-end
-
-# Right event.
-begin
-
-button = RIGHT
-prog   = xine
-repeat = 8
-config = EventRight
-end
-
-# Select event.
-begin
-prog   = xine
-button = ok
-repeat = 8
-config = EventSelect
-end
-
-# Down Chapter
-begin
-
-button = CH_DOWN
-prog   = xine
-repeat = 8
-config = EventPrior
-end
-
-# Next Chapter.
-begin
-
-button = CH_UP
-prog   = xine
-repeat = 8
-config = EventNext
-end
-
-# menu.
-begin
-
-button = record
-prog   = xine
-repeat = 8
-config = RootMenu
-end
-
-# Toggle aspect ratio
-begin
-prog   = xine
-button = ASPECT
-repeat = 0
-config = ToggleAspectRatio
-end
-
-
-
-#######xmms
-begin xmms
-  begin
-    prog = xmms
-    button = PLAY
-    config = PLAY
-  end
-  begin
-    prog = xmms
-    button = clear
-    config = PLAYLIST_CLEAR
-  end
-  begin
-    prog = xmms
-    button = load
-    config = PLAYLIST_ADD .xmms/xmms.m3u
-   end
-  begin
-    prog = xmms
-    button = PAUSE
-    config = PAUSE
-  end
-  begin
-    prog = xmms
-    button = STOP
-    config = STOP
-  end
-  begin
-    prog = xmms
-    button = EXIT
-    config = QUIT
-    flags = mode
-  end
-
-  begin
-    prog = xmms
-    button = POWER
-    config = QUIT
-    flags = mode
-  end
-
-  begin
-    prog = xmms
-    button = CH_UP
-    config = NEXT
-  end
-  begin
-    prog = xmms
-    button = CH_DOWN
-    config = PREV
-  end
-  
-
-
-begin
-    prog = xmms
-    button = >>|
-    config = NEXT
-  end
-begin
-    prog = xmms
-    button = |<<
-    config = PREV
-end
-
-
-begin
-    prog = xmms
-    button = <<
-    config = FWD 10
-    repeat = 2
-  end
-  begin
-    prog = xmms
-    button = <<
-    config = BWD 10
-    repeat = 2
-  end
-  begin
-    prog = xmms
-    button = volup
-    config = VOL_UP 10
-    repeat = 2
-  end
-  begin
-    prog = xmms
-    button = voldown
-    config = VOL_DOWN 10
-    repeat = 2
-  end
-  begin
-    prog = xmms
-    button = 1
-    config = ONE
-  end
-  begin
-    prog = xmms
-    button = 2
-    config = TWO
-  end
-  begin
-    prog = xmms
-    button = 3
-    config = THREE
-  end
-  begin
-    prog = xmms
-    button = 4
-    config = FOUR
-  end
-  begin
-    prog = xmms
-    button = 5
-    config = FIVE
-  end
-  begin
-    prog = xmms
-    button = 6
-    config = SIX
-  end
-  begin
-    prog = xmms
-    button = 7
-    config = SEVEN
-  end
-  begin
-    prog = xmms
-    button = 8
-    config = EIGHT
-  end
-  begin
-    prog = xmms
-    button = 9
-    config = NINE
-  end
-  begin
-    prog = xmms
-    button = 0
-    config = ZERO
-  end
-  begin
-    prog = xmms
-    button = enter
-    config = SETPOS
-  end
-end xmms
-
-#
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/abs/mv-core/MythVantage-config/templates/remotes/MX-500-jams/preview.jpg b/abs/mv-core/MythVantage-config/templates/remotes/MX-500-jams/preview.jpg
deleted file mode 100644
index 38857f9..0000000
--- a/abs/mv-core/MythVantage-config/templates/remotes/MX-500-jams/preview.jpg
+++ /dev/null
diff --git a/abs/mv-core/MythVantage-config/templates/remotes/MythVantage-one/lircd.conf b/abs/mv-core/MythVantage-config/templates/remotes/MythVantage-one/lircd.conf
deleted file mode 100644
index b76d32c..0000000
--- a/abs/mv-core/MythVantage-config/templates/remotes/MythVantage-one/lircd.conf
+++ /dev/null
@@ -1,115 +0,0 @@
-#
-# this config file was automatically generated
-# using lirc-0.7.1-CVS(serial) on Fri Feb  4 23:20:56 2005
-#
-# contributed by Christoph Bartelmus
-#
-# brand:                       Streamzap
-# model no. of remote control: PC Remote
-# devices being controlled by this remote: USB receiver
-#
-
-begin remote
-
-  name  Streamzap_PC_Remote
-  bits            6
-  flags RC5|CONST_LENGTH
-  eps            30
-  aeps          100
-
-  one           889  889
-  zero          889  889
-  plead         889
-  pre_data_bits   8
-  pre_data       0xA3
-  gap          108344
-  toggle_bit      2
-
-
-      begin codes
-          0                        0x00
-          1                        0x01
-          2                        0x02
-          3                        0x03
-          4                        0x04
-          5                        0x05
-          6                        0x06
-          7                        0x07
-          8                        0x08
-          9                        0x09
-          POWER                    0x0A
-          MUTE                     0x0B
-          CH_UP                    0x0C
-          VOL_UP                   0x0D
-          CH_DOWN                  0x0E
-          VOL_DOWN                 0x0F
-          UP                       0x10
-          LEFT                     0x11
-          OK                       0x12
-          RIGHT                    0x13
-          DOWN                     0x14
-          MENU                     0x15
-          EXIT                     0x16
-          PLAY                     0x17
-          PAUSE                    0x18
-          STOP                     0x19
-          |<<                      0x1A
-          >>|                      0x1B
-          RECORD                   0x1C
-          <<                       0x1D
-          >>                       0x1E
-          RED                      0x20
-          GREEN                    0x21
-          YELLOW                   0x22
-          BLUE                     0x23
-      end codes
-
-end remote
-
-
-
-# Please make this file available to others
-# by sending it to <lirc@bartelmus.de>
-#
-# this config file was automatically generated
-# using lirc-0.7.2(streamzap) on Mon Dec  5 08:45:02 2005
-#
-# contributed by 
-#
-# brand:                       RS_LD_120-MX500
-# model no. of remote control: 
-# devices being controlled by this remote:
-#
-
-begin remote
-
-  name  RS_LD
-  bits           15
-  flags SPACE_ENC|CONST_LENGTH
-  eps            30
-  aeps          100
-
-  one           384  1920
-  zero          384   896
-  ptrail        384
-  gap          70400
-  min_repeat      2
-  toggle_bit      0
-
-
-      begin codes
-          RESET 	   0x19FD
-          TIME             0X1902
-          BLANK            0X1B02
-          PICTURE          0X1882
-          ASPECT           0X1A82
-          BROWSE           0X1982
-          DELETE           0X1B82
-          CARD             0X1842
-          CARD_SOURCE      0X1A42
-          SPARE1           0X1942
-      end codes
-
-end remote
-
-
diff --git a/abs/mv-core/MythVantage-config/templates/remotes/MythVantage-one/lircrc b/abs/mv-core/MythVantage-config/templates/remotes/MythVantage-one/lircrc
deleted file mode 100755
index 2663c63..0000000
--- a/abs/mv-core/MythVantage-config/templates/remotes/MythVantage-one/lircrc
+++ /dev/null
@@ -1,857 +0,0 @@
-# StreamZap Remote
-# 'config' must either be a literal key, e.g. 'config = l' or must
-# refer to a defined key in MythTV, e.g. 'config = PLAY'a
-
-
-#restart frontend
-begin
-        remote = RS_LD
-        button = RESET
-        prog   = irexec
-        repeat = 0
-        config = /usr/bin/restartfrontend.sh
-end
-
-#time
-begin
-        remote = RS_LD
-        button = TIME
-        prog   = irexec
-        repeat = 10
-        config = /usr/bin/saytime.sh
-end
-
-#screen blank
-begin
-        remote = RS_LD
-        button = BLANK
-        prog   = irexec
-        repeat = 0
-#      config  = ls
-        config = xset s activate ; xset s blank
-end
-
-
-#picture
-begin
-REMOTE = RS_LD
-prog = mythtv
-button = PICTURE
-repeat = 5
-config = f
-end
-
-#change aspect
-begin
-remote = RS_LD
-prog = mythtv
-button = ASPECT
-# change aspect ratio
-config = w
-repeat = 5
-end
-
-#Browse
-begin
-remote = RS_LD
-prog = mythtv
-button = BROWSE
-repeat = 8
-config = o
-end
-
-# delete key
-begin
-remote = RS_LD
-prog = mythtv
-button = DELETE
-repeat = 8
-config = d
-end
-
-
-#change card
-begin
-remote = RS_LD
-prog = mythtv
-button = CARD
-repeat = 8
-config = y
-end
-
-# Change TV card input
-begin
-remote = RS_LD
-prog = mythtv
-button = CARD_SOURCE
-repeat = 4
-config = C
-end
-
-
-
-# Cycle through channel history
-begin
-remote = Streamzap_PC_Remote
-prog = mythtv
-button = BLUE
-repeat = 4
-config = H
-end
-
-# Bring up OSD info
-begin
-remote =  Streamzap_PC_Remote
-prog = mythtv
-button = YELLOW
-repeat = 4
-config = i
-end
-
-
-
-
-begin
-prog = mythtv
-button = 0
-config = 0
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 1
-config = 1
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 2
-config = 2
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 3
-config = 3
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 4
-config = 4
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 5
-config = 5
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 6
-config = 6
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 7
-config = 7
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 8
-config = 8
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = 9
-config = 9
-repeat = 5
-end
-
-
-begin
-prog = mythtv
-button = POWER
-config = Esc
-end
-
-# ???
-begin
-prog = mythtv
-button = MUTE
-config = F9
-end
-
-begin
-prog = mythtv
-button = CH_UP
-repeat = 3
-config = PgUp
-end
-
-begin
-prog = mythtv
-button = VOL_UP
-repeat = 3
-config = ]
-end
-
-begin
-prog = mythtv
-button = CH_DOWN
-repeat = 3
-config = PgDown
-end
-
-begin
-prog = mythtv
-button = VOL_DOWN
-repeat = 3
-config = [
-end
-
-begin
-prog = mythtv
-button = UP
-repeat = 3
-config = Up
-end
-
-begin
-prog = mythtv
-button = LEFT
-# navigates, or skips back during playback or live tv.
-config = Left
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = OK
-config = Return
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = RIGHT
-# navigates, or skips forwards during playback or live tv.
-config = Right
-end
-
-begin
-prog = mythtv
-button = DOWN
-repeat = 3
-config = Down
-end
-
-begin
-prog = mythtv
-button = MENU
-config = m
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = EXIT
-config = Esc
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = PLAY
-config = Space
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = PAUSE
-config = p
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = STOP
-config = Esc
-repeat = 5
-end
-
-begin
-prog = mythtv
-# skip backward
-button = |<<
-config = PgUp
-repeat = 5
-end
-
-begin
-prog = mythtv
-# skip forward
-button = >>|
-config = PgDown
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = RECORD
-config = r
-repeat = 5
-end
-
-begin
-prog = mythtv
-# rewind
-button = <<
-config = Home
-repeat = 5
-end
-
-begin
-prog = mythtv
-# fast forward
-button = >>
-config = End
-repeat = 5
-end
-
-begin
-prog = mythtv
-button = RED
-# Delete
-config = d
-end
-
-begin
-prog = mythtv
-button = GREEN
-# Info
-config = S
-repeat = 5
-end
-
-#begin
-#prog = mythtv
-#button = YELLOW
-# change aspect ratio
-#config = w
-#end
-
-begin
-prog = mythtv
-button = BLUE
-config = Tab
-end
-
-# MPLAYER
-begin
-prog = mplayer
-button = POWER
-config = quit
-end
-
-begin
-prog = mplayer
-button = MUTE
-config = mute
-end
-
-begin
-prog = mplayer
-button = VOL_UP
-repeat = 3
-config = volume +1
-end
-
-begin
-prog = mplayer
-button = VOL_DOWN
-repeat = 3
-config = volume -1
-end
-
-begin
-prog = mplayer
-button = UP
-repeat = 3
-config = seek +10
-end
-
-begin
-prog = mplayer
-button = LEFT
-# navigates, or skips back during playback or live tv.
-config = seek -60
-end
-
-begin
-prog = mplayer
-button = RIGHT
-# navigates, or skips forwards during playback or live tv.
-config = seek +60
-end
-
-begin
-prog = mplayer
-button = DOWN
-repeat = 3
-config = seek -10
-end
-
-begin
-prog = mplayer
-button = EXIT
-config = quit
-end
-
-begin
-prog = mplayer
-button = play
-config = speed_set 1.0
-end
-
-begin
-    prog = mplayer
-    button = pause
-    config = pause
-end
-
-begin
-prog = mplayer
-button = STOP
-config = quit
-end
-
-begin
-prog = mplayer
-# skip backward
-button = |<<
-config = seek -600
-end
-
-begin
-prog = mplayer
-# skip forward
-button = >>|
-config = seek +600
-end
-
-begin
-prog = mplayer
-# slow forward
-button = <<
-config = speed_mult 0.5
-end
-
-begin
-prog = mplayer
-# fast forward
-button = >>
-config = speed_mult 2.0
-end
-
-### xine  commands
-
-begin
-prog = xine
-button = YELLOW
-repeat = 4
-#config = ToggleVisiblity
-config = OSDStreamInfos
-end
-
-begin
-prog = xine
-button = MENU
-repeat = 4
-config = SeekRelative+60
-end
-
-# increase brightness by 10
-begin
-        button = DELETE
-        prog   = xine
-        repeat = 4
-        config = BrightnessControl+
-end
-
-# decrease brightness by 10
-begin
-        button = PICTURE
-        prog   = xine
-        repeat = 4
-        config = BrightnessControl-
-end
-
-
-begin
-prog = xine
-button = PAUSE
-repeat = 4
-config = Pause
-end
-
-begin
-prog = xine
-button = PLAY
-repeat = 4
-config = Play
-end
-
-begin
-prog = xine
-button = STOP
-repeat = 4
-config = quit
-end
-
-begin
-prog = xine
-button = MUTE
-repeat = 4
-config = mute
-end
-
-begin
-prog = xine
-button = <<
-repeat = 4
-config = SeekRelative-30
-end
-
-begin
-prog = xine
-button =  >>
-repeat = 4
-#config = SeekRelative+30
-config =  SpeedFaster
-end
-
-begin
-prog = xine
-button = POWER
-repeat = 4
-config = quit
-end
-
-begin
-prog = xine
-button = EXIT
-repeat = 4
-config = quit
-end
-
-
-begin
-prog = xine
-button = FREEZE
-repeat = 4
-config =  SeekRelative+1200
-end
-
-begin
-prog = xine
-button = MOVE
-repeat = 4
-config =  SeekRelative-1200
-end
-
-begin
-prog   = xine
-button = 3
-config = SpuNext
-repeat = 0
-end
-
-# Select previous sub picture (subtitle) channel.
-begin
-button = 1
-prog   = xine
-repeat = 0
-config = SpuPrior
-end
-
-# Select next audio channel.
-begin
-button = 9
-prog   = xine
-repeat = 0
-config = AudioChannelNext
-end
-
-# Select previous audio channel.
-begin
-button = 7
-prog   = xine
-repeat = 0
-config = AudioChannelPrior
-end
-
-
-
-# Up event.
-begin
-
-button = UP
-prog   = xine
-repeat = 8
-config = EventUp
-end
-
-# Down event.
-begin
-
-button = DOWN
-prog   = xine
-repeat = 8
-config = EventDown
-end
-
-# Left event.
-begin
-
-button = LEFT
-prog   = xine
-repeat = 8
-config = EventLeft
-end
-
-# Right event.
-begin
-
-button = RIGHT
-prog   = xine
-repeat = 8
-config = EventRight
-end
-
-# Select event.
-begin
-prog   = xine
-button = ok
-repeat = 8
-config = EventSelect
-end
-
-# Down Chapter
-begin
-
-button = CH_DOWN
-prog   = xine
-repeat = 8
-config = EventPrior
-end
-
-# Next Chapter.
-begin
-
-button = CH_UP
-prog   = xine
-repeat = 8
-config = EventNext
-end
-
-# menu.
-begin
-
-button = record
-prog   = xine
-repeat = 8
-config = RootMenu
-end
-
-# Toggle aspect ratio
-begin
-prog   = xine
-button = ASPECT
-repeat = 0
-config = ToggleAspectRatio
-end
-
-
-
-#######xmms
-begin xmms
-  begin
-    prog = xmms
-    button = PLAY
-    config = PLAY
-  end
-  begin
-    prog = xmms
-    button = clear
-    config = PLAYLIST_CLEAR
-  end
-  begin
-    prog = xmms
-    button = load
-    config = PLAYLIST_ADD .xmms/xmms.m3u
-   end
-  begin
-    prog = xmms
-    button = PAUSE
-    config = PAUSE
-  end
-  begin
-    prog = xmms
-    button = STOP
-    config = STOP
-  end
-  begin
-    prog = xmms
-    button = EXIT
-    config = QUIT
-    flags = mode
-  end
-
-  begin
-    prog = xmms
-    button = POWER
-    config = QUIT
-    flags = mode
-  end
-
-  begin
-    prog = xmms
-    button = CH_UP
-    config = NEXT
-  end
-  begin
-    prog = xmms
-    button = CH_DOWN
-    config = PREV
-  end
-  
-
-
-begin
-    prog = xmms
-    button = >>|
-    config = NEXT
-  end
-begin
-    prog = xmms
-    button = |<<
-    config = PREV
-end
-
-
-begin
-    prog = xmms
-    button = <<
-    config = FWD 10
-    repeat = 2
-  end
-  begin
-    prog = xmms
-    button = <<
-    config = BWD 10
-    repeat = 2
-  end
-  begin
-    prog = xmms
-    button = volup
-    config = VOL_UP 10
-    repeat = 2
-  end
-  begin
-    prog = xmms
-    button = voldown
-    config = VOL_DOWN 10
-    repeat = 2
-  end
-  begin
-    prog = xmms
-    button = 1
-    config = ONE
-  end
-  begin
-    prog = xmms
-    button = 2
-    config = TWO
-  end
-  begin
-    prog = xmms
-    button = 3
-    config = THREE
-  end
-  begin
-    prog = xmms
-    button = 4
-    config = FOUR
-  end
-  begin
-    prog = xmms
-    button = 5
-    config = FIVE
-  end
-  begin
-    prog = xmms
-    button = 6
-    config = SIX
-  end
-  begin
-    prog = xmms
-    button = 7
-    config = SEVEN
-  end
-  begin
-    prog = xmms
-    button = 8
-    config = EIGHT
-  end
-  begin
-    prog = xmms
-    button = 9
-    config = NINE
-  end
-  begin
-    prog = xmms
-    button = 0
-    config = ZERO
-  end
-  begin
-    prog = xmms
-    button = enter
-    config = SETPOS
-  end
-end xmms
-
-#
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/abs/mv-core/MythVantage-config/templates/remotes/MythVantage-one/preview.jpg b/abs/mv-core/MythVantage-config/templates/remotes/MythVantage-one/preview.jpg
deleted file mode 100644
index e2af610..0000000
--- a/abs/mv-core/MythVantage-config/templates/remotes/MythVantage-one/preview.jpg
+++ /dev/null
diff --git a/abs/mv-core/MythVantage-config/templates/remotes/RadioShack_15-2116-Jarod_Wilson/lircd-rs.conf b/abs/mv-core/MythVantage-config/templates/remotes/RadioShack_15-2116-Jarod_Wilson/lircd-rs.conf
deleted file mode 100644
index f8175f3..0000000
--- a/abs/mv-core/MythVantage-config/templates/remotes/RadioShack_15-2116-Jarod_Wilson/lircd-rs.conf
+++ /dev/null
@@ -1,87 +0,0 @@
-# this config file was generated
-# using lirc-0.7.0pre2(hauppauge) on Thu Jan  1 00:35:50 2004
-#
-# contributed by Jarod Wilson <jcw@wilsonet.com>
-#------------------------------------------------------------------------------
-#
-# filename:          RadioShack_15-2116-vcr0081.lirc
-# encoding:          RC-5
-# brand:             RadioShack Universal (and others)
-# model:             15-2116, set as VCR type 0081
-# supported devices: all
-#
-# note: requires quite a bit of key reassignment w/keymover and EFCs...
-# see http://wilsonet.com/mythtv/rs15-2116.html for HOWTO
-#
-#------------------------------------------------------------------------------
-
-begin remote
-  
-  name      rs15-2116-vcr0081
-  bits              11
-  flags     RC5|CONST_LENGTH
-  eps               20
-  aeps              0
-  header            0   0
-  one               889 889
-  zero              889 889
-  plead             889
-  ptrail            0
-  foot              0   0
-  repeat            0   0
-  pre_data_bits     2
-  pre_data          0x02
-  post_data_bits    0
-  post_data         0x0
-  pre               0   0
-  post              0   0
-  gap               113792
-  toggle_bit        2
-  frequency         36000
-  duty_cycle        50
-
-  begin codes
-        0           0x0000000000000140
-        1           0x0000000000000141
-        2           0x0000000000000142
-        3           0x0000000000000143
-        4           0x0000000000000144
-        5           0x0000000000000145
-        6           0x0000000000000146
-        7           0x0000000000000147
-        8           0x0000000000000148
-        9           0x0000000000000149
-        INFO        0x000000000000014a
-	SELECT      0x000000000000014b
-        POWER       0x000000000000014c
-        MUTE        0x000000000000014d
-        MOVE        0x000000000000014e
-        VOL+        0x0000000000000150
-        VOL-        0x0000000000000151
-        RIGHT       0x000000000000015a
-        LEFT        0x000000000000015b
-        ENTER       0x000000000000015c
-        MENU        0x000000000000015d
-        CH+         0x0000000000000160
-        CH-         0x0000000000000161
-        PIP         0x0000000000000162
-        SWAP        0x0000000000000163
-        SLEEP       0x0000000000000166
-        FREEZE      0x0000000000000168
-        PAUSE       0x0000000000000169
-        SKIP        0x000000000000016a
-        EXIT        0x0000000000000171
-        REW         0x0000000000000172
-        REPLAY      0x0000000000000173
-        FFWD        0x0000000000000174
-        PLAY        0x0000000000000175
-        STOP        0x0000000000000176
-        REC         0x0000000000000177
-        SKIP        0x0000000000000178
-        +100        0x0000000000000179
-        LAST        0x000000000000017b
-        GUIDE       0x000000000000017c
-        TV/VIDEO    0x000000000000017e
-  end codes
-
-end remote
diff --git a/abs/mv-core/MythVantage-config/templates/remotes/RadioShack_15-2116-Jarod_Wilson/lircrc-rs b/abs/mv-core/MythVantage-config/templates/remotes/RadioShack_15-2116-Jarod_Wilson/lircrc-rs
deleted file mode 100644
index 91c0de5..0000000
--- a/abs/mv-core/MythVantage-config/templates/remotes/RadioShack_15-2116-Jarod_Wilson/lircrc-rs
+++ /dev/null
@@ -1,539 +0,0 @@
-# ~/.mythtv/lircrc
-# 
-# MythTV native LIRC config file for
-# the RadioShack 15-2116, VCR type 0081
-# using Hauppauge IR receiver
-# 
-# By Jarod Wilson, 2003/12/31
-# Amalgamated from Harry O's
-# .lircrc, the mythtv.org docs, and
-# a few touches of my own. :)
-#
-
-# Channel Up
-begin
-prog = mythtv
-button = CH+
-repeat = 4
-config = Up
-end
-
-# Channel Down
-begin
-prog = mythtv
-button = CH-
-repeat = 4
-config = Down
-end
-
-# OK/Select
-begin
-prog = mythtv
-button = SELECT
-repeat = 4
-config = Return
-end
-
-# Play
-begin
-prog = mythtv
-button = PLAY
-repeat = 4
-config = Space
-end
-
-# Stop
-begin
-prog = mythtv
-button = STOP
-repeat = 4
-config = Esc
-end
-
-# Escape/Exit/Back
-begin
-prog = mythtv
-button = EXIT
-repeat = 4
-config = Esc
-end
-
-# Power Off/Exit
-begin
-prog = mythtv
-button = POWER
-repeat = 4
-config = Esc
-end
-
-# Pause
-begin
-prog = mythtv
-button = PAUSE
-repeat = 4
-config = P
-end
-
-# Mute
-begin
-prog = mythtv
-button = MUTE
-repeat = 4
-config = |
-end
-
-# Rewind (10 sec default)
-begin
-prog = mythtv
-button = REW
-repeat = 4
-config = Left
-end
-
-begin
-prog = mythtv
-button = LEFT
-repeat = 4
-config = Left
-end
-
-# Fast forward (30 sec default)
-begin
-prog = mythtv
-button = FFWD
-repeat = 4
-config = Right
-end
-
-begin
-prog = mythtv
-button = RIGHT
-repeat = 4
-config = Right
-end
-
-# Skip forward (10 min default)
-begin
-prog = mythtv
-button = FREEZE
-repeat = 4
-config = PgDown
-end
-
-# Skip backward (10 min default)
-begin
-prog = mythtv
-button = MOVE
-repeat = 4
-config = PgUp
-end
-
-# Record
-begin
-prog = mythtv
-button = REC
-repeat = 4
-config = R
-end
-
-# OSD browse
-begin
-prog = mythtv
-button = GUIDE
-repeat = 4
-config = O
-end
-
-# Display EPG while in live TV,
-# View selected show while in EPG
-begin
-prog = mythtv
-button = MENU
-repeat = 4
-config = M
-end
-
-# Bring up OSD info
-begin
-prog = mythtv
-button = INFO
-repeat = 4
-config = I
-end
-
-# Change display aspect ratio
-begin
-prog = mythtv
-button = +100
-repeat = 4
-config = W
-end
-
-# Seek to previous commercial cut point
-begin
-prog = mythtv
-button = SLEEP
-repeat = 4
-config = Q
-end
-
-# Seek to next commercial cut point
-begin
-prog = mythtv
-button = ENTER
-repeat = 4
-config = Z
-end
-
-# Change TV card input
-begin
-prog = mythtv
-button = TV/VIDEO
-repeat = 4
-config = C
-end
-
-# Toggle Picture-In-Picture
-begin
-prog = mythtv
-button = PIP
-repeat = 4
-config = V
-end
-
-# Swap PIP
-begin
-prog = mythtv
-button = SWAP
-repeat = 4
-config = N
-end
-
-# Cycle through channel history
-begin
-prog = mythtv
-button = LAST
-repeat = 4
-config = H
-end
-
-# Numbers 0-9
-
-begin
-prog = mythtv
-button = 0
-repeat = 4
-config = 0
-end
-
-begin
-prog = mythtv
-button = 1
-repeat = 4
-config = 1
-end
-
-begin
-prog = mythtv
-button = 2
-repeat = 4
-config = 2
-end
-
-begin
-prog = mythtv
-button = 3
-repeat = 4
-config = 3
-end
-
-begin
-prog = mythtv
-button = 4
-repeat = 4
-config = 4
-end
-
-begin
-prog = mythtv
-button = 5
-repeat = 4
-config = 5
-end
-
-begin
-prog = mythtv
-button = 6
-repeat = 4
-config = 6
-end
-
-begin
-prog = mythtv
-button = 7
-repeat = 4
-config = 7
-end
-
-begin
-prog = mythtv
-button = 8
-repeat = 4
-config = 8
-end
-
-begin
-prog = mythtv
-button = 9
-repeat = 4
-config = 9
-end
-
-### MPlayer commands
-
-begin
-prog = mplayer
-button = MENU
-repeat = 4
-config = osd
-end
-
-begin
-prog = mplayer
-button = PAUSE
-repeat = 4
-config = pause
-end
-
-begin
-prog = mplayer
-button = PLAY
-repeat = 4
-config = seek +1
-end
-
-begin
-prog = mplayer
-button = STOP
-repeat = 4
-config = quit
-end
-
-begin
-prog = mplayer
-button = MUTE
-repeat = 4
-config = mute
-end
-
-begin
-prog = mplayer
-button = REW
-repeat = 4
-config = seek -10
-end
-
-begin
-prog = mplayer
-button = LEFT
-repeat = 4
-config = seek -10
-end
-
-begin
-prog = mplayer
-button = FFWD
-repeat = 4
-config = seek +30
-end
-
-begin
-prog = mplayer
-button = RIGHT
-repeat = 4
-config = seek +30
-end
-
-begin
-prog = mplayer
-button = EXIT
-repeat = 4
-config = quit
-end
-
-begin
-prog = mplayer
-button = FREEZE
-repeat = 4
-config = seek +1200
-end
-
-begin
-prog = mplayer
-button = MOVE
-repeat = 4
-config = seek -1200
-end
-
-begin
-prog = mplayer
-button = +100
-repeat = 4
-config = vo_fullscreen
-end
-
-### Xine commands
-
-begin
-prog = xine
-button = PLAY
-repeat = 3
-config = Play
-end
-
-begin
-prog = xine
-button = STOP
-repeat = 3
-config = Stop
-end
-
-begin
-prog = xine
-button = POWER
-repeat = 3
-config = Quit
-end
-
-begin
-prog = xine
-button = EXIT
-repeat = 3
-config = Quit
-end
-
-begin
-prog = xine
-button = PAUSE
-repeat = 3
-config = Pause
-end
-
-begin
-prog = xine
-button = CH+
-repeat = 3
-config = EventUp
-end
-
-begin
-prog = xine
-button = CH-
-repeat = 3
-config = EventDown
-end
-
-begin
-prog = xine
-button = LEFT
-repeat = 3
-config = EventLeft
-end
-
-begin
-prog = xine
-button = RIGHT
-repeat = 3
-config = EventRight
-end
-
-begin
-prog = xine
-button = SELECT
-repeat = 3
-config = EventSelect
-end
-
-begin
-prog = xine
-button = GUIDE
-repeat = 3
-config = Menu
-end
-
-begin
-prog = xine
-button = FFWD
-repeat = 3
-config = SeekRelative+30
-end
-
-begin
-prog = xine
-button = REW
-repeat = 3
-config = SeekRelative-30
-end
-
-begin
-prog = xine
-button = VOL+
-repeat = 3
-config = Volume+
-end
-
-begin
-prog = xine
-button = VOL-
-repeat = 3
-config = Volume-
-end
-
-begin
-prog = xine
-button = MUTE
-repeat = 3
-config = Mute
-end
-
-begin
-prog = xine
-button = MENU
-repeat = 3
-config = RootMenu
-end
-
-begin
-prog = xine
-button = FREEZE
-repeat = 3
-config = EventNext
-end
-
-begin
-prog = xine
-button = LAST 
-repeat = 3
-config = EventPrior
-end
-
-begin
-prog = xine
-button = INFO
-repeat = 3
-config = OSDStreamInfos
-end
-
-begin
-prog = xine
-button = ENTER
-repeat = 3
-config = SpeedFaster
-end
-
-begin
-prog = xine
-button = SLEEP
-repeat = 3
-config = SpeedSlower
-end
diff --git a/abs/mv-core/MythVantage-config/templates/remotes/RadioShack_15-2116-Jarod_Wilson/preview.jpg b/abs/mv-core/MythVantage-config/templates/remotes/RadioShack_15-2116-Jarod_Wilson/preview.jpg
deleted file mode 100644
index d465839..0000000
--- a/abs/mv-core/MythVantage-config/templates/remotes/RadioShack_15-2116-Jarod_Wilson/preview.jpg
+++ /dev/null
diff --git a/abs/mv-core/MythVantage-config/templates/remotes/gr8zap/lircd.conf.streamzap b/abs/mv-core/MythVantage-config/templates/remotes/gr8zap/lircd.conf.streamzap
deleted file mode 100644
index 8e453b9..0000000
--- a/abs/mv-core/MythVantage-config/templates/remotes/gr8zap/lircd.conf.streamzap
+++ /dev/null
@@ -1,69 +0,0 @@
-#
-# this config file was automatically generated
-# using lirc-0.7.1-CVS(serial) on Fri Feb  4 23:20:56 2005
-#
-# contributed by Christoph Bartelmus
-#
-# brand:                       Streamzap
-# model no. of remote control: PC Remote
-# devices being controlled by this remote: USB receiver
-#
-
-begin remote
-
-  name  Streamzap_PC_Remote
-  bits            6
-  flags RC5|CONST_LENGTH
-  eps            30
-  aeps          100
-
-  one           889  889
-  zero          889  889
-  plead         889
-  pre_data_bits   8
-  pre_data       0xA3
-  gap          108344
-  toggle_bit      2
-
-
-      begin codes
-          0                        0x00
-          1                        0x01
-          2                        0x02
-          3                        0x03
-          4                        0x04
-          5                        0x05
-          6                        0x06
-          7                        0x07
-          8                        0x08
-          9                        0x09
-          POWER                    0x0A
-          MUTE                     0x0B
-          CH_UP                    0x0C
-          VOL_UP                   0x0D
-          CH_DOWN                  0x0E
-          VOL_DOWN                 0x0F
-          UP                       0x10
-          LEFT                     0x11
-          OK                       0x12
-          RIGHT                    0x13
-          DOWN                     0x14
-          MENU                     0x15
-          EXIT                     0x16
-          PLAY                     0x17
-          PAUSE                    0x18
-          STOP                     0x19
-          |<<                      0x1A
-          >>|                      0x1B
-          RECORD                   0x1C
-          <<                       0x1D
-          >>                       0x1E
-          RED                      0x20
-          GREEN                    0x21
-          YELLOW                   0x22
-          BLUE                     0x23
-      end codes
-
-end remote
-
-
diff --git a/abs/mv-core/MythVantage-config/templates/remotes/gr8zap/lircrc b/abs/mv-core/MythVantage-config/templates/remotes/gr8zap/lircrc
deleted file mode 100644
index 6f86bfe..0000000
--- a/abs/mv-core/MythVantage-config/templates/remotes/gr8zap/lircrc
+++ /dev/null
@@ -1,472 +0,0 @@
-# StreamZap Remote
-# 'config' must either be a literal key, e.g. 'config = l' or must
-# refer to a defined key in MythTV, e.g. 'config = PLAY'
-begin
-   prog = mythtv
-   button = 0
-   config = 0
-end
-
-begin
-   prog = mythtv
-   button = 1
-   config = 1
-end
-
-begin
-   prog = mythtv
-   button = 2
-   config = 2
-end
-
-begin
-   prog = mythtv
-   button = 3
-   config = 3
-end
-
-begin
-   prog = mythtv
-   button = 4
-   config = 4
-end
-
-begin
-   prog = mythtv
-   button = 5
-   config = 5
-end
-
-begin
-   prog = mythtv
-   button = 6
-   config = 6
-end
-
-begin
-   prog = mythtv
-   button = 7
-   config = 7
-end
-
-begin
-   prog = mythtv
-   button = 8
-   config = 8
-end
-
-begin
-   prog = mythtv
-   button = 9
-   config = 9
-end
-
-begin
-   prog = mythtv
-   button = POWER
-   config = Esc
-end
-
-# ???
-begin
-   prog = mythtv
-   button = MUTE
-   config = F9
-end
-
-begin
-   prog = mythtv
-   button = CH_UP
-   repeat = 3
-   config = Up
-end
-
-begin
-   prog = mythtv
-   button = VOL_UP
-   repeat = 3
-   config = ]
-end
-
-begin
-   prog = mythtv
-   button = CH_DOWN
-   repeat = 3
-   config = Down
-end
-
-begin
-   prog = mythtv
-   button = VOL_DOWN
-   repeat = 3
-   config = [
-end
-
-begin
-   prog = mythtv
-   button = UP
-   repeat = 3
-   config = Up
-end
-
-begin
-   prog = mythtv
-   button = LEFT
-# navigates, or skips back during playback or live tv.
-   config = Left
-end
-
-begin
-   prog = mythtv
-   button = OK
-   config = Return
-end
-
-begin
-   prog = mythtv
-   button = RIGHT
-# navigates, or skips forwards during playback or live tv. 
-   config = Right
-end
-
-begin
-   prog = mythtv
-   button = DOWN
-   repeat = 3
-   config = Down
-end
-
-begin
-   prog = mythtv
-   button = MENU
-   config = m
-end
-
-begin
-   prog = mythtv
-   button = EXIT
-   config = Esc
-end
-
-begin
-   prog = mythtv
-   button = PLAY
-   config = l
-end
-
-begin
-   prog = mythtv
-   button = PAUSE
-   config = p
-end
-
-begin
-   prog = mythtv
-   button = STOP
-   config = Esc
-end
-
-begin
-   prog = mythtv
-   # skip backward
-   button = |<<
-   config = PgUp
-end
-
-begin
-   prog = mythtv
-   # skip forward
-   button = >>|
-   config = PgDown
-end
-
-begin
-   prog = mythtv
-   button = RECORD
-   config = r
-end
-
-begin
-   prog = mythtv
-   # rewind
-   button = <<
-   config = <
-end
-
-begin
-   prog = mythtv
-   # fast forward
-   button = >>
-   config = >
-end
-
-begin
-   prog = mythtv
-   button = RED
-   # Delete
-   config = z
-end
-
-begin
-   prog = mythtv
-   button = GREEN
-   # Info
-   config = i
-end
-
-begin
-   prog = mythtv
-   button = YELLOW
-   # change aspect ratio
-   config = w
-end
-
-begin
-   prog = mythtv
-   button = BLUE
-   config = Tab
-end
-
-# MPLAYER
-begin
-   prog = mplayer
-   button = POWER
-   config = quit
-end
-
-begin
-   prog = mplayer
-   button = MUTE
-   config = mute
-end
-
-begin
-   prog = mplayer
-   button = VOL_UP
-   repeat = 3
-   config = volume +1
-end
-
-begin
-   prog = mplayer
-   button = VOL_DOWN
-   repeat = 3
-   config = volume -1
-end
-
-begin
-   prog = mplayer
-   button = UP
-   repeat = 3
-   config = seek +10
-end
-
-begin
-   prog = mplayer
-   button = LEFT
-# navigates, or skips back during playback or live tv.
-   config = seek -30
-end
-
-begin
-   prog = mplayer
-   button = RIGHT
-# navigates, or skips forwards during playback or live tv. 
-   config = seek +60
-end
-
-begin
-   prog = mplayer
-   button = DOWN
-   repeat = 3
-   config = seek -10
-end
-
-begin
-   prog = mplayer
-   button = EXIT
-   config = quit
-end
-
-begin
-   prog = mplayer
-   button = play
-   config = speed_set 1.0
-end
-
-begin
-    prog = mplayer
-    button = pause
-    config = pause
-end
-
-begin
-   prog = mplayer
-   button = STOP
-   config = quit
-end
-
-begin
-   prog = mplayer
-   # skip backward
-   button = |<<
-   config = seek -600
-end
-
-begin
-   prog = mplayer
-   # skip forward
-   button = >>|
-   config = seek +600
-end
-
-begin
-   prog = mplayer
-   # slow forward
-   button = <<
-   config = speed_mult 0.5
-end
-
-begin
-   prog = mplayer
-   # fast forward
-   button = >>
-   config = speed_mult 2.0
-end
-
-### Xine lirc setup By AnDy!
-
-begin
-prog = xine
-button = PLAY
-repeat = 3
-config = Play
-end
-
-begin
-prog = xine
-button = STOP
-repeat = 3
-config = Stop
-end
-
-begin
-prog = xine
-button = PAUSE
-repeat = 3
-config = Pause
-end
-
-begin
-prog = xine
-button = UP
-repeat = 3
-config = EventUp
-end
-
-begin
-prog = xine
-button = DOWN
-repeat = 3
-config = EventDown
-end
-
-begin
-prog = xine
-button = LEFT
-repeat = 3
-config = EventLeft
-end
-
-begin
-prog = xine
-button = RIGHT
-repeat = 3
-config = EventRight
-end
-
-begin
-prog = xine
-button = OK
-repeat = 3
-config = EventSelect
-end
-
-begin
-prog = xine
-button = EXIT
-repeat = 3
-config = Menu
-end
-
-begin
-prog = xine
-button = >>
-repeat = 3
-#config = SpeedFaster
-config = SeekRelative+60
-end
-
-begin
-prog = xine
-button = <<
-repeat = 3
-#config = SpeedSlower
-config = SeekRelative-60
-end
-
-begin
-prog = xine
-button = VOL_UP
-repeat = 3
-config = Volume+
-end
-
-begin
-prog = xine
-button = VOL_DOWN
-repeat = 3
-config = Volume-
-end
-
-begin
-prog = xine
-button = MUTE
-repeat = 3
-config = Mute
-end
-
-begin
-prog = xine
-button = MENU
-repeat = 3
-config = RootMenu
-end
-
-begin
-prog = xine
-button = >>|
-repeat = 3
-config = EventNext
-end
-
-begin
-prog = xine
-button = |<<
-repeat = 3
-config = EventPrior
-end
-
-begin
-prog = xine
-button = GREEN
-repeat = 3
-config = OSDStreamInfos
-end
-
-begin
-prog = xine
-button = POWER
-repeat = 3
-config = Quit
-end
diff --git a/abs/mv-core/MythVantage-config/templates/remotes/gr8zap/preview.jpg b/abs/mv-core/MythVantage-config/templates/remotes/gr8zap/preview.jpg
deleted file mode 100644
index 4d1a5fe..0000000
--- a/abs/mv-core/MythVantage-config/templates/remotes/gr8zap/preview.jpg
+++ /dev/null
diff --git a/abs/mv-core/MythVantage-config/templates/remotes/hauppauge/lircd.conf.hauppauge b/abs/mv-core/MythVantage-config/templates/remotes/hauppauge/lircd.conf.hauppauge
deleted file mode 100644
index 4987807..0000000
--- a/abs/mv-core/MythVantage-config/templates/remotes/hauppauge/lircd.conf.hauppauge
+++ /dev/null
@@ -1,274 +0,0 @@
-#
-# this config file was automatically generated
-# using lirc-0.5.5pre8 on Sun Apr 18 11:43:45 1999
-#
-# contributed by Jens Leuschner <leuschner@gmx.net>
-#
-# brand:             Hauppauge
-# model:             
-# supported devices: WinTV primo; WinTV pci; WinTV radio
-#
-# This config file will work with both homebrew receivers and 
-# original Hauppauge TV cards !!!
-#
-
-begin remote
-
-  name  Hauppauge
-  bits           13
-  flags SHIFT_ENC
-  eps            30
-  aeps          100
-
-  one           950   830
-  zero          950   830
-  plead         960
-  gap          89584
-  repeat_bit      2
-
-      begin codes
-          TV                       0x000000000000100F
-          RADIO                    0x000000000000100C
-          FULL_SCREEN              0x000000000000102E
-          CH+                      0x0000000000001020
-          CH-                      0x0000000000001021
-          VOL-                     0x0000000000001011
-          VOL+                     0x0000000000001010
-          MUTE                     0x000000000000100D
-          SOURCE                   0x0000000000001022
-          1                        0x0000000000001001
-          2                        0x0000000000001002
-          3                        0x0000000000001003
-          4                        0x0000000000001004
-          5                        0x0000000000001005
-          6                        0x0000000000001006
-          7                        0x0000000000001007
-          8                        0x0000000000001008
-          9                        0x0000000000001009
-          0                        0x0000000000001000
-          RESERVED                 0x000000000000101E
-          MINIMIZE                 0x0000000000001026
-      end codes
-
-end remote
-
-
-#
-# this config file was automatically generated
-# using lirc-0.6.6(animax) on Tue Apr 15 19:50:27 2003
-#
-# contributed by 
-#
-# brand: 				Hauppauge
-# model no. of remote control: 
-# devices being controlled by this remote: PVR 2/350
-#
-
-begin remote
-
-  name  hauppauge_pvr
-  bits           13
-  flags RC5|CONST_LENGTH
-  eps            30
-  aeps          100
-
-  one           969   811
-  zero          969   811
-  plead        1097
-  gap          114605
-  toggle_bit      2
-
-
-      begin codes
-          Power                    0x00000000000017FD
-          Go                       0x00000000000017FB
-          1                        0x00000000000017C1
-          2                        0x00000000000017C2
-          3                        0x00000000000017C3
-          4                        0x00000000000017C4
-          5                        0x00000000000017C5
-          6                        0x00000000000017C6
-          7                        0x00000000000017C7
-          8                        0x00000000000017C8
-          9                        0x00000000000017C9
-          Back/Exit                0x00000000000017DF
-          0                        0x00000000000017C0
-          Menu                     0x00000000000017CD
-          Red                      0x00000000000017CB
-          Green                    0x00000000000017EE
-          Yellow                   0x00000000000017F8
-          Blue                     0x00000000000017E9
-          Ch+                      0x00000000000017E0
-          Ch-                      0x00000000000017E1
-          Vol-                     0x00000000000017D1
-          Vol+                     0x00000000000017D0
-          Ok                       0x00000000000017E5
-          Mute                     0x00000000000017CF
-          Blank                    0x00000000000017CC
-          Full                     0x00000000000017FC
-          Rewind                   0x00000000000017F2
-          Play                     0x00000000000017F5
-          Forward                  0x00000000000017F4
-          Record                   0x00000000000017F7
-          Stop                     0x00000000000017F6
-          Pause                    0x00000000000017F0
-          Replay                   0x00000000000017E4
-          Skip                     0x00000000000017DE
-      end codes
-
-end remote
-
-
-#
-# this config file was automatically generated
-# using lirc-0.7.0(any) on Sun Nov 28 20:25:09 2004
-#
-# contributed by 
-#
-# brand:   Hauppauge 350
-# Created: G.J. Werler (The Netherlands)
-# Project: Mythtv Fedora Pundit-R www.mythtvportal.com
-# Date:    2004/11/28
-# model no. of remote control: Hauppauge A415-HPG
-# devices being controlled by this remote: PVR-350
-#
-
-begin remote
-
-  name  Hauppauge_350
-  bits           13
-  flags RC5|CONST_LENGTH
-  eps            30
-  aeps          100
-
-  one           969   811
-  zero          969   811
-  plead        1097
-  gap          114605
-  toggle_bit      2
-
-
-      begin codes
-          Go                       0x00000000000017BB
-          Power                    0x00000000000017BD
-          TV                       0x000000000000179C
-          Videos                   0x0000000000001798
-          Music                    0x0000000000001799
-          Pictures                 0x000000000000179A
-          Guide                    0x000000000000179B
-          Radio                    0x000000000000178C
-          Up                       0x0000000000001794
-          Left                     0x0000000000001796
-          Right                    0x0000000000001797
-          Down                     0x0000000000001795
-          OK                       0x00000000000017A5
-          Back/Exit                0x000000000000179F
-          Menu/i                   0x000000000000178D
-          Vol+                     0x0000000000001790
-          Vol-                     0x0000000000001791
-          Prev.Ch                  0x0000000000001792
-          Mute                     0x000000000000178F
-          Ch+                      0x00000000000017A0
-          Ch-                      0x00000000000017A1
-          Record                   0x00000000000017B7
-          Stop                     0x00000000000017B6
-          Rewind                   0x00000000000017B2
-          Play                     0x00000000000017B5
-          Forward                  0x00000000000017B4
-          Replay/SkipBackward      0x00000000000017A4
-          Pause                    0x00000000000017B0
-          SkipForward              0x000000000000179E
-          1                        0x0000000000001781
-          2                        0x0000000000001782
-          3                        0x0000000000001783
-          4                        0x0000000000001784
-          5                        0x0000000000001785
-          6                        0x0000000000001786
-          7                        0x0000000000001787
-          8                        0x0000000000001788
-          9                        0x0000000000001789
-          Asterix                  0x000000000000178A
-          0                        0x0000000000001780
-          #                        0x000000000000178E
-          Red                      0x000000000000178B
-          Green                    0x00000000000017AE
-          Yellow                   0x00000000000017B8
-          Blue                     0x00000000000017A9
-      end codes
-
-end remote
-#
-# this config file was automatically generated
-# using lirc-0.7.0pre4(serial) on Sun Oct  2 00:24:32 2005
-#
-# contributed by anton|ganthaler.at and juergen.wilhelm|aon.at
-# members of linux user group Vorarlberg www.lugv.at
-# 
-# for ir remote controler from Hauppauge WinTV Nexus-S
-# most of the keys are supported
-#
-# brand:                       Hauppauge
-# model no. of remote control: WinTV Nexus-S
-# devices being controlled by this remote:
-#
-
-begin remote
-
-  name  Hauppauge_WinTV_Nexus-S
-  bits           13
-  flags RC5|CONST_LENGTH
-  eps            30
-  aeps          100
-
-  one           944   828
-  zero          944   828
-  plead         980
-  gap          113932
-  min_repeat      1
-  toggle_bit      2
-
-
-      begin codes
-          Up                       0x0000000000001794
-          Down                     0x0000000000001795
-          Left                     0x0000000000001796
-          Right                    0x0000000000001797
-          Power                    0x00000000000017BD
-          Ok                       0x00000000000017A5
-          Menu                     0x000000000000178D
-          Back                     0x000000000000179F
-          Red                      0x000000000000178B
-          Green                    0x00000000000017AE
-          Yellow                   0x00000000000017B8
-          Blue                     0x00000000000017A9
-          0                        0x0000000000001780
-          1                        0x0000000000001781
-          2                        0x0000000000001782
-          3                        0x0000000000001783
-          4                        0x0000000000001784
-          5                        0x0000000000001785
-          6                        0x0000000000001786
-          7                        0x0000000000001787
-          8                        0x0000000000001788
-          9                        0x0000000000001789
-          Play                     0x00000000000017B5
-          Pause                    0x00000000000017B0
-          Stop                     0x00000000000017B6
-          Record                   0x00000000000017B7
-          FastFwd                  0x00000000000017B4
-          FastRwd                  0x00000000000017B2
-          Channel+                 0x00000000000017A0
-          Channel-                 0x00000000000017A1
-          Volume+                  0x0000000000001790
-          Volume-                  0x0000000000001791
-          Mute                     0x000000000000178F
-          Timers                   0x000000000000178A
-          Recordings               0x000000000000178E
-          Back                     0x000000000000179F
-          Record                   0x00000000000017B7
-          Pause                    0x00000000000017B0
-      end codes
-
-end remote
-
-
diff --git a/abs/mv-core/MythVantage-config/templates/remotes/hauppauge/lircmd.conf.hauppauge b/abs/mv-core/MythVantage-config/templates/remotes/hauppauge/lircmd.conf.hauppauge
deleted file mode 100644
index d0f36e8..0000000
--- a/abs/mv-core/MythVantage-config/templates/remotes/hauppauge/lircmd.conf.hauppauge
+++ /dev/null
@@ -1,33 +0,0 @@
-# 
-# lircmd config file
-# 
-
-PROTOCOL IntelliMouse
-
-# ACCELERATOR start max multiplier
-
-ACCELERATOR 2 30 5
-
-ACTIVATE * RESERVED
-
-MOVE_N  * 2
-MOVE_NE * 3
-MOVE_E  * 6
-MOVE_SE * 9
-MOVE_S  * 8
-MOVE_SW * 7
-MOVE_W  * 4
-MOVE_NW * 1
-MOVE_IN * CH+
-MOVE_OUT * CH-
-
-BUTTON1_TOGGLE * 5
-BUTTON1_TOGGLE * RADIO
-BUTTON2_TOGGLE * VOL+
-BUTTON3_TOGGLE * SOURCE
-
-BUTTON1_CLICK * TV
-BUTTON1_CLICK * VOL-
-BUTTON3_CLICK * MUTE
-
-# BUTTONx_CLICK, BUTTONx_UP, BUTTONx_DOWN are also possible
diff --git a/abs/mv-core/MythVantage-config/templates/remotes/hauppauge/preview.jpg b/abs/mv-core/MythVantage-config/templates/remotes/hauppauge/preview.jpg
deleted file mode 100644
index a40a1e8..0000000
--- a/abs/mv-core/MythVantage-config/templates/remotes/hauppauge/preview.jpg
+++ /dev/null
diff --git a/abs/mv-core/MythVantage-config/templates/remotes/i2c.id b/abs/mv-core/MythVantage-config/templates/remotes/i2c.id
deleted file mode 100644
index 50e89e9..0000000
--- a/abs/mv-core/MythVantage-config/templates/remotes/i2c.id
+++ /dev/null
@@ -1,5 +0,0 @@
-0070:4000|Hauppauge|WinTV PVR 250|hauppauge-grey
-0070:4009|Hauppauge|WinTV PVR 250|hauppauge-grey
-0070:4801|Hauppauge|WinTV PVR 250|hauppauge-grey
-0070:4803|Hauppauge|WinTV PVR 250|hauppauge-grey
-0070:0003|Hauppauge|WinTV PVR 250|hauppauge-grey
\ No newline at end of file
diff --git a/abs/mv-core/MythVantage-config/templates/remotes/imon-pad/lircd.conf b/abs/mv-core/MythVantage-config/templates/remotes/imon-pad/lircd.conf
deleted file mode 100644
index 97bbf4c..0000000
--- a/abs/mv-core/MythVantage-config/templates/remotes/imon-pad/lircd.conf
+++ /dev/null
@@ -1,88 +0,0 @@
-# Please make this file available to others

-# by sending it to <lirc@bartelmus.de>

-#

-# this config file was automatically generated

-# using lirc-0.8.0(imon_pad) on Mon Jan 23 20:22:11 2006
-#

-# contributed by M.Brakemeier
-#

-# brand:                       SoundGraph
-# model no. of remote control: iMON-PAD

-# devices being controlled by this remote:

-#

-

-begin remote

-

-  name     iMON-PAD

-  bits           32

-  eps            30

-  aeps          100

-

-  one             0     0

-  zero            0     0

-  gap          235965

-  min_repeat      1

-  toggle_bit      0

-

-      begin codes

-          AppExit                  0x288195B7

-        Power                    0x289115B7
-          Record                   0x298115B7

-          Play                     0x2A8115B7

-	  Open			   0x29B1d5B7
-          Rewind                   0x2A8195B7

-          Pause                    0x2A9115B7

-          FastForward              0x2B8115B7

-          PrevChapter              0x2B9115B7

-          Stop                     0x2B9715B7

-          NextChapter              0x298195B7

-          Esc                      0x2BB715B7

-          Eject                    0x299395B7

-          AppLauncher              0x29B715B7

-          MultiMon                 0x2AB195B7

-          TaskSwitcher             0x2A9395B7

-          Mute                     0x2B9595B7

-          Vol+                     0x28A395B7

-          Vol-                     0x28A595B7

-          Ch+                      0x289395B7

-          Ch-                      0x288795B7

-          Timer                    0x2B8395B7

-          1                        0x28B595B7

-          2                        0x2BB195B7

-          3                        0x28B195B7

-          4                        0x2A8595B7

-          5                        0x299595B7

-          6                        0x2AA595B7

-          7                        0x2B9395B7

-          8                        0x2A8515B7

-          9                        0x2AA115B7

-          0                        0x2BA595B7

-          ShiftTab                 0x28B515B7

-          Tab                      0x29A115B7

-        Red                      0x2B8515B7 # MyMovie
-        Green                    0x299195B7 # MyMusic
-        Blue                     0x2BA115B7 # MyPhoto
-        Yellow                   0x28A515B7 # MyTV
-          Bookmark                 0x288515B7

-          Thumbnail                0x2AB715B7

-          AspectRatio              0x29A595B7

-          FullScreen               0x2AA395B7

-        Purple                   0x29A295B7 # MyDVD
-          Menu                     0x2BA385B7

-          Caption                  0x298595B7

-          Language                 0x2B8595B7

-          MouseKeyboard            0x299115B7

-          SelectSpace              0x2A9315B7

-          MouseMenu                0x28B715B7

-          MouseRightClick          0x688481B7

-          Enter                    0x28A195B7

-          MouseLeftClick           0x688301B7

-          WindowsKey               0x2B8195B7

-          Backspace                0x28A115B7

-        Mouse_N                  0x690281B7
-        Mouse_S                  0x688291B7
-        Mouse_W                  0x6A8281B7
-        Mouse_E                  0x688A81B7
-      end codes

-

-end remote 

diff --git a/abs/mv-core/MythVantage-config/templates/remotes/imon-pad/lircrc b/abs/mv-core/MythVantage-config/templates/remotes/imon-pad/lircrc
deleted file mode 100644
index 3ad34d8..0000000
--- a/abs/mv-core/MythVantage-config/templates/remotes/imon-pad/lircrc
+++ /dev/null
@@ -1,240 +0,0 @@
-###################################
-# lircrc config as used by Stev391 June 2007
-# Not all of the buttons are configured yet, only the commonly used buttons
-###################################
-
-# Escape
-begin
-    prog = mythtv
-    button = AppExit
-    config = Esc
-    repeat = 3
-end
-
-# Escape Key 2
-begin
-    prog = mythtv
-    button = Esc
-    config = Esc
-end
-
-# Channel Up
-begin
-    prog   = mythtv
-    button = Ch+
-    config = Up
-    repeat = 3
-end
-
-# Channel Down
-begin
-    prog   = mythtv
-    button = Ch-
-    config = Down
-    repeat = 3
-end
-
-# Volume Up
-begin
-    prog = mythtv
-    button = Vol+
-    repeat = 3
-    config = Right
-end
-
-# Volume Down
-begin
-    prog = mythtv
-    button = Vol-
-    repeat = 3
-    config = Left
-end
-
-# Enter/Return
-begin
-    prog   = mythtv
-    button = Enter
-    config = Return
-end
-
-# Menu Button
-begin
-    prog = mythtv
-    button = Menu
-    config = M
-end
-
-# Mute
-begin
-    prog = mythtv
-    button = Mute
-    config = F9  
-end
-
-# Rewind
-begin
-    prog = mythtv
-    button = Rewind
-    config = PgUp  
-end
-
-# Fast Forward
-begin
-    prog = mythtv
-    button = FastForward
-    config = PgDown  
-end
-
-# Play
-begin
-    prog = mythtv
-    button = Play
-    config = P  
-end
-
-# Pause
-begin
-    prog = mythtv
-    button = Pause
-    config = P  
-end
-
-# Record
-begin
-  prog = mythtv
-  button = Record
-  config = R  
-end
-
-# Stop
-begin
-   prog = mythtv
-   button = Stop
-   config = O  
-end
-
-# Previous Track/Chapter
-begin
-   prog = mythtv
-   button = PrevChapter
-   config = Home  
-end
-
-# Next Track/Chapter
-begin
-   prog = mythtv
-   button = NextChapter
-   config = End
-end
-
-# Jump Point to MythVideo
-begin
-   prog = mythtv
-   button = MyMovie
-   config = F12
-end
-
-# Jump Point to MythMusic
-begin
-   prog = mythtv
-   button = MyMusic
-   config = F11
-end
-
-# Jump Point to LiveTV
-begin
-   prog = mythtv
-   button = MyTV
-   config = F10
-end
-
-# Jump Point to Main Menu
-begin
-   prog = mythtv
-   button = Multimon
-   config = F2
-end
-
-# Jump Point to Myth Gallery
-begin
-   prog = mythtv
-   button = MyPhoto
-   config = F3
-end
-
-# Jump Point to Play DVD
-begin
-   prog = mythtv
-   button = MyDVD
-   config = F4
-end
-
-# Display Information
-begin
-   prog = mythtv
-   button = Caption
-   config = I
-end
-
-##############################
-# Numbers
-##############################
-begin
-    prog = mythtv
-    button = 0
-    config = 0  
-end
-
-begin
-    prog = mythtv
-    button = 1
-    config = 1  
-end
-
-begin
-    prog = mythtv
-    button = 2
-    config = 2  
-end
-
-begin
-    prog = mythtv
-    button = 3
-    config = 3  
-end
-
-begin
-    prog = mythtv
-    button = 4
-    config = 4  
-end
-
-begin
-    prog = mythtv
-    button = 5
-    config = 5  
-end
-
-begin
-    prog = mythtv
-    button = 6
-    config = 6  
-end
-
-begin
-    prog = mythtv
-    button = 7
-    config = 7  
-end
-
-begin
-    prog = mythtv
-    button = 8
-    config = 8  
-end
-
-begin
-    prog = mythtv
-    button = 9
-    config = 9  
-end
diff --git a/abs/mv-core/MythVantage-config/templates/remotes/imon-pad/preview.jpg b/abs/mv-core/MythVantage-config/templates/remotes/imon-pad/preview.jpg
deleted file mode 100644
index 47368c5..0000000
--- a/abs/mv-core/MythVantage-config/templates/remotes/imon-pad/preview.jpg
+++ /dev/null
diff --git a/abs/mv-core/MythVantage-config/templates/remotes/mceusb/lircd-mceusb.conf b/abs/mv-core/MythVantage-config/templates/remotes/mceusb/lircd-mceusb.conf
deleted file mode 100644
index ec3b73e..0000000
--- a/abs/mv-core/MythVantage-config/templates/remotes/mceusb/lircd-mceusb.conf
+++ /dev/null
@@ -1,88 +0,0 @@
-#
-# RC-6 config file
-#
-# source: http://home.hccnet.nl/m.majoor/projects__remote_control.htm
-#         http://home.hccnet.nl/m.majoor/pronto.pdf
-#
-# used by: Philips
-#
-#########
-#
-# Philips Media Center Edition remote control
-# For use with the USB MCE ir receiver
-#
-# Dan Conti  dconti|acm.wwu.edu
-#
-# Radio, Print, RecTV are only available on the HP Media Center remote control
-#
-
-begin remote
-
-  name mceusb
-  bits           16
-  flags RC6|CONST_LENGTH
-  eps            30
-  aeps          100
-
-  header       2667   889
-  one           444   444
-  zero          444   444
-  pre_data_bits 21
-  pre_data      0x37FF0
-  gap          105000
-  toggle_bit     22
-  rc6_mask     0x100000000
-
-
-      begin codes
-
-# starts at af
-        Radio    0x00007baf
-        Print    0x00007bb1
-        Videos   0x00007bb5
-        Pictures 0x00007bb6
-        RecTV    0x00007bb7
-        Music    0x00007bb8
-        TV       0x00007bb9
-# no ba - d8
-        Guide    0x00007bd9
-        LiveTV   0x00007bda
-        DVD      0x00007bdb
-        Back     0x00007bdc
-        OK       0x00007bdd
-        Right    0x00007bde
-        Left     0x00007bdf
-        Down     0x00007be0
-        Up       0x00007be1
-# no e2,e3
-        Replay   0x00007be4
-        Skip     0x00007be5
-        Stop     0x00007be6
-        Pause    0x00007be7
-        Record   0x00007be8
-        Play     0x00007be9
-        Rewind   0x00007bea
-        Forward  0x00007beb
-        ChanDown 0x00007bec
-        ChanUp   0x00007bed
-        VolDown  0x00007bee
-        VolUp    0x00007bef
-        More     0x00007bf0
-        Mute     0x00007bf1
-        Home     0x00007bf2
-        Power    0x00007bf3
-        Enter    0x00007bf4
-        Clear    0x00007bf5
-        Nine     0x00007bf6
-        Eight    0x00007bf7
-        Seven    0x00007bf8
-        Six      0x00007bf9
-        Five     0x00007bfa
-        Four     0x00007bfb
-        Three    0x00007bfc
-        Two      0x00007bfd
-        One      0x00007bfe
-        Zero     0x00007bff
-      end codes
-
-end remote
diff --git a/abs/mv-core/MythVantage-config/templates/remotes/mceusb/lircrc-mceusb b/abs/mv-core/MythVantage-config/templates/remotes/mceusb/lircrc-mceusb
deleted file mode 100644
index 3738bfa..0000000
--- a/abs/mv-core/MythVantage-config/templates/remotes/mceusb/lircrc-mceusb
+++ /dev/null
@@ -1,393 +0,0 @@
-# lircrc.mceusb
-
-###################
-#
-#  MythTV
-#
-###################
-begin
-    prog = mythtv
-    button = One
-    config = 1  
-end
-
-begin
-    prog = mythtv
-    button = Two
-    config = 2  
-end
-
-begin
-    prog = mythtv
-    button = Three
-    config = 3  
-end
-
-begin
-    prog = mythtv
-    button = Four
-    config = 4  
-end
-
-begin
-    prog = mythtv
-    button = Five
-    config = 5  
-end
-
-begin
-    prog = mythtv
-    button = Six
-    config = 6  
-end
-
-begin
-    prog = mythtv
-    button = Seven
-    config = 7  
-end
-
-begin
-    prog = mythtv
-    button = Eight
-    config = 8  
-end
-
-begin
-    prog = mythtv
-    button = Nine
-    config = 9  
-end
-
-begin
-    prog = mythtv
-    button = Zero
-    config = 0  
-end
-
-begin
-    prog = mythtv
-    button = Back
-    config = Esc
-end
-
-begin
-    prog = mythtv
-    button = Guide
-    config = M  
-end
-
-begin
-   prog = mythtv
-   button = More
-   config = I  
-end
-
-begin
-  prog = mythtv
-  button = VolDown
-  config = F10  
-end
-
-begin
-  prog = mythtv
-  button = VolUp
-  config = F11  
-end
-
-begin
-    prog = mythtv
-    button = Up
-    config = Up
-end
-
-begin
-    prog = mythtv
-    button = Down
-    config = Down
-end
-
-begin
-    prog = mythtv
-    button = Left
-    config = Left
-end
-
-begin
-    prog = mythtv
-    button = Right
-    config = Right
-end
-
-begin
-    prog = mythtv
-    button = Play
-    config = Return
-end
-
-begin
-    prog = mythtv
-    button = OK
-    config = Return
-end
-
-begin
-    prog = mythtv
-    button = Mute
-    config = |  
-end
-
-begin
-    prog = mythtv
-    button = Rewind
-    config = Left  
-end
-
-begin
-    prog = mythtv
-    button = Forward
-    config = Right  
-end
-
-begin
-  prog = mythtv
-  button = Record
-  config = R  
-end
-
-begin
-   prog = mythtv
-   button = Stop
-   config = O  
-end
-
-begin
-    prog = mythtv
-    button = Pause
-    config = P  
-end
-
-# Use for backwards commercial skip
-begin
-   prog = mythtv
-   button = Replay
-   config = Q  
-end
-
-# Use for forward commercial skip
-begin
-   prog = mythtv
-   button = Skip
-   config = Z  
-end
-
-
-###################
-#
-#  MPlayer
-#
-###################
-begin
-   prog = mplayer
-   button = Stop
-   config = quit
-end
-
-begin
-   prog = mplayer
-   button = Play
-   config = seek +1
-end
-		   
-begin
-   prog = mplayer
-   button = More
-   config = osd
-end
-			      
-begin
-   prog = mplayer
-   button = Replay
-   config = seek -10
-   repeat = 1
-end
-							     
-begin
-   prog = mplayer
-   button = Skip
-   config = seek +10
-   repeat = 1
-end
-
-begin
-   prog = mplayer
-   button = Rewind
-   config = seek -30
-   repeat = 1
-end
-
-begin
-   prog = mplayer
-   button = Forward
-   config = seek +30
-   repeat = 1
-end
-
-begin
-    prog = mplayer
-    button = Pause
-    config = pause
-end
-								    
-begin
-   prog = mplayer
-   button = VolUp
-   config = volume +1
-   repeat = 1
-end
-
-begin
-   prog = mplayer
-   button = VolDown
-   config = volume -1
-   repeat = 1
-end
-
-begin
-   prog = mplayer
-   button = Mute
-   config = mute
-end
-
-###################
-#
-#  Xine
-#
-###################
-# Xine lirc setup
-begin
-prog = xine
-button = Play
-repeat = 3
-config = Play
-end
-
-begin
-prog = xine
-button = Stop
-repeat = 3
-config = Stop
-end
-
-begin
-prog = xine
-button = Back
-repeat = 3
-config = Quit
-end
-
-begin
-prog = xine
-button = Pause
-repeat = 3
-config = Pause
-end
-
-begin
-prog = xine
-button = Up
-repeat = 3
-config = EventUp
-end
-
-begin
-prog = xine
-button = Down
-repeat = 3
-config = EventDown
-end
-
-begin
-prog = xine
-button = Left
-repeat = 3
-config = EventLeft
-end
-
-begin
-prog = xine
-button = Right
-repeat = 3
-config = EventRight
-end
-
-begin
-prog = xine
-button = OK
-repeat = 3
-config = EventSelect
-end
-
-begin
-prog = xine
-button = Home
-repeat = 3
-config = Menu
-end
-
-begin
-prog = xine
-button = Forward
-repeat = 3
-config = SpeedFaster
-end
-
-begin
-prog = xine
-button = Rewind
-repeat = 3
-config = SpeedSlower
-end
-
-begin
-prog = xine
-button = VolUp
-repeat = 3
-config = Volume+
-end
-
-begin
-prog = xine
-button = VolDown
-repeat = 3
-config = Volume-
-end
-
-begin
-prog = xine
-button = Mute
-repeat = 3
-config = Mute
-end
-
-begin
-prog = xine
-button = ChanUp
-repeat = 3
-config = EventNext
-end
-
-begin
-prog = xine
-button = ChanDown
-repeat = 3
-config = EventPrior
-end
-
-begin
-prog = xine
-button = More
-repeat = 3
-config = OSDStreamInfos
-end 
-
diff --git a/abs/mv-core/MythVantage-config/templates/remotes/mceusb/preview.jpg b/abs/mv-core/MythVantage-config/templates/remotes/mceusb/preview.jpg
deleted file mode 100644
index 0aa6a4a..0000000
--- a/abs/mv-core/MythVantage-config/templates/remotes/mceusb/preview.jpg
+++ /dev/null
diff --git a/abs/mv-core/MythVantage-config/templates/remotes/no_remote/preview.jpg b/abs/mv-core/MythVantage-config/templates/remotes/no_remote/preview.jpg
deleted file mode 100644
index 1d887dd..0000000
--- a/abs/mv-core/MythVantage-config/templates/remotes/no_remote/preview.jpg
+++ /dev/null
diff --git a/abs/mv-core/MythVantage-config/templates/remotes/one-for-juski/lircd.conf.juski b/abs/mv-core/MythVantage-config/templates/remotes/one-for-juski/lircd.conf.juski
deleted file mode 100644
index 879f9ac..0000000
--- a/abs/mv-core/MythVantage-config/templates/remotes/one-for-juski/lircd.conf.juski
+++ /dev/null
@@ -1,59 +0,0 @@
-
-begin remote
-
-  name  juski
-  bits           13
-  flags RC5|CONST_LENGTH
-  eps            30
-  aeps          100
-
-  one           912   852
-  zero          912   852
-  plead         936
-  gap          113882
-  toggle_bit      2
-
-
-      begin codes
-          menu                     0x0000000000001013
-          1                        0x0000000000001001
-          2                        0x0000000000001002
-          3                        0x0000000000001003
-          4                        0x0000000000001004
-          5                        0x0000000000001005
-          6                        0x0000000000001006
-          7                        0x0000000000001007
-          8                        0x0000000000001008
-          9                        0x0000000000001009
-          10                       0x000000000000101C
-          0                        0x0000000000001000
-          av                       0x0000000000001014
-          left                     0x0000000000001017
-          up                       0x0000000000001015
-          right                    0x0000000000001018
-          down                     0x0000000000001016
-          vol-                     0x000000000000100B
-          ch+                      0x000000000000100D
-          vol+                     0x000000000000100A
-          ok                       0x0000000000001010
-          ch-                      0x000000000000100E
-          rew                      0x0000000000001021
-          play                     0x000000000000101F
-          pause                    0x0000000000001020
-          ffw                      0x0000000000001022
-          red                      0x0000000000001025
-          green                    0x0000000000001023
-          yellow                   0x0000000000001011
-          blue                     0x0000000000001010
-          a                        0x000000000000102F
-          b                        0x0000000000001030
-          c                        0x0000000000001031
-          d                        0x0000000000001032
-          e                        0x0000000000001033
-          f                        0x0000000000001034
-          g                        0x0000000000001035
-          h                        0x0000000000001036
-      end codes
-
-end remote
-
diff --git a/abs/mv-core/MythVantage-config/templates/remotes/one-for-juski/lircrc b/abs/mv-core/MythVantage-config/templates/remotes/one-for-juski/lircrc
deleted file mode 100644
index 584cfec..0000000
--- a/abs/mv-core/MythVantage-config/templates/remotes/one-for-juski/lircrc
+++ /dev/null
@@ -1,394 +0,0 @@
-# ~/.mythtv/lircrc
-#
-# Mythtv LIRC config file for 'OFA' remote control
-#
-# By Justin Hornsby, 02 July 2005
-#
-#
-
-# Menu (m key)
-begin
-prog = mythtv
-button = red
-repeat = 3
-config = m
-end
-
-# Volume Up
-begin
-prog = mythtv
-button = vol+
-repeat = 3
-config = ]
-end
-
-# Volume Down
-begin
-prog = mythtv
-button = vol-
-repeat = 3
-config = [
-end
-
-# Arrow Up
-begin
-prog = mythtv
-button = up
-repeat = 3
-config = Up
-end
-
-# Arrow down
-begin
-prog = mythtv
-button = down
-repeat = 3
-config = Down
-end
-
-# Arrow left
-begin
-prog = mythtv
-button = left
-repeat = 3
-config = Left
-end
-
-# Arrow right
-begin
-prog = mythtv
-button = right
-repeat = 3
-config = Right
-end
-
-# OK / Select
-begin
-prog = mythtv
-button = ok
-repeat = 3
-config = Space
-end
-
-# Info
-begin
-prog = mythtv
-button = 10
-repeat = 3
-config = i
-end
-
-begin
-prog = mythtv
-button = blue
-repeat = 3
-config = Space
-end
-
-# Play
-begin
-prog = mythtv
-button = play
-repeat = 3
-config = Return
-end
-
-# Stop
-begin
-prog = mythtv
-button = green
-repeat = 3
-config = Esc
-end
-
-# ESC/Exit/Back
-begin
-prog = mythtv
-button = av
-repeat = 3
-
-config = Esc
-end
-
-# Pause
-begin
-prog = mythtv
-button = pause
-repeat = 3
-config = P
-end
-
-# Fast Forward
-begin
-prog = mythtv
-button = ffw
-repeat = 3
-config = Right
-end
-
-# Rewind
-begin
-prog = mythtv
-button = rew
-repeat = 3
-config = Left
-end
-
-# Skip forward (10 min default)
-begin
-prog = mythtv
-button = a
-repeat = 3
-config = PgDown
-end
-
-# Skip backward (10 min default)
-begin
-prog = mythtv
-button = b
-repeat = 3
-config = PgUP
-end
-
-# OSD browse
-begin
-prog = mythtv
-button = 10
-repeat = 3
-config = O
-end
-
-# Display EPG while in live TV,
-# View selected show while in EPG
-begin
-prog = mythtv
-button = blue
-repeat = 3
-config = M
-end
-
-# Change display aspect ratio
-begin
-prog = mythtv
-button = 0
-repeat = 3
-config = W
-end
-
-# Numbers 0-9
-
-begin
-prog = mythtv
-button = 0
-repeat = 3
-config = 0
-end
-
-begin
-prog = mythtv
-button = 1
-repeat = 3
-config = 1
-end
-
-begin
-prog = mythtv
-button = 2
-repeat = 3
-config = 2
-end
-
-begin
-prog = mythtv
-button = 3
-repeat = 3
-config = 3
-end
-
-begin
-prog = mythtv
-button = 4
-repeat = 3
-config = 4
-end
-
-begin
-prog = mythtv
-button = 5
-repeat = 3
-config = 5
-end
-
-begin
-prog = mythtv
-button = 6
-repeat = 3
-config = 6
-end
-
-begin
-prog = mythtv
-button = 7
-repeat = 3
-config = 7
-end
-
-begin
-prog = mythtv
-button = 8
-repeat = 3
-config = 8
-end
-
-begin
-prog = mythtv
-button = 9
-repeat = 3
-config = 9
-end
-
-### Xine lirc setup
-
-begin
-prog = xine
-button = play
-repeat = 3
-config = Play
-end
-
-begin 
-prog = xine
-button = blue
-repeat = 3
-config = ToggleAspectRatio
-end
- 
-begin
-prog = xine
-button = green
-repeat = 3
-config = Stop
-end
-
-
-begin
-prog = xine
-button = av
-repeat = 3
-config = Quit
-end
-
-begin
-prog = xine
-button = pause
-repeat = 3
-config = Pause
-end
-
-begin
-prog = xine
-button = up
-repeat = 3
-config = EventUp
-end
-
-begin
-prog = xine
-button = down
-repeat = 3
-config = EventDown
-end
-
-
-begin
-prog = xine
-button = left
-repeat = 3
-config = EventLeft
-end
-
-begin
-prog = xine
-button = right
-repeat = 3
-config = EventRight
-end
-
-begin
-prog = xine
-button = ok
-repeat = 3
-config = EventSelect
-end
-
-begin
-prog = xine
-button = red
-repeat = 3
-config = Menu
-end
-
-begin
-prog = xine
-button = ffw
-repeat = 3
-config = SeekRelative+60
-end
-
-begin
-prog = xine
-button = rew
-repeat = 3
-config = SeekRelative-60
-end
-
-begin
-prog = xine
-button = vol+
-repeat = 3
-config = Volume+
-end
-
-begin
-prog = xine
-button = vol-
-repeat = 3
-config = Volume-
-end
-
-#begin
-#prog = xine
-#button = MUTE
-#repeat = 3
-#config = Mute
-#end
-
-begin
-prog = xine
-button = blue
-repeat = 3
-config = RootMenu
-end
-
-begin
-prog = xine
-button = a
-repeat = 3
-config = EventNext
-end
-
-begin
-prog = xine
-button = b
-repeat = 3
-config = EventPrior
-end
-
-begin
-prog = xine
-button = 10
-repeat = 3
-#config = OSDStreamInfos
-config = ToggleInterleave
-end
-
diff --git a/abs/mv-core/MythVantage-config/templates/remotes/one-for-juski/preview.jpg b/abs/mv-core/MythVantage-config/templates/remotes/one-for-juski/preview.jpg
deleted file mode 100644
index 6d683c7..0000000
--- a/abs/mv-core/MythVantage-config/templates/remotes/one-for-juski/preview.jpg
+++ /dev/null
diff --git a/abs/mv-core/MythVantage-config/templates/remotes/receiver_usb.id b/abs/mv-core/MythVantage-config/templates/remotes/receiver_usb.id
deleted file mode 100644
index 4070964..0000000
--- a/abs/mv-core/MythVantage-config/templates/remotes/receiver_usb.id
+++ /dev/null
@@ -1,33 +0,0 @@
-0bc7:0005|snapstream_firefly|    "X10 Wireless Technology, Inc."
-0bc7:0008|SnapStream_Firefly|    "SnapStream Firefly"
-10c4:0003|CommandIR_Tranceiver|     " CommandIR Transceiver"
-0bc7:0004|ATI_Remote_Wonder|    " ATI Remote Wonder"
-0e9c:0000|streamzap|    "Streamzap Remote"
-0fe9:9010|dvico|   "DVICO Remote:"
-6253:0100|Twinhan_USB|  "the VisionPlus is a Twinhan clone "
-1509:9242|MCEUSB-new|  "FIC eHome Infrared Transceiver 1509/9242"
-1934:0602|MCEUSB-new|  "Fintek eHome Infrared Transceiver 1934/0602"
-147a:e015|MCEUSB-new|  "Formosa eHome Infrared Transceiver 147a/e015"
-147a:e017|MCEUSB-new|  "Formosa aim / Trust MCE Infrared Receiver147a/e017"
-147a:e018|MCEUSB-new|  "Formosa Industrial Computing 147a/e018"
-107b:3009|MCEUSB-new|  "Gateway eHome Infrared Transceiver 107b/3009"
-195d:7002|MCEUSB-new|  "Itron ione Libra Q-11 195d/7002"
-043e:9803|MCEUSB-new|  "LG eHome Infrared Transceiver 043e/9803"
-045e:00a0|MCEUSB-new|  "Microsoft MCE Infrared Transceiver 045e/00a0"
-03ee:2501|MCEUSB-new|  "Mitsumi 03ee/2501"
-0471:060c|MCEUSB-new|  "Philips Infrared Transciever - HP branded 0471/060C"
-0471:060d|MCEUSB-new|  "Philips SRM5100 0471/060d"
-0471:0815|MCEUSB-new|  "Philips eHome Infrared Transciever 0471/0815"
-2304:0225|MCEUSB-new| "Pinnacle Systems, Inc. 2304/0225"
-179d:0010|MCEUSB-new|  "Ricavision internal Infrared Transceiver 179d/0010"
-1308:c001|MCEUSB-new|  "Shuttle eHome Infrared Transceiver 1308/c001"
-051c:c001|MCEUSB-new|  "Shuttle2 eHome Infrared Transceiver 051c/c001"
-0609:031d|MCEUSB-new|  "SMK/Toshiba G83C0004D410 0609/031d"
-0609:0322|MCEUSB-new|  "SMK eHome Infrared Transceiver (Sony VAIO)0609/0322"
-0609:0334|MCEUSB-new|  "SKM bundled with Hauppauge PVR-150 0609/0334"
-1460:9150|MCEUSB-new|  "Tatung eHome Infrared Transceiver 1460/9150"
-1784:0001|MCEUSB-new|  "Topseed eHome Infrared Transceiver 1784/0001"
-1784:0006|MCEUSB-new|  "Topseed HP eHome Infrared Transceiver 1784/0006"
-1784:0007|MCEUSB-new|  "Topseed HP eHome Infrared Transceiver 1784/0007"
-1784:0008|MCEUSB-new|  "Topseed eHome Infrared Transceiver 1784/0008"
-045e:006d|MCEUSB-old|  "USB Microsoft IR Transceiver Driver 045e/006d"
diff --git a/abs/mv-core/MythVantage-config/templates/remotes/snapstream_firefly/lircd.snapstrm.conf b/abs/mv-core/MythVantage-config/templates/remotes/snapstream_firefly/lircd.snapstrm.conf
deleted file mode 100644
index 288bb51..0000000
--- a/abs/mv-core/MythVantage-config/templates/remotes/snapstream_firefly/lircd.snapstrm.conf
+++ /dev/null
@@ -1,127 +0,0 @@
-# Please make this file available to others
-# by sending it to <lirc@bartelmus.de>
-#
-# this config file was automatically generated
-# using lirc-0.7.0(any) on Fri Mar 11 08:51:45 2005
-#
-# contributed by
-#
-# brand: Snapstream Firefly Remote
-# model no. of remote control:
-# devices being controlled by this remote:
-#
-
-begin remote
-
-name Snapstream_Firefly
-bits 40
-eps 30
-aeps 100
-
-one 0 0
-zero 0 0
-gap 219964
-toggle_bit 0
-
-
-begin codes
-MAXI 0x0000001481AC0000
-MAXI 0x00000014012C0000
-CLOSE 0x00000014D7020000
-CLOSE 0x0000001457820000
-1 0x00000014628D0000
-1 0x00000014E20D0000
-2 0x00000014E30E0000
-2 0x00000014638E0000
-3 0x00000014648F0000
-3 0x00000014E40F0000
-4 0x00000014E5100000
-4 0x0000001465900000
-5 0x0000001466910000
-5 0x00000014E6110000
-6 0x00000014E7120000
-6 0x0000001467920000
-7 0x0000001468930000
-7 0x00000014E8130000
-8 0x00000014E9140000
-8 0x0000001469940000
-9 0x000000146A950000
-9 0x00000014EA150000
-0 0x00000014EC170000
-0 0x000000146C970000
-BACK 0x000000146B960000
-BACK 0x00000014EB160000
-ENT 0x00000014ED180000
-ENT 0x000000146D980000
-VOL+ 0x000000145E890000
-VOL+ 0x00000014DE090000
-VOL- 0x000000145D880000
-VOL- 0x00000014DD080000
-MUTE 0x000000145F8A0000
-MUTE 0x00000014DF0A0000
-FIREFLY 0x0000001455800000
-FIREFLY 0x00000014D5000000
-CH+ 0x00000014608B0000
-CH+ 0x00000014E00B0000
-CH- 0x00000014618C0000
-CH- 0x00000014E10C0000
-INFO 0x0000001483AE0000
-INFO 0x00000014032E0000
-OPTION 0x0000001484AF0000
-OPTION 0x00000014042F0000
-UP 0x000000146F9A0000
-UP 0x00000014EF1A0000
-LEFT 0x00000014729D0000
-LEFT 0x00000014F21D0000
-DOWN 0x0000001477A20000
-DOWN 0x00000014F7220000
-RIGHT 0x00000014749F0000
-RIGHT 0x00000014F41F0000
-OK 0x00000014739E0000
-OK 0x00000014F31E0000
-MENU 0x00000014719C0000
-MENU 0x00000014F11C0000
-EXIT 0x0000001475A00000
-EXIT 0x00000014F5200000
-REC 0x00000014FC270000
-REC 0x000000147CA70000
-PLAY 0x00000014FA250000
-PLAY 0x000000147AA50000
-STOP 0x00000014FD280000
-STOP 0x000000147DA80000
-REW 0x00000014F9240000
-REW 0x0000001479A40000
-FWD 0x00000014FB260000
-FWD 0x000000147BA60000
-PREV 0x00000014002B0000
-PREV 0x0000001480AB0000
-PAUSE 0x00000014FE290000
-PAUSE 0x000000147EA90000
-NEXT 0x00000014FF2A0000
-NEXT 0x000000147FAA0000
-MUSIC 0x00000014DB060000
-MUSIC 0x000000145B860000
-PHOTOS 0x00000014DA050000
-PHOTOS 0x000000145A850000
-DVD 0x00000014D9040000
-DVD 0x0000001459840000
-TV 0x00000014D8030000
-TV 0x0000001458830000
-VIDEO 0x00000014DC070000
-VIDEO 0x000000145C870000
-HELP 0x00000014D6010000
-HELP 0x0000001456810000
-MOUSE 0x00000014022D0000
-MOUSE 0x0000001482AD0000
-A 0x00000014EE190000
-A 0x000000146E990000
-B 0x00000014F01B0000
-B 0x00000014709B0000
-C 0x00000014F6210000
-C 0x0000001476A10000
-D 0x00000014F8230000
-D 0x0000001478A30000
-
-end codes
-
-end remote
\ No newline at end of file
diff --git a/abs/mv-core/MythVantage-config/templates/remotes/snapstream_firefly/lircrc-snapstrm.txt b/abs/mv-core/MythVantage-config/templates/remotes/snapstream_firefly/lircrc-snapstrm.txt
deleted file mode 100644
index e918011..0000000
--- a/abs/mv-core/MythVantage-config/templates/remotes/snapstream_firefly/lircrc-snapstrm.txt
+++ /dev/null
@@ -1,590 +0,0 @@
-# ~/.mythtv/lircrc
-#
-# MythTV native LIRC config file for
-# the new grey Hauppauge remote
-#
-# Modified from Jarod Wilson's which came from Jeff Campbell's
-# By Brad Templeton
-
-
-# Here we have the jump point commands.  They only work if you have
-# defined function keys for these jump points.  For me the most
-# common command is the menu of recordings, so I put that on "videos"
-# even though that's counter-intuitive
-
-begin
-prog = mythtv
-button = TV
-repeat = 3
-config = F5
-end
-
-begin
-prog = mythtv
-button = Videos
-repeat = 3
-config = F2
-end
-
-# Not yet defined
-begin
-prog = mythtv
-button = Music
-repeat = 3
-config = Up
-end
-
-# Given another function for now, I don't use mythgallery
-begin
-prog = mythtv
-button = Pictures
-repeat = 3
-config = F
-end
-
-begin
-prog = mythtv
-button = Guide
-repeat = 3
-config = F3
-end
-
-# I stuck the "todo" list on here as Myth has no radio function
-begin
-prog = mythtv
-button = Radio
-repeat = 3
-config = F4
-end
-
-begin
-prog = mythtv
-button = UP
-repeat = 3
-config = Up
-end
-
-begin
-prog = mythtv
-button = DOWN
-repeat = 3
-config = Down
-end
-
-begin
-prog = mythtv
-button = LEFT
-repeat = 3
-config = Left
-end
-
-begin
-prog = mythtv
-button = RIGHT
-repeat = 3
-config = Right
-end
-
-# Channel Up
-begin
-prog = mythtv
-button = Channel-UP
-repeat = 3
-config = Up
-end
-
-# Channel Down
-begin
-prog = mythtv
-button = Channel-DOWN
-repeat = 3
-config = Down
-end
-
-# OK/Select
-begin
-prog = mythtv
-button = Ok
-config = Space
-end
-
-# Play
-begin
-prog = mythtv
-button = Play
-config = Return
-end
-
-# Stop
-begin
-prog = mythtv
-button = Stop
-config = I
-end
-
-# Escape/Exit/Back
-begin
-prog = mythtv
-button = BACK
-config = Esc
-end
-
-# Power Off/Exit
-begin
-prog = mythtv
-button = POWER
-config = Esc
-end
-
-
-# Pause
-begin
-prog = mythtv
-button = Pause
-repeat = 3
-config = P
-end
-
-# Mute
-begin
-prog = mythtv
-button = Mute
-repeat = 3
-config = |
-end
-
-# Fast forward (30 sec default)
-begin
-prog = mythtv
-button = Rewind
-repeat = 3
-config = PgUp
-end
-
-# Rewind (10 sec default)
-begin
-prog = mythtv
-button = Forward
-repeat = 3
-config = PgDown
-end
-
-# Skip forward (10 min default)
-begin
-prog = mythtv
-button = Next
-repeat = 3
-config = End
-end
-
-# Skip backward (10 min default)
-begin
-prog = mythtv
-button = Previous
-repeat = 3
-config = Home
-end
-
-# Record
-begin
-prog = mythtv
-button = Record
-repeat = 3
-config = R
-end
-
-# Delete
-begin
-prog = mythtv
-button = Red
-repeat = 3
-config = D
-end
-
-# Decrease play speed
-begin
-prog = mythtv
-button = Green
-repeat = 3
-config = J
-end
-
-# Display EPG while in live TV,
-# View selected show while in EPG
-begin
-prog = mythtv
-button = Menu
-repeat = 3
-config = M
-end
-
-# Scroll up
-begin
-prog = mythtv
-button = Volume-UP
-repeat = 3
-config = F11
-end
-
-# Scroll down
-begin
-prog = mythtv
-button = Volume-DOWN
-repeat = 3
-config = F10
-end
-
-# Bring up OSD info
-begin
-prog = mythtv
-button = Go
-repeat = 3
-config = I
-end
-
-# Change display aspect ratio
-begin
-prog = mythtv
-button = Prev-Channel
-repeat = 3
-config = W
-end
-
-# double speed watch
-begin
-prog = mythtv
-button = Yellow
-repeat = 3
-config = J
-end
-
-# change tuners
-#begin
-#prog = mythtv
-#button = hash
-#repeat = 3
-#config = Y
-#end
-
-# Bring up Time stretch
-begin
-prog = mythtv
-button = Blue
-repeat = 3
-config = Y
-end
-
-# Numbers 0-9
-
-begin
-prog = mythtv
-button = 0
-repeat = 3
-config = 0
-end
-
-begin
-prog = mythtv
-button = 1
-repeat = 3
-config = 1
-end
-
-begin
-prog = mythtv
-button = 2
-repeat = 3
-config = 2
-end
-
-begin
-prog = mythtv
-button = 3
-repeat = 3
-config = 3
-end
-
-begin
-prog = mythtv
-button = 4
-repeat = 3
-config = 4
-end
-
-begin
-prog = mythtv
-button = 5
-repeat = 3
-config = 5
-end
-
-begin
-prog = mythtv
-button = 6
-repeat = 3
-config = 6
-end
-
-begin
-prog = mythtv
-button = 7
-repeat = 3
-config = 7
-end
-
-begin
-prog = mythtv
-button = 8
-repeat = 3
-config = 8
-end
-
-begin
-prog = mythtv
-button = 9
-repeat = 3
-config = 9
-end
-
-
-### MPlayer lirc setup
-
-# Show OSD
-begin
-prog = mplayer
-button = MENU
-repeat = 3
-config = osd
-end
-
-# Pause playback
-begin
-prog = mplayer
-button = PAUSE
-repeat = 3
-config = pause
-end
-
-# Skip ahead a minute if playing
-# If paused, resume playing
-begin
-prog = mplayer
-button = PLAY
-repeat = 3
-config = seek +1
-end
-
-# Stop playback and exit
-begin
-prog = mplayer
-button = Back
-repeat = 3
-config = quit
-end
-
-# Mute
-begin
-prog = mplayer
-button = MUTE
-repeat = 3
-config = mute
-end
-
-# Seek back 10 seconds
-begin
-prog = mplayer
-button = LEFT
-repeat = 3
-config = seek -7
-end
-
-# Seek forward 30 seconds
-begin
-prog = mplayer
-button = RIGHT
-repeat = 3
-config = seek +30
-end
-
-# Quit
-begin
-prog = mplayer
-button = EXIT
-repeat = 3
-config = quit
-end
-
-# Seek forward 10 minutes
-begin
-prog = mplayer
-button = SKIP
-repeat = 3
-config = seek +600
-end
-
-# Seek backward 10 minutes
-begin
-prog = mplayer
-button = REPLAY
-repeat = 3
-config = seek -600
-end
-
-# Toggle full-screen
-begin
-prog = mplayer
-button = FULL
-repeat = 3
-config = vo_fullscreen
-end
-
-### Xine lirc setup
-
-begin
-prog = xine
-button = PLAY
-repeat = 3
-config = Play
-end
-
-begin
-prog = xine
-button = STOP
-repeat = 3
-config = Stop
-end
-
-begin
-prog = xine
-button = OFF
-repeat = 3
-config = Quit
-end
-
-begin
-prog = xine
-button = PAUSE
-repeat = 3
-config = Pause
-end
-
-begin
-prog = xine
-button = CH+
-repeat = 3
-config = EventUp
-end
-
-begin
-prog = xine
-button = CH-
-repeat = 3
-config = EventDown
-end
-
-begin
-prog = xine
-button = VOL-
-repeat = 3
-config = EventLeft
-end
-
-begin
-prog = xine
-button = VOL+
-repeat = 3
-config = EventRight
-end
-
-begin
-prog = xine
-button = OK
-repeat = 3
-config = EventSelect
-end
-
-begin
-prog = xine
-button = BACK
-repeat = 3
-config = Menu
-end
-
-begin
-prog = xine
-button = FFW
-repeat = 3
-#config = SpeedFaster
-config = SeekRelative+60
-end
-
-begin
-prog = xine
-button = REW
-repeat = 3
-#config = SpeedSlower
-config = SeekRelative-60
-end
-
-begin
-prog = xine
-button = FULL
-repeat = 3
-config = Volume+
-end
-
-begin
-prog = xine
-button = BLANK
-repeat = 3
-config = Volume-
-end
-
-begin
-prog = xine
-button = MUTE
-repeat = 3
-config = Mute
-end
-
-begin
-prog = xine
-button = MENU
-repeat = 3
-config = RootMenu
-end
-
-begin
-prog = xine
-button = SKIP
-repeat = 3
-config = EventNext
-end
-
-begin
-prog = xine
-button = REPLAY
-repeat = 3
-config = EventPrior
-end
-
-begin
-prog = xine
-button = GO
-repeat = 3
-config = OSDStreamInfos
-end
-
-begin
-prog = xine
-button = RED
-repeat = 3
-config = Quit
-end
-
-begin
-prog = xine
-button = RED
-repeat = 3
-config = Quit
-end
\ No newline at end of file
diff --git a/abs/mv-core/MythVantage-config/templates/remotes/snapstream_firefly/preview.jpg b/abs/mv-core/MythVantage-config/templates/remotes/snapstream_firefly/preview.jpg
deleted file mode 100644
index a1fbc6e..0000000
--- a/abs/mv-core/MythVantage-config/templates/remotes/snapstream_firefly/preview.jpg
+++ /dev/null
diff --git a/abs/mv-core/MythVantage-config/templates/remotes/streamzap/lircd.conf.streamzap b/abs/mv-core/MythVantage-config/templates/remotes/streamzap/lircd.conf.streamzap
deleted file mode 100644
index 8e453b9..0000000
--- a/abs/mv-core/MythVantage-config/templates/remotes/streamzap/lircd.conf.streamzap
+++ /dev/null
@@ -1,69 +0,0 @@
-#
-# this config file was automatically generated
-# using lirc-0.7.1-CVS(serial) on Fri Feb  4 23:20:56 2005
-#
-# contributed by Christoph Bartelmus
-#
-# brand:                       Streamzap
-# model no. of remote control: PC Remote
-# devices being controlled by this remote: USB receiver
-#
-
-begin remote
-
-  name  Streamzap_PC_Remote
-  bits            6
-  flags RC5|CONST_LENGTH
-  eps            30
-  aeps          100
-
-  one           889  889
-  zero          889  889
-  plead         889
-  pre_data_bits   8
-  pre_data       0xA3
-  gap          108344
-  toggle_bit      2
-
-
-      begin codes
-          0                        0x00
-          1                        0x01
-          2                        0x02
-          3                        0x03
-          4                        0x04
-          5                        0x05
-          6                        0x06
-          7                        0x07
-          8                        0x08
-          9                        0x09
-          POWER                    0x0A
-          MUTE                     0x0B
-          CH_UP                    0x0C
-          VOL_UP                   0x0D
-          CH_DOWN                  0x0E
-          VOL_DOWN                 0x0F
-          UP                       0x10
-          LEFT                     0x11
-          OK                       0x12
-          RIGHT                    0x13
-          DOWN                     0x14
-          MENU                     0x15
-          EXIT                     0x16
-          PLAY                     0x17
-          PAUSE                    0x18
-          STOP                     0x19
-          |<<                      0x1A
-          >>|                      0x1B
-          RECORD                   0x1C
-          <<                       0x1D
-          >>                       0x1E
-          RED                      0x20
-          GREEN                    0x21
-          YELLOW                   0x22
-          BLUE                     0x23
-      end codes
-
-end remote
-
-
diff --git a/abs/mv-core/MythVantage-config/templates/remotes/streamzap/lircrc b/abs/mv-core/MythVantage-config/templates/remotes/streamzap/lircrc
deleted file mode 100755
index 5e668b5..0000000
--- a/abs/mv-core/MythVantage-config/templates/remotes/streamzap/lircrc
+++ /dev/null
@@ -1,832 +0,0 @@
-# StreamZap Remote
-# 'config' must either be a literal key, e.g. 'config = l' or must
-# refer to a defined key in MythTV, e.g. 'config = PLAY'a
-
-
-#restart frontend
-begin
-        remote = RS_LD
-        button = RESET
-        prog   = irexec
-        repeat = 0
-        config = /usr/bin/restartfrontend.sh
-end
-
-#time
-begin
-        remote = RS_LD
-        button = TIME
-        prog   = irexec
-        repeat = 10
-        config = /usr/bin/saytime.sh
-end
-
-#screen blank
-begin
-        remote = RS_LD
-        button = BLANK
-        prog   = irexec
-        repeat = 0
-#      config  = ls
-        config = xset s activate ; xset s blank
-end
-
-
-#picture
-begin
-REMOTE = RS_LD
-prog = mythtv
-button = PICTURE
-repeat = 4
-config = f
-end
-
-#change aspect
-begin
-remote = RS_LD
-prog = mythtv
-button = ASPECT
-# change aspect ratio
-config = w
-end
-
-#Browse
-begin
-remote = RS_LD
-prog = mythtv
-button = BROWSE
-repeat = 8
-config = o
-end
-
-# delete key
-begin
-remote = RS_LD
-prog = mythtv
-button = DELETE
-repeat = 8
-config = d
-end
-
-
-#change card
-begin
-remote = RS_LD
-prog = mythtv
-button = CARD
-repeat = 8
-config = y
-end
-
-# Change TV card input
-begin
-remote = RS_LD
-prog = mythtv
-button = CARD_SOURCE
-repeat = 4
-config = C
-end
-
-
-
-# Cycle through channel history
-begin
-remote = Streamzap_PC_Remote
-prog = mythtv
-button = BLUE
-repeat = 4
-config = H
-end
-
-# Bring up OSD info
-begin
-remote =  Streamzap_PC_Remote
-prog = mythtv
-button = YELLOW
-repeat = 4
-config = i
-end
-
-
-
-
-begin
-prog = mythtv
-button = 0
-config = 0
-end
-
-begin
-prog = mythtv
-button = 1
-config = 1
-end
-
-begin
-prog = mythtv
-button = 2
-config = 2
-end
-
-begin
-prog = mythtv
-button = 3
-config = 3
-end
-
-begin
-prog = mythtv
-button = 4
-config = 4
-end
-
-begin
-prog = mythtv
-button = 5
-config = 5
-end
-
-begin
-prog = mythtv
-button = 6
-config = 6
-end
-
-begin
-prog = mythtv
-button = 7
-config = 7
-end
-
-begin
-prog = mythtv
-button = 8
-config = 8
-end
-
-begin
-prog = mythtv
-button = 9
-config = 9
-end
-
-begin
-prog = mythtv
-button = POWER
-config = Esc
-end
-
-# ???
-begin
-prog = mythtv
-button = MUTE
-config = F9
-end
-
-begin
-prog = mythtv
-button = CH_UP
-repeat = 3
-config = PgUp
-end
-
-begin
-prog = mythtv
-button = VOL_UP
-repeat = 3
-config = ]
-end
-
-begin
-prog = mythtv
-button = CH_DOWN
-repeat = 3
-config = PgDown
-end
-
-begin
-prog = mythtv
-button = VOL_DOWN
-repeat = 3
-config = [
-end
-
-begin
-prog = mythtv
-button = UP
-repeat = 3
-config = Up
-end
-
-begin
-prog = mythtv
-button = LEFT
-# navigates, or skips back during playback or live tv.
-config = Left
-end
-
-begin
-prog = mythtv
-button = OK
-config = Return
-end
-
-begin
-prog = mythtv
-button = RIGHT
-# navigates, or skips forwards during playback or live tv.
-config = Right
-end
-
-begin
-prog = mythtv
-button = DOWN
-repeat = 3
-config = Down
-end
-
-begin
-prog = mythtv
-button = MENU
-config = m
-end
-
-begin
-prog = mythtv
-button = EXIT
-config = Esc
-end
-
-begin
-prog = mythtv
-button = PLAY
-config = Space
-end
-
-begin
-prog = mythtv
-button = PAUSE
-config = p
-end
-
-begin
-prog = mythtv
-button = STOP
-config = Esc
-end
-
-begin
-prog = mythtv
-# skip backward
-button = |<<
-config = PgUp
-end
-
-begin
-prog = mythtv
-# skip forward
-button = >>|
-config = PgDown
-end
-
-begin
-prog = mythtv
-button = RECORD
-config = r
-end
-
-begin
-prog = mythtv
-# rewind
-button = <<
-config = Home
-end
-
-begin
-prog = mythtv
-# fast forward
-button = >>
-config = End
-end
-
-begin
-prog = mythtv
-button = RED
-# Delete
-config = d
-end
-
-begin
-prog = mythtv
-button = GREEN
-# Info
-config = i
-end
-
-#begin
-#prog = mythtv
-#button = YELLOW
-# change aspect ratio
-#config = w
-#end
-
-begin
-prog = mythtv
-button = BLUE
-config = Tab
-end
-
-# MPLAYER
-begin
-prog = mplayer
-button = POWER
-config = quit
-end
-
-begin
-prog = mplayer
-button = MUTE
-config = mute
-end
-
-begin
-prog = mplayer
-button = VOL_UP
-repeat = 3
-config = volume +1
-end
-
-begin
-prog = mplayer
-button = VOL_DOWN
-repeat = 3
-config = volume -1
-end
-
-begin
-prog = mplayer
-button = UP
-repeat = 3
-config = seek +10
-end
-
-begin
-prog = mplayer
-button = LEFT
-# navigates, or skips back during playback or live tv.
-config = seek -60
-end
-
-begin
-prog = mplayer
-button = RIGHT
-# navigates, or skips forwards during playback or live tv.
-config = seek +60
-end
-
-begin
-prog = mplayer
-button = DOWN
-repeat = 3
-config = seek -10
-end
-
-begin
-prog = mplayer
-button = EXIT
-config = quit
-end
-
-begin
-prog = mplayer
-button = play
-config = speed_set 1.0
-end
-
-begin
-    prog = mplayer
-    button = pause
-    config = pause
-end
-
-begin
-prog = mplayer
-button = STOP
-config = quit
-end
-
-begin
-prog = mplayer
-# skip backward
-button = |<<
-config = seek -600
-end
-
-begin
-prog = mplayer
-# skip forward
-button = >>|
-config = seek +600
-end
-
-begin
-prog = mplayer
-# slow forward
-button = <<
-config = speed_mult 0.5
-end
-
-begin
-prog = mplayer
-# fast forward
-button = >>
-config = speed_mult 2.0
-end
-
-### xine  commands
-
-begin
-prog = xine
-button = YELLOW
-repeat = 4
-#config = ToggleVisiblity
-config = OSDStreamInfos
-end
-
-begin
-prog = xine
-button = MENU
-repeat = 4
-config = SeekRelative+60
-end
-
-# increase brightness by 10
-begin
-        button = DELETE
-        prog   = xine
-        repeat = 4
-        config = BrightnessControl+
-end
-
-# decrease brightness by 10
-begin
-        button = PICTURE
-        prog   = xine
-        repeat = 4
-        config = BrightnessControl-
-end
-
-
-begin
-prog = xine
-button = PAUSE
-repeat = 4
-config = Pause
-end
-
-begin
-prog = xine
-button = PLAY
-repeat = 4
-config = Play
-end
-
-begin
-prog = xine
-button = STOP
-repeat = 4
-config = quit
-end
-
-begin
-prog = xine
-button = MUTE
-repeat = 4
-config = mute
-end
-
-begin
-prog = xine
-button = <<
-repeat = 4
-config = SeekRelative-30
-end
-
-begin
-prog = xine
-button =  >>
-repeat = 4
-#config = SeekRelative+30
-config =  SpeedFaster
-end
-
-begin
-prog = xine
-button = POWER
-repeat = 4
-config = quit
-end
-
-begin
-prog = xine
-button = EXIT
-repeat = 4
-config = quit
-end
-
-
-begin
-prog = xine
-button = FREEZE
-repeat = 4
-config =  SeekRelative+1200
-end
-
-begin
-prog = xine
-button = MOVE
-repeat = 4
-config =  SeekRelative-1200
-end
-
-begin
-prog   = xine
-button = 3
-config = SpuNext
-repeat = 0
-end
-
-# Select previous sub picture (subtitle) channel.
-begin
-button = 1
-prog   = xine
-repeat = 0
-config = SpuPrior
-end
-
-# Select next audio channel.
-begin
-button = 9
-prog   = xine
-repeat = 0
-config = AudioChannelNext
-end
-
-# Select previous audio channel.
-begin
-button = 7
-prog   = xine
-repeat = 0
-config = AudioChannelPrior
-end
-
-
-
-# Up event.
-begin
-
-button = UP
-prog   = xine
-repeat = 8
-config = EventUp
-end
-
-# Down event.
-begin
-
-button = DOWN
-prog   = xine
-repeat = 8
-config = EventDown
-end
-
-# Left event.
-begin
-
-button = LEFT
-prog   = xine
-repeat = 8
-config = EventLeft
-end
-
-# Right event.
-begin
-
-button = RIGHT
-prog   = xine
-repeat = 8
-config = EventRight
-end
-
-# Select event.
-begin
-prog   = xine
-button = ok
-repeat = 8
-config = EventSelect
-end
-
-# Down Chapter
-begin
-
-button = CH_DOWN
-prog   = xine
-repeat = 8
-config = EventPrior
-end
-
-# Next Chapter.
-begin
-
-button = CH_UP
-prog   = xine
-repeat = 8
-config = EventNext
-end
-
-# menu.
-begin
-
-button = record
-prog   = xine
-repeat = 8
-config = RootMenu
-end
-
-# Toggle aspect ratio
-begin
-prog   = xine
-button = ASPECT
-repeat = 0
-config = ToggleAspectRatio
-end
-
-
-
-#######xmms
-begin xmms
-  begin
-    prog = xmms
-    button = PLAY
-    config = PLAY
-  end
-  begin
-    prog = xmms
-    button = clear
-    config = PLAYLIST_CLEAR
-  end
-  begin
-    prog = xmms
-    button = load
-    config = PLAYLIST_ADD .xmms/xmms.m3u
-   end
-  begin
-    prog = xmms
-    button = PAUSE
-    config = PAUSE
-  end
-  begin
-    prog = xmms
-    button = STOP
-    config = STOP
-  end
-  begin
-    prog = xmms
-    button = EXIT
-    config = QUIT
-    flags = mode
-  end
-
-  begin
-    prog = xmms
-    button = POWER
-    config = QUIT
-    flags = mode
-  end
-
-  begin
-    prog = xmms
-    button = CH_UP
-    config = NEXT
-  end
-  begin
-    prog = xmms
-    button = CH_DOWN
-    config = PREV
-  end
-  
-
-
-begin
-    prog = xmms
-    button = >>|
-    config = NEXT
-  end
-begin
-    prog = xmms
-    button = |<<
-    config = PREV
-end
-
-
-begin
-    prog = xmms
-    button = <<
-    config = FWD 10
-    repeat = 2
-  end
-  begin
-    prog = xmms
-    button = <<
-    config = BWD 10
-    repeat = 2
-  end
-  begin
-    prog = xmms
-    button = volup
-    config = VOL_UP 10
-    repeat = 2
-  end
-  begin
-    prog = xmms
-    button = voldown
-    config = VOL_DOWN 10
-    repeat = 2
-  end
-  begin
-    prog = xmms
-    button = 1
-    config = ONE
-  end
-  begin
-    prog = xmms
-    button = 2
-    config = TWO
-  end
-  begin
-    prog = xmms
-    button = 3
-    config = THREE
-  end
-  begin
-    prog = xmms
-    button = 4
-    config = FOUR
-  end
-  begin
-    prog = xmms
-    button = 5
-    config = FIVE
-  end
-  begin
-    prog = xmms
-    button = 6
-    config = SIX
-  end
-  begin
-    prog = xmms
-    button = 7
-    config = SEVEN
-  end
-  begin
-    prog = xmms
-    button = 8
-    config = EIGHT
-  end
-  begin
-    prog = xmms
-    button = 9
-    config = NINE
-  end
-  begin
-    prog = xmms
-    button = 0
-    config = ZERO
-  end
-  begin
-    prog = xmms
-    button = enter
-    config = SETPOS
-  end
-end xmms
-
-#
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/abs/mv-core/MythVantage-config/templates/remotes/streamzap/preview.jpg b/abs/mv-core/MythVantage-config/templates/remotes/streamzap/preview.jpg
deleted file mode 100644
index 4d1a5fe..0000000
--- a/abs/mv-core/MythVantage-config/templates/remotes/streamzap/preview.jpg
+++ /dev/null
diff --git a/abs/mv-core/MythVantage-config/templates/samba/smb.conf.home b/abs/mv-core/MythVantage-config/templates/samba/smb.conf.home
deleted file mode 100755
index b850a7d..0000000
--- a/abs/mv-core/MythVantage-config/templates/samba/smb.conf.home
+++ /dev/null
@@ -1,10 +0,0 @@
-[home]
-   path = /data/home/mythtv/
-   public = yes
-   only guest = yes
-   writeable  = yes
-   printable = no
-  force user = mythtv
-  force group = mythtv
-  create mask = 0755
-
diff --git a/abs/mv-core/MythVantage-config/templates/samba/smb.conf.media b/abs/mv-core/MythVantage-config/templates/samba/smb.conf.media
deleted file mode 100755
index 6a4ec91..0000000
--- a/abs/mv-core/MythVantage-config/templates/samba/smb.conf.media
+++ /dev/null
@@ -1,10 +0,0 @@
-[media]
-   path = /data/media
-   public = yes
-   only guest = yes
-   writeable  = yes
-   printable = no
-  force user = mythtv
-  force group = mythtv
-  create mask = 0755
-
diff --git a/abs/mv-core/MythVantage-config/templates/samba/smb.conf.template b/abs/mv-core/MythVantage-config/templates/samba/smb.conf.template
deleted file mode 100644
index 42ddb99..0000000
--- a/abs/mv-core/MythVantage-config/templates/samba/smb.conf.template
+++ /dev/null
@@ -1,125 +0,0 @@
-#
-#======================= Global Settings =====================================
-[global]
-
-   workgroup = home_lan
-   server string = MythVantage
-
-# Security mode. Defines in which mode Samba will operate. Possible 
-# values are share, user, server, domain and ads. Most people will want 
-# user level security. See the Samba-HOWTO-Collection for details.
-   security = share
-
-# This option is important for security. It allows you to restrict
-# connections to machines which are on your local network. The
-# following example restricts access to two C class networks and
-# the "loopback" interface. For more examples of the syntax see
-# the smb.conf man page
-;   hosts allow = 192.168.1. 192.168.2. 127.
-
-   load printers = no
-
-# you may wish to override the location of the printcap file
-;   printcap name = /etc/printcap
-
-;  guest account = pcguest
-
-# this tells Samba to use a separate log file for each machine
-# that connects
-   log file = /var/log/samba/log.%m
-
-# Put a capping on the size of the log files (in Kb).
-   max log size = 50
-
-# Use password server option only with security = server
-# The argument list may include:
-#   password server = My_PDC_Name [My_BDC_Name] [My_Next_BDC_Name]
-# or to auto-locate the domain controller/s
-#   password server = *
-;   password server = <NT-Server-Name>
-
-# Use the realm option only with security = ads
-# Specifies the Active Directory realm the host is part of
-;   realm = MY_REALM
-
-# Backend to store user information in. New installations should 
-# use either tdbsam or ldapsam. smbpasswd is available for backwards 
-# compatibility. tdbsam requires no further configuration.
-;   passdb backend = tdbsam
-
-# Using the following line enables you to customise your configuration
-# on a per machine basis. The %m gets replaced with the netbios name
-# of the machine that is connecting.
-# Note: Consider carefully the location in the configuration file of
-#       this line.  The included file is read at that point.
-;   include = /usr/local/samba/lib/smb.conf.%m
-
-# Configure Samba to use multiple interfaces
-# If you have multiple network interfaces then you must list them
-# here. See the man page for details.
-;   interfaces = 192.168.12.2/24 192.168.13.2/24 
-
-# Browser Control Options:
-# set local master to no if you don't want Samba to become a master
-# browser on your network. Otherwise the normal election rules apply
-;   local master = no
-
-# OS Level determines the precedence of this server in master browser
-# elections. The default value should be reasonable
-;   os level = 33
-
-# Domain Master specifies Samba to be the Domain Master Browser. This
-# allows Samba to collate browse lists between subnets. Don't use this
-# if you already have a Windows NT domain controller doing this job
-;   domain master = yes 
-
-# Preferred Master causes Samba to force a local browser election on startup
-# and gives it a slightly higher chance of winning the election
-;   preferred master = yes
-
-# Enable this if you want Samba to be a domain logon server for 
-# Windows95 workstations. 
-;   domain logons = yes
-
-# if you enable domain logons then you may want a per-machine or
-# per user logon script
-# run a specific logon batch file per workstation (machine)
-;   logon script = %m.bat
-# run a specific logon batch file per username
-;   logon script = %U.bat
-
-# Where to store roving profiles (only for Win95 and WinNT)
-#        %L substitutes for this servers netbios name, %U is username
-#        You must uncomment the [Profiles] share below
-;   logon path = \\%L\Profiles\%U
-
-# Windows Internet Name Serving Support Section:
-# WINS Support - Tells the NMBD component of Samba to enable it's WINS Server
-;   wins support = yes
-
-# WINS Server - Tells the NMBD components of Samba to be a WINS Client
-#	Note: Samba can be either a WINS Server, or a WINS Client, but NOT both
-;   wins server = w.x.y.z
-
-# WINS Proxy - Tells Samba to answer name resolution queries on
-# behalf of a non WINS capable client, for this to work there must be
-# at least one	WINS Server on the network. The default is NO.
-;   wins proxy = yes
-
-# DNS Proxy - tells Samba whether or not to try to resolve NetBIOS names
-# via DNS nslookups. The default is NO.
-   dns proxy = no 
-
-# These scripts are used on a domain controller or stand-alone 
-# machine to add or delete corresponding unix accounts
-;  add user script = /usr/sbin/useradd %u
-;  add group script = /usr/sbin/groupadd %g
-;  add machine script = /usr/sbin/adduser -n -g machines -c Machine -d /dev/null -s /bin/false %u
-;  delete user script = /usr/sbin/userdel %u
-;  delete user from group script = /usr/sbin/deluser %u %g
-;  delete group script = /usr/sbin/groupdel %g
-
-
-#============================ Share Definitions ==============================
-
-
diff --git a/abs/mv-core/MythVantage-config/templates/settings/default_1/keybindings.txt b/abs/mv-core/MythVantage-config/templates/settings/default_1/keybindings.txt
deleted file mode 100644
index f82f2d2..0000000
--- a/abs/mv-core/MythVantage-config/templates/settings/default_1/keybindings.txt
+++ /dev/null
@@ -1,209 +0,0 @@
-context	action	description	keylist	hostname
-Music	FFWD	Fast forward	PgDown	REPLACEME
-Music	STOP	Stop playback	O	REPLACEME
-Music	MUTE	Mute	|,\\\\,F9	REPLACEME
-Gallery	SCROLLUP	Scroll image up	2	REPLACEME
-Music	VOLUMEDOWN	Volume down	[,{,F10	REPLACEME
-Music	VOLUMEUP	Volume up	],},F11	REPLACEME
-qt	DELETE	Delete	D	REPLACEME
-Music	RWND	Rewind	PgUp	REPLACEME
-qt	EDIT	Edit	E	REPLACEME
-Music	PAUSE	Pause/Start playback	P	REPLACEME
-Gallery	RECENTER	Recenter image	5	REPLACEME
-Gallery	FULLSIZE	Full-size (un-zoom) image	0	REPLACEME
-Gallery	LOWRIGHT	Go to the lower-right corner of the image	PgDown	REPLACEME
-Gallery	SCROLLRIGHT	Scroll image right	6	REPLACEME
-Gallery	MENU	Toggle activating menu in thumbnail view	M	REPLACEME
-Gallery	SCROLLDOWN	Scroll image down	8	REPLACEME
-Gallery	ZOOMIN	Zoom image in	9	REPLACEME
-Gallery	UPLEFT	Go to the upper-left corner of the image	PgUp	REPLACEME
-Gallery	RANDOMSHOW	Start Random Slideshow in thumbnail view	R	REPLACEME
-Gallery	ROTLEFT	Rotate image left 90 degrees	[,1	REPLACEME
-Gallery	SLIDESHOW	Start Slideshow in thumbnail view	S	REPLACEME
-Gallery	ROTRIGHT	Rotate image right 90 degrees	],3	REPLACEME
-Gallery	END	Go to the last image in thumbnail view	End	REPLACEME
-Gallery	HOME	Go to the first image in thumbnail view	Home	REPLACEME
-Gallery	SCROLLLEFT	Scroll image left	4	REPLACEME
-Gallery	PLAY	Start/Stop Slideshow	P	REPLACEME
-NetFlix	REMOVE	Removes movie from queue	D	REPLACEME
-Archive	TOGGLECUT	Toggle use cut list state for selected program	C	REPLACEME
-Gallery	ZOOMOUT	Zoom image out	7	REPLACEME
-NetFlix	MOVETOTOP	Moves movie to top of queue	1	REPLACEME
-Global	DOWN	Down Arrow	Down	REPLACEME
-ITV Menu	MENUTEXT	Menu Text	F7	REPLACEME
-ITV Menu	TEXTEXIT	Menu Exit	F6	REPLACEME
-Global	LEFT	Left Arrow	Left	REPLACEME
-Global	RIGHT	Right Arrow	Right	REPLACEME
-Global	UP	Up Arrow	Up	REPLACEME
-Global	MENU	Pop-up menu	M	REPLACEME
-Global	PREVVIEW	Previous View	Home	REPLACEME
-Global	ESCAPE	Escape	Esc	REPLACEME
-Global	PAGEUP	Page Up	PgUp	REPLACEME
-Global	SELECT	Select	Return,Enter,Space	REPLACEME
-Global	HELP	Help	F1	REPLACEME
-Global	INFO	More information	I	REPLACEME
-Global	NEXTVIEW	Next View	End	REPLACEME
-ITV Menu	MENUBLUE	Menu Blue	F5	REPLACEME
-Global	PAGEDOWN	Page Down	PgDown	REPLACEME
-Global	EJECT	Eject Removable Media		REPLACEME
-Global	3	3	3	REPLACEME
-Global	1	1	1	REPLACEME
-Global	6	6	6	REPLACEME
-Global	0	0	0	REPLACEME
-Global	2	2	2	REPLACEME
-Global	4	4	4	REPLACEME
-TV Frontend	DELETE	Delete Program	D	REPLACEME
-Global	8	8	8	REPLACEME
-Global	7	7	7	REPLACEME
-TV Frontend	PAGEDOWN	Page Down	9	REPLACEME
-TV Frontend	PAGEUP	Page Up	3	REPLACEME
-Global	5	5	5	REPLACEME
-TV Frontend	CHANGERECGROUP	Change Recording Group		REPLACEME
-Global	9	9	9	REPLACEME
-Video	END	Go to the last video	End	REPLACEME
-Video	INCPARENT	Increase Parental Level	],},F11	REPLACEME
-Weather	PAUSE	Pause current page	P	REPLACEME
-TV Frontend	TOGGLERECORD	Toggle recording status of current program	R	REPLACEME
-Video	BROWSE	Change browsable in video manager	B	REPLACEME
-Welcome	SHOWSETTINGS	Show Mythshutdown settings	F11	REPLACEME
-Video	HOME	Go to the first video	Home	REPLACEME
-Video	FILTER	Open video filter dialog	F	REPLACEME
-Welcome	STARTXTERM	Open an Xterm window	F12	REPLACEME
-Music	INCSEARCH	Show incremental search dialog	Ctrl+S	REPLACEME
-Music	BLANKSCR	Blank screen	5	REPLACEME
-Video	DELETE	Delete video	D	REPLACEME
-Music	THMBUP	Increase rating	9	REPLACEME
-Music	CYCLEVIS	Cycle visualizer mode	6	REPLACEME
-Teletext Menu	REVEAL	Reveal hidden Text	F8	REPLACEME
-Music	INCSEARCHNEXT	Incremental search find next match	Ctrl+N	REPLACEME
-TV Frontend	PLAYBACK	Play Program	P	REPLACEME
-News	FORCERETRIEVE	Force update news items	M	REPLACEME
-Video	DECPARENT	Decrease Parental Level	[,{,F10	REPLACEME
-News	RETRIEVENEWS	Update news items	I	REPLACEME
-News	CANCEL	Cancel news item updating	C	REPLACEME
-Teletext Menu	TOGGLEBACKGROUND	Toggle Background	F7	REPLACEME
-Teletext Menu	MENUWHITE	Menu White	F6	REPLACEME
-ITV Menu	MENURED	Menu Red	F2	REPLACEME
-ITV Menu	MENUYELLOW	Menu Yellow	F4	REPLACEME
-ITV Menu	MENUGREEN	Menu Green	F3	REPLACEME
-Teletext Menu	PREVSUBPAGE	Previous Subpage	Left	REPLACEME
-Teletext Menu	MENUYELLOW	Menu Yellow	F4	REPLACEME
-Teletext Menu	MENUGREEN	Menu Green	F3	REPLACEME
-Teletext Menu	NEXTSUBPAGE	Next Subpage	Right	REPLACEME
-Teletext Menu	MENUBLUE	Menu Blue	F5	REPLACEME
-Teletext Menu	TOGGLETT	Toggle Teletext	T	REPLACEME
-Teletext Menu	NEXTPAGE	Next Page	Down	REPLACEME
-TV Editing	LOADCOMMSKIP	Load cut list from commercial skips	Z,End	REPLACEME
-TV Editing	BIGJUMPREW	Jump back 10x the normal amount	,,<	REPLACEME
-TV Editing	BIGJUMPFWD	Jump forward 10x the normal amount	>,.	REPLACEME
-TV Playback	JUMPTODVDROOTMENU	Jump to the DVD Root Menu		REPLACEME
-Teletext Menu	MENURED	Menu Red	F2	REPLACEME
-TV Playback	SIGNALMON	Monitor Signal Quality	F7	REPLACEME
-Teletext Menu	PREVPAGE	Previous Page	Up	REPLACEME
-TV Editing	INVERTMAP	Invert Begin/End cut points	I	REPLACEME
-TV Playback	PLAY	Play	Ctrl+P	REPLACEME
-TV Editing	PREVCUT	Jump to the previous cut point	PgUp	REPLACEME
-TV Editing	NEXTCUT	Jump to the next cut point	PgDown	REPLACEME
-TV Playback	CYCLECOMMSKIPMODE	Cycle Commercial Skip mode		REPLACEME
-TV Playback	TOGGLESLEEP	Toggle the Sleep Timer	F8	REPLACEME
-TV Playback	JUMPREC	Display menu of recorded programs to jump to		REPLACEME
-TV Playback	FINDER	Show the Program Finder	#	REPLACEME
-TV Playback	ADJUSTSTRETCH	Turn on time stretch control	A	REPLACEME
-TV Editing	CLEARMAP	Clear editing cut points	C,Q,Home	REPLACEME
-TV Editing	TOGGLEEDIT	Exit out of Edit Mode	E	REPLACEME
-TV Playback	TOGGLESTRETCH	Toggle time stretch speed		REPLACEME
-TV Playback	TOGGLERECCONTROLS	Recording picture adjustments for this recorder	G	REPLACEME
-TV Playback	TOGGLEAUDIOSYNC	Turn on audio sync adjustment controls		REPLACEME
-TV Playback	TOGGLEEDIT	Start Edit Mode	E	REPLACEME
-TV Playback	SPEEDINC	Increase the playback speed	U	REPLACEME
-TV Playback	STRETCHDEC	Decrease time stretch speed		REPLACEME
-TV Playback	SPEEDDEC	Decrease the playback speed	J	REPLACEME
-TV Playback	TOGGLECHANCONTROLS	Recording picture adjustments for this channel	Ctrl+G	REPLACEME
-TV Playback	GUIDE	Show the Program Guide	S	REPLACEME
-TV Playback	JUMPPREV	Jump to previously played recording		REPLACEME
-TV Playback	QUEUETRANSCODE	Queue the current recording for transcoding	X	REPLACEME
-TV Playback	STRETCHINC	Increase time stretch speed		REPLACEME
-TV Playback	TOGGLEPICCONTROLS	Playback picture adjustments	F	REPLACEME
-TV Playback	PREVCC708	Previous ATSC CC track		REPLACEME
-TV Playback	NEXTCC708	Next ATSC CC track		REPLACEME
-TV Playback	NEXTCC	Next of any captions		REPLACEME
-TV Playback	NEXTSCAN	Next video scan overidemode		REPLACEME
-TV Playback	NEXTCC608	Next VBI CC track		REPLACEME
-TV Playback	PREVCC608	Previous VBI CC track		REPLACEME
-TV Playback	PREVAUDIO	Previous audio track	-	REPLACEME
-TV Playback	PREVSUBTITLE	Previous subtitle track		REPLACEME
-TV Playback	NEXTSUBTITLE	Next subtitle track		REPLACEME
-TV Playback	NEXTAUDIO	Next audio track	+	REPLACEME
-TV Playback	SELECTCC708_3	Display ATSC CC4		REPLACEME
-TV Playback	SELECTCC708_0	Display ATSC CC1		REPLACEME
-TV Playback	SELECTCC608_1	Display VBI CC2		REPLACEME
-TV Playback	SELECTAUDIO_0	Play audio track 1		REPLACEME
-TV Playback	SELECTCC608_2	Display VBI CC3		REPLACEME
-TV Playback	TOGGLETTM	Toggle Teletext Menu		REPLACEME
-TV Playback	SELECTSUBTITLE_1	Display subtitle 2		REPLACEME
-TV Playback	SELECTCC608_3	Display VBI CC4		REPLACEME
-TV Playback	SELECTCC708_1	Display ATSC CC2		REPLACEME
-TV Playback	SELECTCC708_2	Display ATSC CC3		REPLACEME
-TV Playback	SELECTAUDIO_1	Play audio track 2		REPLACEME
-TV Playback	SELECTSUBTITLE_0	Display subtitle 1		REPLACEME
-TV Playback	TOGGLETTC	Toggle Teletext Captions		REPLACEME
-TV Playback	SELECTCC608_0	Display VBI CC1		REPLACEME
-TV Playback	SWAPPIP	Swap PiP/Main	N	REPLACEME
-TV Playback	TOGGLEASPECT	Toggle the display aspect ratio	W	REPLACEME
-TV Playback	TOGGLECC708	Toggle ATSC CC		REPLACEME
-TV Playback	TOGGLECC608	Toggle VBI CC		REPLACEME
-TV Playback	TOGGLEPIPMODE	Toggle Picture-in-Picture mode	V	REPLACEME
-TV Playback	TOGGLEFAV	Toggle the current channel as a favorite	?	REPLACEME
-TV Playback	TOGGLEPIPWINDOW	Toggle active PiP window	B	REPLACEME
-TV Playback	MUTE	Mute	|,\\\\,F9	REPLACEME
-TV Playback	TOGGLEBROWSE	Toggle channel browse mode	O	REPLACEME
-TV Playback	TOGGLESUBTITLE	Toggle Subtitles		REPLACEME
-TV Playback	VOLUMEUP	Volume up	],},F11	REPLACEME
-TV Playback	TOGGLECC	Toggle any captions	T	REPLACEME
-TV Playback	JUMPSTART	Jump to the start of the recording.	Ctrl+B	REPLACEME
-TV Playback	TOGGLERECORD	Toggle recording status of current program	R	REPLACEME
-TV Playback	SKIPCOMMERCIAL	Skip Commercial	Z,End	REPLACEME
-TV Playback	VOLUMEDOWN	Volume down	[,{,F10	REPLACEME
-TV Playback	SWITCHCARDS	Switch Capture Cards	Y	REPLACEME
-TV Playback	SKIPCOMMBACK	Skip Commercial (Reverse)	Q,Home	REPLACEME
-TV Playback	TOGGLEINPUTS	Toggle Inputs	C	REPLACEME
-TV Playback	FFWDSTICKY	Fast Forward (Sticky) or Forward one frame while paused	>,.	REPLACEME
-TV Playback	JUMPFFWD	Jump ahead	PgDown	REPLACEME
-TV Playback	PREVCHAN	Switch to the previous channel	H	REPLACEME
-TV Playback	JUMPBKMRK	Jump to bookmark	K	REPLACEME
-TV Playback	RWNDSTICKY	Rewind (Sticky) or Rewind one frame while paused	,,<	REPLACEME
-TV Playback	NEXTFAV	Switch to the next favorite channel	/	REPLACEME
-TV Playback	JUMPRWND	Jump back	PgUp	REPLACEME
-TV Playback	SEEKRWND	Rewind	Left	REPLACEME
-TV Playback	SEEKFFWD	Fast Forward	Right	REPLACEME
-TV Playback	CHANNELDOWN	Channel down	Down	REPLACEME
-TV Playback	CHANNELUP	Channel up	Up	REPLACEME
-TV Playback	ARBSEEK	Arbitrary Seek	*	REPLACEME
-TV Playback	DELETE	Delete Program	D	REPLACEME
-TV Playback	CLEAROSD	Clear OSD	Backspace	REPLACEME
-TV Frontend	DETAILS	Show program details	U	REPLACEME
-TV Frontend	CUSTOMEDIT	Edit Custom Record Rule	E	REPLACEME
-TV Frontend	UPCOMING	List upcoming episodes	O	REPLACEME
-TV Frontend	CHANUPDATE	Switch channels without exiting guide in Live TV mode.	X	REPLACEME
-TV Frontend	RANKDEC	Decrease program or channel rank	Left	REPLACEME
-TV Frontend	VIEWCARD	Switch Capture Card view	Y	REPLACEME
-TV Playback	PAUSE	Pause	P	REPLACEME
-TV Frontend	RANKINC	Increase program or channel rank	Right	REPLACEME
-TV Frontend	PAGERIGHT	Page the program guide right	>,.	REPLACEME
-TV Frontend	PAGELEFT	Page the program guide left	,,<	REPLACEME
-TV Frontend	NEXTFAV	Toggle showing all channels or just favorites in the program guide.	/	REPLACEME
-Gallery	DELETE	Delete marked images or current image if none are marked	D	REPLACEME
-TV Frontend	DAYRIGHT	Page the program guide forward one day	End,1	REPLACEME
-Gallery	MARK	Mark image	T	REPLACEME
-Game	TOGGLEFAV	Toggle the current game as a favorite	?,/	REPLACEME
-TV Frontend	TOGGLEFAV	Toggle the current channel as a favorite	?	REPLACEME
-TV Frontend	DAYLEFT	Page the program guide back one day	Home,7	REPLACEME
-Music	PREVTRACK	Move to the previous track	,,<,Q,Home	REPLACEME
-Game	INCSEARCHNEXT	Incremental search find next match	Ctrl+N	REPLACEME
-Music	DELETE	Delete track from playlist	D	REPLACEME
-Gallery	INFO	Toggle Showing Information about Image	I	REPLACEME
-Game	INCSEARCH	Show incremental search dialog	Ctrl+S	REPLACEME
-Music	REFRESH	Refresh music tree	8	REPLACEME
-Music	NEXTTRACK	Move to the next track	>,.,Z,End	REPLACEME
-Music	FILTER	Filter All My Music	F	REPLACEME
-Music	THMBDOWN	Decrease rating	7	REPLACEME
diff --git a/abs/mv-core/MythVantage-config/templates/settings/default_1/settings.txt b/abs/mv-core/MythVantage-config/templates/settings/default_1/settings.txt
deleted file mode 100644
index 8c3a391..0000000
--- a/abs/mv-core/MythVantage-config/templates/settings/default_1/settings.txt
+++ /dev/null
@@ -1,320 +0,0 @@
-value	data	hostname
-AC3PassThru	0	REPLACEME
-AggressiveSoundcardBuffer	0	REPLACEME
-AllowQuitShutdown	3	REPLACEME
-AltClearSavedPosition	1	REPLACEME
-AspectOverride	0	REPLACEME
-AudioNag	1	REPLACEME
-AudioOutputDevice	/dev/dsp	REPLACEME
-AutoCommercialSkip	2	REPLACEME
-AutoLookupCD	1	REPLACEME
-AutomaticSetWatched	0	REPLACEME
-AutoPlayCD	0	REPLACEME
-BackendServerPort	6543	REPLACEME
-BackendStatusPort	6544	REPLACEME
-CCBackground	0	REPLACEME
-CDBlankType	fast	REPLACEME
-CDCreateDir	1	REPLACEME
-CDDevice	/dev/cdrom	REPLACEME
-CDDiskSize	1	REPLACEME
-CDWriterEnabled	0	REPLACEME
-CDWriteSpeed	0	REPLACEME
-ChannelFormat	<num> <sign>	REPLACEME
-ChannelOrdering	channum	REPLACEME
-chanPerPage	5	REPLACEME
-ClearSavedPosition	1	REPLACEME
-CommNotifyAmount	0	REPLACEME
-CommRewindAmount	0	REPLACEME
-CustomFilters		REPLACEME
-DateFormat	ddd MMM d	REPLACEME
-DecodeExtraAudio	1	REPLACEME
-Default MythVideo View	1	REPLACEME
-DefaultCCMode	0	REPLACEME
-DefaultRipQuality	0	REPLACEME
-DefaultTVChannel	3	REPLACEME
-Deinterlace	1	REPLACEME
-DeinterlaceFilter	kerneldeint	REPLACEME
-DisplayGroupDefaultView	0	REPLACEME
-DisplayGroupTitleSort	0	REPLACEME
-DisplayRecGroup	Default	REPLACEME
-DispRecGroupAsAllProg	0	REPLACEME
-DTSPassThru	0	REPLACEME
-DVDDeviceLocation	/dev/dvd	REPLACEME
-DVDOnInsertDVD	1	REPLACEME
-DVDRipLocation	/data/media/tmp	REPLACEME
-EjectCDAfterRipping	1	REPLACEME
-EnableMHEG	0	REPLACEME
-EnableXbox	0	REPLACEME
-EnableXbox	0	REPLACEME
-EncoderType	ogg	REPLACEME
-EndOfRecordingExitPrompt	1	REPLACEME
-EPGFillType	10	REPLACEME
-EPGScrollType	1	REPLACEME
-EPGShowCategoryColors	1	REPLACEME
-EPGShowCategoryText	1	REPLACEME
-EPGShowChannelIcon	1	REPLACEME
-EPGShowFavorites	0	REPLACEME
-ExactSeeking	0	REPLACEME
-FFRewReposTime	100	REPLACEME
-FFRewReverse	1	REPLACEME
-FilenameTemplate	ARTIST/ALBUM/TRACK-TITLE	REPLACEME
-GalleryDir	/data/media/images	REPLACEME
-GalleryImportDirs	/mnt/cdrom:/mnt/camera	REPLACEME
-GalleryMoviePlayerCmd	mplayer -fs %s	REPLACEME
-GalleryOverlayCaption	0	REPLACEME
-GalleryRecursiveSlideshow	1	REPLACEME
-GallerySortOrder	20	REPLACEME
-GalleryThumbnailLocation	1	REPLACEME
-GameAllTreeLevels	system gamename	REPLACEME
-GameFavTreeLevels	gamename	REPLACEME
-GeneratePreviewPixmaps	0	REPLACEME
-GuiHeight	0	REPLACEME
-GuiOffsetX	0	REPLACEME
-GuiOffsetY	0	REPLACEME
-GuiSizeForTV	0	REPLACEME
-GuiVidModeResolution	640x480	REPLACEME
-GuiWidth	0	REPLACEME
-HideMouseCursor	1	REPLACEME
-HorizScanPercentage	0	REPLACEME
-Ignore_ID3	0	REPLACEME
-IndividualMuteControl	0	REPLACEME
-IntelliLastPlayWeight	25	REPLACEME
-IntelliPlayCountWeight	25	REPLACEME
-IntelliRandomWeight	15	REPLACEME
-IntelliRatingWeight	35	REPLACEME
-ISO639Language0	eng	REPLACEME
-ISO639Language1	eng	REPLACEME
-JobAllowCommFlag	1	REPLACEME
-JobAllowTranscode	1	REPLACEME
-JobQueueCheckFrequency	60	REPLACEME
-JobQueueCPU	0	REPLACEME
-JobQueueMaxSimultaneousJobs	1	REPLACEME
-JobQueueWindowEnd	23:59	REPLACEME
-JobQueueWindowStart	00:00	REPLACEME
-KeyboardAccelerators	1	REPLACEME
-Language	EN	REPLACEME
-LastMusicPlaylistPush	0	REPLACEME
-LCDBacklightOn	1	REPLACEME
-LCDBigClock	0	REPLACEME
-LCDEnable	0	REPLACEME
-LCDHeartBeatOn	0	REPLACEME
-LCDKeyString	ABCDEF	REPLACEME
-LCDPopupTime	5	REPLACEME
-LCDShowChannel	1	REPLACEME
-LCDShowGeneric	1	REPLACEME
-LCDShowMenu	1	REPLACEME
-LCDShowMusic	1	REPLACEME
-LCDShowMusicItems	ArtistTitle	REPLACEME
-LCDShowRecStatus	0	REPLACEME
-LCDShowTime	1	REPLACEME
-LCDShowVolume	1	REPLACEME
-LircKeyPressedApp		REPLACEME
-ListAsShuffled	0	REPLACEME
-LiveTVInAllPrograms	0	REPLACEME
-LogCleanDays	14	REPLACEME
-LogCleanDays	14	REPLACEME
-LogCleanEnabled	0	REPLACEME
-LogCleanEnabled	0	REPLACEME
-LogCleanMax	30	REPLACEME
-LogCleanMax	30	REPLACEME
-LogCleanPeriod	14	REPLACEME
-LogCleanPeriod	14	REPLACEME
-LogMaxCount	100	REPLACEME
-LogMaxCount	100	REPLACEME
-LogPrintLevel	8	REPLACEME
-LogPrintLevel	8	REPLACEME
-LongChannelFormat	<num> <name>	REPLACEME
-MasterMixerVolume	70	REPLACEME
-MenuTheme	MythVantage-menu	REPLACEME
-MixerControl	PCM	REPLACEME
-MixerDevice	/dev/mixer	REPLACEME
-MonitorDrives	0	REPLACEME
-MovieDataCommandLine	/usr/local/share/mythtv/mythvideo/scripts/imdb.pl -D	REPLACEME
-MovieListCommandLine	/usr/local/share/mythtv/mythvideo/scripts/imdb.pl -M tv=no;video=no	REPLACEME
-MoviePosterCommandLine	/usr/local/share/mythtv/mythvideo/scripts/imdb.pl -P	REPLACEME
-Mp3UseVBR	0	REPLACEME
-MTDac3Flag	0	REPLACEME
-MTDConcurrentTranscodes	1	REPLACEME
-MTDLogFlag	0	REPLACEME
-MTDNiceLevel	20	REPLACEME
-MTDPort	2442	REPLACEME
-MTDRipSize	0	REPLACEME
-MTDxvidFlag	1	REPLACEME
-MusicAudioDevice	default	REPLACEME
-MusicLocation	/data/media/audio	REPLACEME
-MusicShowRatings	0	REPLACEME
-MythArchiveAlwaysUseMythTranscode	1	REPLACEME
-MythArchiveChapterMenuAR	Video	REPLACEME
-MythArchiveCopyRemoteFiles	1	REPLACEME
-MythArchiveDateFormat	%a  %b  %d	REPLACEME
-MythArchiveDvdauthorCmd	dvdauthor	REPLACEME
-MythArchiveDVDLocation	/dev/dvd	REPLACEME
-MythArchiveEncodeToAc3	1	REPLACEME
-MythArchiveFfmpegCmd	ffmpeg	REPLACEME
-MythArchiveFileFilter	*.mpg *.mov *.avi *.mpeg *.nuv	REPLACEME
-MythArchiveGrowisofsCmd	growisofs	REPLACEME
-MythArchiveMainMenuAR	16:9	REPLACEME
-MythArchiveMkisofsCmd	mkisofs	REPLACEME
-MythArchiveMpeg2encCmd	mpeg2enc	REPLACEME
-MythArchiveMplexCmd	mplex	REPLACEME
-MythArchivePng2yuvCmd	png2yuv	REPLACEME
-MythArchiveShareDir	/usr/local/share/mythtv/mytharchive/	REPLACEME
-MythArchiveSpumuxCmd	spumux	REPLACEME
-MythArchiveTcrequantCmd	tcrequant	REPLACEME
-MythArchiveTempDir	/data/media/tmp	REPLACEME
-MythArchiveTimeFormat	%I:%M %p	REPLACEME
-MythArchiveUseFIFO	1	REPLACEME
-MythArchiveVideoFormat	NTSC	REPLACEME
-MythControlsVolume	1	REPLACEME
-mythdvd.DVDPlayerCommand	Internal	REPLACEME
-mythvideo.db_folder_view	1	REPLACEME
-mythvideo.ImageCacheSize	50	REPLACEME
-mythvideo.sort_ignores_case	1	REPLACEME
-NetworkControlEnabled	1	REPLACEME
-NetworkControlPort	6546	REPLACEME
-NonID3FileNameFormat	GENRE/ARTIST/ALBUM/TRACK_TITLE	REPLACEME
-NoPromptOnExit	0	REPLACEME
-NoWhitespace	0	REPLACEME
-OnlyImportNewMusic	0	REPLACEME
-OSDCC708CapitalsFont	FreeMono.ttf	REPLACEME
-OSDCC708CapitalsItalicFont	FreeMono.ttf	REPLACEME
-OSDCC708CasualFont	FreeMono.ttf	REPLACEME
-OSDCC708CasualItalicFont	FreeMono.ttf	REPLACEME
-OSDCC708CursiveFont	FreeMono.ttf	REPLACEME
-OSDCC708CursiveItalicFont	FreeMono.ttf	REPLACEME
-OSDCC708DefaultFontType	MonoSerif	REPLACEME
-OSDCC708MonoSansSerifFont	FreeMono.ttf	REPLACEME
-OSDCC708MonoSansSerifItalicFont	FreeMono.ttf	REPLACEME
-OSDCC708MonoSerifFont	FreeMono.ttf	REPLACEME
-OSDCC708MonoSerifItalicFont	FreeMono.ttf	REPLACEME
-OSDCC708PropSansSerifFont	FreeMono.ttf	REPLACEME
-OSDCC708PropSansSerifItalicFont	FreeMono.ttf	REPLACEME
-OSDCC708PropSerifFont	FreeMono.ttf	REPLACEME
-OSDCC708PropSerifItalicFont	FreeMono.ttf	REPLACEME
-OSDCC708TextZoom	100	REPLACEME
-OSDCCFont	FreeMono.ttf	REPLACEME
-OSDFont	FreeMono.ttf	REPLACEME
-OSDGeneralTimeout	2	REPLACEME
-OSDNotifyTimeout	6	REPLACEME
-OSDProgramInfoTimeout	3	REPLACEME
-OSDTheme	Gray-OSD	REPLACEME
-OSDThemeFontSizeType	default	REPLACEME
-ParanoiaLevel	Full	REPLACEME
-PassThruOutputDevice	Default	REPLACEME
-PCMMixerVolume	70	REPLACEME
-PersistentBrowseMode	1	REPLACEME
-PIPLocation	0	REPLACEME
-PlaybackBoxStartInTitle	1	REPLACEME
-PlaybackExitPrompt	2	REPLACEME
-PlaybackPreview	1	REPLACEME
-PlaybackPreviewLowCPU	1	REPLACEME
-PlayBoxEpisodeSort	Date	REPLACEME
-PlayBoxOrdering	1	REPLACEME
-PlayBoxShading	0	REPLACEME
-PlayBoxTransparency	1	REPLACEME
-PlayMode	none	REPLACEME
-PostCDRipScript		REPLACEME
-PreferredMPEG2Decoder	ffmpeg	REPLACEME
-PreviewFromBookmark	1	REPLACEME
-PVR350EPGAlphaValue	164	REPLACEME
-PVR350InternalAudioOnly	0	REPLACEME
-PVR350OutputEnable	0	REPLACEME
-PVR350VideoDev	/dev/video16	REPLACEME
-QtFontBig	25	REPLACEME
-QtFontMedium	16	REPLACEME
-QtFontSmall	12	REPLACEME
-QueryInitialFilter	0	REPLACEME
-RandomTheme	0	REPLACEME
-RealtimePriority	1	REPLACEME
-RecordFilePrefix	/data/media/video/recordings	REPLACEME
-RememberRecGroup	1	REPLACEME
-RepeatMode	all	REPLACEME
-RunFrontendInWindow	0	REPLACEME
-SelChangeRecThreshold	16	REPLACEME
-SelectChangesChannel	1	REPLACEME
-ServiceMythWEB	0	REPLACEME
-ServiceNFS	0	REPLACEME
-ServiceSamba	0	REPLACEME
-SetupPinCodeRequired	0	REPLACEME
-ShortDateFormat	M/d	REPLACEME
-ShowGroupInfo	0	REPLACEME
-ShowWholeTree	1	REPLACEME
-SlideshowBackground		REPLACEME
-SlideshowDelay	5	REPLACEME
-SlideshowOpenGLTransition	none	REPLACEME
-SlideshowOpenGLTransitionLength	2000	REPLACEME
-SlideshowTransition	none	REPLACEME
-SmartChannelChange	0	REPLACEME
-SmartForward	0	REPLACEME
-StickyKeys	1	REPLACEME
-Style	Windows	REPLACEME
-SubTitleCommand	-sid %s	REPLACEME
-TagSeparator	 - 	REPLACEME
-Theme	basic-blue	REPLACEME
-ThemeFontSizeType	default	REPLACEME
-ThemePainter	qt	REPLACEME
-TimeFormat	h:mm AP	REPLACEME
-timePerPage	4	REPLACEME
-TitlePlayCommand	mplayer dvd://%t -dvd-device %d -fs -zoom -vo xv -aid %a -channels %c	REPLACEME
-TranscodeCommand	transcode	REPLACEME
-TreeLevels	splitartist artist album title	REPLACEME
-TVVidModeForceAspect	0.0	REPLACEME
-TVVidModeForceAspect0	0.0	REPLACEME
-TVVidModeForceAspect1	0.0	REPLACEME
-TVVidModeForceAspect2	0.0	REPLACEME
-TVVidModeRefreshRate	0	REPLACEME
-TVVidModeRefreshRate0	0	REPLACEME
-TVVidModeRefreshRate1	0	REPLACEME
-TVVidModeRefreshRate2	0	REPLACEME
-TVVidModeResolution	640x480	REPLACEME
-TVVidModeResolution0	640x480	REPLACEME
-TVVidModeResolution1	640x480	REPLACEME
-TVVidModeResolution2	640x480	REPLACEME
-UDPNotifyPort	6948	REPLACEME
-UnknownCategory	Unknown	REPLACEME
-UnknownTitle	Unknown	REPLACEME
-upnp:UDN:urn:schemas-upnp-org:device:MediaServer:1	dee5b0fe-7087-4960-8794-428d3e01a61f	REPLACEME
-UseArrowAccels	1	REPLACEME
-UseOutputPictureControls	1	REPLACEME
-UseVideoModes	0	REPLACEME
-UseVideoTimebase	0	REPLACEME
-UseVirtualKeyboard	1	REPLACEME
-VCDDeviceLocation	/dev/cdrom	REPLACEME
-VCDPlayerCommand	mplayer vcd:// -cdrom-device %d -fs -zoom -vo xv	REPLACEME
-VertScanPercentage	0	REPLACEME
-VideoAggressivePC	0	REPLACEME
-VideoArtworkDir	/data/media/images/posters	REPLACEME
-VideoBrowserNoDB	0	REPLACEME
-VideoDefaultParentalLevel	4	REPLACEME
-VideoGalleryAspectRatio	1	REPLACEME
-VideoGalleryColsPerPage	4	REPLACEME
-VideoGalleryNoDB	0	REPLACEME
-VideoGalleryRowsPerPage	3	REPLACEME
-VideoGallerySubtitle	1	REPLACEME
-VideoListUnknownFiletypes	1	REPLACEME
-VideoNewBrowsable	1	REPLACEME
-VideoDefaultPlayer	Internal	REPLACEME
-VideoStartupDir	/data/media/video/movies	REPLACEME
-VideoTreeLoadMetaData	1	REPLACEME
-VideoTreeNoDB	0	REPLACEME
-VidModeHeight0	0	REPLACEME
-VidModeHeight1	0	REPLACEME
-VidModeHeight2	0	REPLACEME
-VidModeWidth0	0	REPLACEME
-VidModeWidth1	0	REPLACEME
-VidModeWidth2	0	REPLACEME
-VisualCycleOnSongChange	0	REPLACEME
-VisualMode	Random	REPLACEME
-VisualModeDelay	0	REPLACEME
-VisualScaleHeight	1	REPLACEME
-VisualScaleWidth	1	REPLACEME
-WatchTVGuide	0	REPLACEME
-WebBrowserCommand	/usr/local/bin/mythbrowser	REPLACEME
-WebBrowserHideScrollbars	0	REPLACEME
-WebBrowserScrollMode	1	REPLACEME
-WebBrowserScrollSpeed	4	REPLACEME
-WebBrowserZoomLevel	20	REPLACEME
-XScanDisplacement	0	REPLACEME
-YScanDisplacement	0	REPLACEME
-HaltCommand	sudo /sbin/poweroff	REPLACEME
-RebootCommand	sudo /sbin/reboot	REPLACEME
diff --git a/abs/mv-core/MythVantage-config/templates/settings/default_2/keybindings.txt b/abs/mv-core/MythVantage-config/templates/settings/default_2/keybindings.txt
deleted file mode 100644
index f82f2d2..0000000
--- a/abs/mv-core/MythVantage-config/templates/settings/default_2/keybindings.txt
+++ /dev/null
@@ -1,209 +0,0 @@
-context	action	description	keylist	hostname
-Music	FFWD	Fast forward	PgDown	REPLACEME
-Music	STOP	Stop playback	O	REPLACEME
-Music	MUTE	Mute	|,\\\\,F9	REPLACEME
-Gallery	SCROLLUP	Scroll image up	2	REPLACEME
-Music	VOLUMEDOWN	Volume down	[,{,F10	REPLACEME
-Music	VOLUMEUP	Volume up	],},F11	REPLACEME
-qt	DELETE	Delete	D	REPLACEME
-Music	RWND	Rewind	PgUp	REPLACEME
-qt	EDIT	Edit	E	REPLACEME
-Music	PAUSE	Pause/Start playback	P	REPLACEME
-Gallery	RECENTER	Recenter image	5	REPLACEME
-Gallery	FULLSIZE	Full-size (un-zoom) image	0	REPLACEME
-Gallery	LOWRIGHT	Go to the lower-right corner of the image	PgDown	REPLACEME
-Gallery	SCROLLRIGHT	Scroll image right	6	REPLACEME
-Gallery	MENU	Toggle activating menu in thumbnail view	M	REPLACEME
-Gallery	SCROLLDOWN	Scroll image down	8	REPLACEME
-Gallery	ZOOMIN	Zoom image in	9	REPLACEME
-Gallery	UPLEFT	Go to the upper-left corner of the image	PgUp	REPLACEME
-Gallery	RANDOMSHOW	Start Random Slideshow in thumbnail view	R	REPLACEME
-Gallery	ROTLEFT	Rotate image left 90 degrees	[,1	REPLACEME
-Gallery	SLIDESHOW	Start Slideshow in thumbnail view	S	REPLACEME
-Gallery	ROTRIGHT	Rotate image right 90 degrees	],3	REPLACEME
-Gallery	END	Go to the last image in thumbnail view	End	REPLACEME
-Gallery	HOME	Go to the first image in thumbnail view	Home	REPLACEME
-Gallery	SCROLLLEFT	Scroll image left	4	REPLACEME
-Gallery	PLAY	Start/Stop Slideshow	P	REPLACEME
-NetFlix	REMOVE	Removes movie from queue	D	REPLACEME
-Archive	TOGGLECUT	Toggle use cut list state for selected program	C	REPLACEME
-Gallery	ZOOMOUT	Zoom image out	7	REPLACEME
-NetFlix	MOVETOTOP	Moves movie to top of queue	1	REPLACEME
-Global	DOWN	Down Arrow	Down	REPLACEME
-ITV Menu	MENUTEXT	Menu Text	F7	REPLACEME
-ITV Menu	TEXTEXIT	Menu Exit	F6	REPLACEME
-Global	LEFT	Left Arrow	Left	REPLACEME
-Global	RIGHT	Right Arrow	Right	REPLACEME
-Global	UP	Up Arrow	Up	REPLACEME
-Global	MENU	Pop-up menu	M	REPLACEME
-Global	PREVVIEW	Previous View	Home	REPLACEME
-Global	ESCAPE	Escape	Esc	REPLACEME
-Global	PAGEUP	Page Up	PgUp	REPLACEME
-Global	SELECT	Select	Return,Enter,Space	REPLACEME
-Global	HELP	Help	F1	REPLACEME
-Global	INFO	More information	I	REPLACEME
-Global	NEXTVIEW	Next View	End	REPLACEME
-ITV Menu	MENUBLUE	Menu Blue	F5	REPLACEME
-Global	PAGEDOWN	Page Down	PgDown	REPLACEME
-Global	EJECT	Eject Removable Media		REPLACEME
-Global	3	3	3	REPLACEME
-Global	1	1	1	REPLACEME
-Global	6	6	6	REPLACEME
-Global	0	0	0	REPLACEME
-Global	2	2	2	REPLACEME
-Global	4	4	4	REPLACEME
-TV Frontend	DELETE	Delete Program	D	REPLACEME
-Global	8	8	8	REPLACEME
-Global	7	7	7	REPLACEME
-TV Frontend	PAGEDOWN	Page Down	9	REPLACEME
-TV Frontend	PAGEUP	Page Up	3	REPLACEME
-Global	5	5	5	REPLACEME
-TV Frontend	CHANGERECGROUP	Change Recording Group		REPLACEME
-Global	9	9	9	REPLACEME
-Video	END	Go to the last video	End	REPLACEME
-Video	INCPARENT	Increase Parental Level	],},F11	REPLACEME
-Weather	PAUSE	Pause current page	P	REPLACEME
-TV Frontend	TOGGLERECORD	Toggle recording status of current program	R	REPLACEME
-Video	BROWSE	Change browsable in video manager	B	REPLACEME
-Welcome	SHOWSETTINGS	Show Mythshutdown settings	F11	REPLACEME
-Video	HOME	Go to the first video	Home	REPLACEME
-Video	FILTER	Open video filter dialog	F	REPLACEME
-Welcome	STARTXTERM	Open an Xterm window	F12	REPLACEME
-Music	INCSEARCH	Show incremental search dialog	Ctrl+S	REPLACEME
-Music	BLANKSCR	Blank screen	5	REPLACEME
-Video	DELETE	Delete video	D	REPLACEME
-Music	THMBUP	Increase rating	9	REPLACEME
-Music	CYCLEVIS	Cycle visualizer mode	6	REPLACEME
-Teletext Menu	REVEAL	Reveal hidden Text	F8	REPLACEME
-Music	INCSEARCHNEXT	Incremental search find next match	Ctrl+N	REPLACEME
-TV Frontend	PLAYBACK	Play Program	P	REPLACEME
-News	FORCERETRIEVE	Force update news items	M	REPLACEME
-Video	DECPARENT	Decrease Parental Level	[,{,F10	REPLACEME
-News	RETRIEVENEWS	Update news items	I	REPLACEME
-News	CANCEL	Cancel news item updating	C	REPLACEME
-Teletext Menu	TOGGLEBACKGROUND	Toggle Background	F7	REPLACEME
-Teletext Menu	MENUWHITE	Menu White	F6	REPLACEME
-ITV Menu	MENURED	Menu Red	F2	REPLACEME
-ITV Menu	MENUYELLOW	Menu Yellow	F4	REPLACEME
-ITV Menu	MENUGREEN	Menu Green	F3	REPLACEME
-Teletext Menu	PREVSUBPAGE	Previous Subpage	Left	REPLACEME
-Teletext Menu	MENUYELLOW	Menu Yellow	F4	REPLACEME
-Teletext Menu	MENUGREEN	Menu Green	F3	REPLACEME
-Teletext Menu	NEXTSUBPAGE	Next Subpage	Right	REPLACEME
-Teletext Menu	MENUBLUE	Menu Blue	F5	REPLACEME
-Teletext Menu	TOGGLETT	Toggle Teletext	T	REPLACEME
-Teletext Menu	NEXTPAGE	Next Page	Down	REPLACEME
-TV Editing	LOADCOMMSKIP	Load cut list from commercial skips	Z,End	REPLACEME
-TV Editing	BIGJUMPREW	Jump back 10x the normal amount	,,<	REPLACEME
-TV Editing	BIGJUMPFWD	Jump forward 10x the normal amount	>,.	REPLACEME
-TV Playback	JUMPTODVDROOTMENU	Jump to the DVD Root Menu		REPLACEME
-Teletext Menu	MENURED	Menu Red	F2	REPLACEME
-TV Playback	SIGNALMON	Monitor Signal Quality	F7	REPLACEME
-Teletext Menu	PREVPAGE	Previous Page	Up	REPLACEME
-TV Editing	INVERTMAP	Invert Begin/End cut points	I	REPLACEME
-TV Playback	PLAY	Play	Ctrl+P	REPLACEME
-TV Editing	PREVCUT	Jump to the previous cut point	PgUp	REPLACEME
-TV Editing	NEXTCUT	Jump to the next cut point	PgDown	REPLACEME
-TV Playback	CYCLECOMMSKIPMODE	Cycle Commercial Skip mode		REPLACEME
-TV Playback	TOGGLESLEEP	Toggle the Sleep Timer	F8	REPLACEME
-TV Playback	JUMPREC	Display menu of recorded programs to jump to		REPLACEME
-TV Playback	FINDER	Show the Program Finder	#	REPLACEME
-TV Playback	ADJUSTSTRETCH	Turn on time stretch control	A	REPLACEME
-TV Editing	CLEARMAP	Clear editing cut points	C,Q,Home	REPLACEME
-TV Editing	TOGGLEEDIT	Exit out of Edit Mode	E	REPLACEME
-TV Playback	TOGGLESTRETCH	Toggle time stretch speed		REPLACEME
-TV Playback	TOGGLERECCONTROLS	Recording picture adjustments for this recorder	G	REPLACEME
-TV Playback	TOGGLEAUDIOSYNC	Turn on audio sync adjustment controls		REPLACEME
-TV Playback	TOGGLEEDIT	Start Edit Mode	E	REPLACEME
-TV Playback	SPEEDINC	Increase the playback speed	U	REPLACEME
-TV Playback	STRETCHDEC	Decrease time stretch speed		REPLACEME
-TV Playback	SPEEDDEC	Decrease the playback speed	J	REPLACEME
-TV Playback	TOGGLECHANCONTROLS	Recording picture adjustments for this channel	Ctrl+G	REPLACEME
-TV Playback	GUIDE	Show the Program Guide	S	REPLACEME
-TV Playback	JUMPPREV	Jump to previously played recording		REPLACEME
-TV Playback	QUEUETRANSCODE	Queue the current recording for transcoding	X	REPLACEME
-TV Playback	STRETCHINC	Increase time stretch speed		REPLACEME
-TV Playback	TOGGLEPICCONTROLS	Playback picture adjustments	F	REPLACEME
-TV Playback	PREVCC708	Previous ATSC CC track		REPLACEME
-TV Playback	NEXTCC708	Next ATSC CC track		REPLACEME
-TV Playback	NEXTCC	Next of any captions		REPLACEME
-TV Playback	NEXTSCAN	Next video scan overidemode		REPLACEME
-TV Playback	NEXTCC608	Next VBI CC track		REPLACEME
-TV Playback	PREVCC608	Previous VBI CC track		REPLACEME
-TV Playback	PREVAUDIO	Previous audio track	-	REPLACEME
-TV Playback	PREVSUBTITLE	Previous subtitle track		REPLACEME
-TV Playback	NEXTSUBTITLE	Next subtitle track		REPLACEME
-TV Playback	NEXTAUDIO	Next audio track	+	REPLACEME
-TV Playback	SELECTCC708_3	Display ATSC CC4		REPLACEME
-TV Playback	SELECTCC708_0	Display ATSC CC1		REPLACEME
-TV Playback	SELECTCC608_1	Display VBI CC2		REPLACEME
-TV Playback	SELECTAUDIO_0	Play audio track 1		REPLACEME
-TV Playback	SELECTCC608_2	Display VBI CC3		REPLACEME
-TV Playback	TOGGLETTM	Toggle Teletext Menu		REPLACEME
-TV Playback	SELECTSUBTITLE_1	Display subtitle 2		REPLACEME
-TV Playback	SELECTCC608_3	Display VBI CC4		REPLACEME
-TV Playback	SELECTCC708_1	Display ATSC CC2		REPLACEME
-TV Playback	SELECTCC708_2	Display ATSC CC3		REPLACEME
-TV Playback	SELECTAUDIO_1	Play audio track 2		REPLACEME
-TV Playback	SELECTSUBTITLE_0	Display subtitle 1		REPLACEME
-TV Playback	TOGGLETTC	Toggle Teletext Captions		REPLACEME
-TV Playback	SELECTCC608_0	Display VBI CC1		REPLACEME
-TV Playback	SWAPPIP	Swap PiP/Main	N	REPLACEME
-TV Playback	TOGGLEASPECT	Toggle the display aspect ratio	W	REPLACEME
-TV Playback	TOGGLECC708	Toggle ATSC CC		REPLACEME
-TV Playback	TOGGLECC608	Toggle VBI CC		REPLACEME
-TV Playback	TOGGLEPIPMODE	Toggle Picture-in-Picture mode	V	REPLACEME
-TV Playback	TOGGLEFAV	Toggle the current channel as a favorite	?	REPLACEME
-TV Playback	TOGGLEPIPWINDOW	Toggle active PiP window	B	REPLACEME
-TV Playback	MUTE	Mute	|,\\\\,F9	REPLACEME
-TV Playback	TOGGLEBROWSE	Toggle channel browse mode	O	REPLACEME
-TV Playback	TOGGLESUBTITLE	Toggle Subtitles		REPLACEME
-TV Playback	VOLUMEUP	Volume up	],},F11	REPLACEME
-TV Playback	TOGGLECC	Toggle any captions	T	REPLACEME
-TV Playback	JUMPSTART	Jump to the start of the recording.	Ctrl+B	REPLACEME
-TV Playback	TOGGLERECORD	Toggle recording status of current program	R	REPLACEME
-TV Playback	SKIPCOMMERCIAL	Skip Commercial	Z,End	REPLACEME
-TV Playback	VOLUMEDOWN	Volume down	[,{,F10	REPLACEME
-TV Playback	SWITCHCARDS	Switch Capture Cards	Y	REPLACEME
-TV Playback	SKIPCOMMBACK	Skip Commercial (Reverse)	Q,Home	REPLACEME
-TV Playback	TOGGLEINPUTS	Toggle Inputs	C	REPLACEME
-TV Playback	FFWDSTICKY	Fast Forward (Sticky) or Forward one frame while paused	>,.	REPLACEME
-TV Playback	JUMPFFWD	Jump ahead	PgDown	REPLACEME
-TV Playback	PREVCHAN	Switch to the previous channel	H	REPLACEME
-TV Playback	JUMPBKMRK	Jump to bookmark	K	REPLACEME
-TV Playback	RWNDSTICKY	Rewind (Sticky) or Rewind one frame while paused	,,<	REPLACEME
-TV Playback	NEXTFAV	Switch to the next favorite channel	/	REPLACEME
-TV Playback	JUMPRWND	Jump back	PgUp	REPLACEME
-TV Playback	SEEKRWND	Rewind	Left	REPLACEME
-TV Playback	SEEKFFWD	Fast Forward	Right	REPLACEME
-TV Playback	CHANNELDOWN	Channel down	Down	REPLACEME
-TV Playback	CHANNELUP	Channel up	Up	REPLACEME
-TV Playback	ARBSEEK	Arbitrary Seek	*	REPLACEME
-TV Playback	DELETE	Delete Program	D	REPLACEME
-TV Playback	CLEAROSD	Clear OSD	Backspace	REPLACEME
-TV Frontend	DETAILS	Show program details	U	REPLACEME
-TV Frontend	CUSTOMEDIT	Edit Custom Record Rule	E	REPLACEME
-TV Frontend	UPCOMING	List upcoming episodes	O	REPLACEME
-TV Frontend	CHANUPDATE	Switch channels without exiting guide in Live TV mode.	X	REPLACEME
-TV Frontend	RANKDEC	Decrease program or channel rank	Left	REPLACEME
-TV Frontend	VIEWCARD	Switch Capture Card view	Y	REPLACEME
-TV Playback	PAUSE	Pause	P	REPLACEME
-TV Frontend	RANKINC	Increase program or channel rank	Right	REPLACEME
-TV Frontend	PAGERIGHT	Page the program guide right	>,.	REPLACEME
-TV Frontend	PAGELEFT	Page the program guide left	,,<	REPLACEME
-TV Frontend	NEXTFAV	Toggle showing all channels or just favorites in the program guide.	/	REPLACEME
-Gallery	DELETE	Delete marked images or current image if none are marked	D	REPLACEME
-TV Frontend	DAYRIGHT	Page the program guide forward one day	End,1	REPLACEME
-Gallery	MARK	Mark image	T	REPLACEME
-Game	TOGGLEFAV	Toggle the current game as a favorite	?,/	REPLACEME
-TV Frontend	TOGGLEFAV	Toggle the current channel as a favorite	?	REPLACEME
-TV Frontend	DAYLEFT	Page the program guide back one day	Home,7	REPLACEME
-Music	PREVTRACK	Move to the previous track	,,<,Q,Home	REPLACEME
-Game	INCSEARCHNEXT	Incremental search find next match	Ctrl+N	REPLACEME
-Music	DELETE	Delete track from playlist	D	REPLACEME
-Gallery	INFO	Toggle Showing Information about Image	I	REPLACEME
-Game	INCSEARCH	Show incremental search dialog	Ctrl+S	REPLACEME
-Music	REFRESH	Refresh music tree	8	REPLACEME
-Music	NEXTTRACK	Move to the next track	>,.,Z,End	REPLACEME
-Music	FILTER	Filter All My Music	F	REPLACEME
-Music	THMBDOWN	Decrease rating	7	REPLACEME
diff --git a/abs/mv-core/MythVantage-config/templates/settings/default_2/settings.txt b/abs/mv-core/MythVantage-config/templates/settings/default_2/settings.txt
deleted file mode 100644
index 106be04..0000000
--- a/abs/mv-core/MythVantage-config/templates/settings/default_2/settings.txt
+++ /dev/null
@@ -1,320 +0,0 @@
-value	data	hostname
-AC3PassThru	0	REPLACEME
-AggressiveSoundcardBuffer	0	REPLACEME
-AllowQuitShutdown	3	REPLACEME
-AltClearSavedPosition	1	REPLACEME
-AspectOverride	0	REPLACEME
-AudioNag	1	REPLACEME
-AudioOutputDevice	/dev/dsp	REPLACEME
-AutoCommercialSkip	2	REPLACEME
-AutoLookupCD	1	REPLACEME
-AutomaticSetWatched	0	REPLACEME
-AutoPlayCD	0	REPLACEME
-BackendServerPort	6543	REPLACEME
-BackendStatusPort	6544	REPLACEME
-CCBackground	0	REPLACEME
-CDBlankType	fast	REPLACEME
-CDCreateDir	1	REPLACEME
-CDDevice	/dev/cdrom	REPLACEME
-CDDiskSize	1	REPLACEME
-CDWriterEnabled	0	REPLACEME
-CDWriteSpeed	0	REPLACEME
-ChannelFormat	<num> <sign>	REPLACEME
-ChannelOrdering	channum	REPLACEME
-chanPerPage	5	REPLACEME
-ClearSavedPosition	1	REPLACEME
-CommNotifyAmount	0	REPLACEME
-CommRewindAmount	0	REPLACEME
-CustomFilters		REPLACEME
-DateFormat	ddd MMM d	REPLACEME
-DecodeExtraAudio	1	REPLACEME
-Default MythVideo View	1	REPLACEME
-DefaultCCMode	0	REPLACEME
-DefaultRipQuality	0	REPLACEME
-DefaultTVChannel	3	REPLACEME
-Deinterlace	1	REPLACEME
-DeinterlaceFilter	kerneldeint	REPLACEME
-DisplayGroupDefaultView	0	REPLACEME
-DisplayGroupTitleSort	0	REPLACEME
-DisplayRecGroup	Default	REPLACEME
-DispRecGroupAsAllProg	0	REPLACEME
-DTSPassThru	0	REPLACEME
-DVDDeviceLocation	/dev/dvd	REPLACEME
-DVDOnInsertDVD	1	REPLACEME
-DVDRipLocation	/data/media/tmp	REPLACEME
-EjectCDAfterRipping	1	REPLACEME
-EnableMHEG	0	REPLACEME
-EnableXbox	0	REPLACEME
-EnableXbox	0	REPLACEME
-EncoderType	ogg	REPLACEME
-EndOfRecordingExitPrompt	1	REPLACEME
-EPGFillType	10	REPLACEME
-EPGScrollType	1	REPLACEME
-EPGShowCategoryColors	1	REPLACEME
-EPGShowCategoryText	1	REPLACEME
-EPGShowChannelIcon	1	REPLACEME
-EPGShowFavorites	0	REPLACEME
-ExactSeeking	0	REPLACEME
-FFRewReposTime	100	REPLACEME
-FFRewReverse	1	REPLACEME
-FilenameTemplate	ARTIST/ALBUM/TRACK-TITLE	REPLACEME
-GalleryDir	/data/media/images	REPLACEME
-GalleryImportDirs	/mnt/cdrom:/mnt/camera	REPLACEME
-GalleryMoviePlayerCmd	mplayer -fs %s	REPLACEME
-GalleryOverlayCaption	0	REPLACEME
-GalleryRecursiveSlideshow	1	REPLACEME
-GallerySortOrder	20	REPLACEME
-GalleryThumbnailLocation	1	REPLACEME
-GameAllTreeLevels	system gamename	REPLACEME
-GameFavTreeLevels	gamename	REPLACEME
-GeneratePreviewPixmaps	0	REPLACEME
-GuiHeight	0	REPLACEME
-GuiOffsetX	0	REPLACEME
-GuiOffsetY	0	REPLACEME
-GuiSizeForTV	0	REPLACEME
-GuiVidModeResolution	640x480	REPLACEME
-GuiWidth	0	REPLACEME
-HaltCommand	halt	REPLACEME
-HideMouseCursor	1	REPLACEME
-HorizScanPercentage	0	REPLACEME
-Ignore_ID3	0	REPLACEME
-IndividualMuteControl	0	REPLACEME
-IntelliLastPlayWeight	25	REPLACEME
-IntelliPlayCountWeight	25	REPLACEME
-IntelliRandomWeight	15	REPLACEME
-IntelliRatingWeight	35	REPLACEME
-ISO639Language0	eng	REPLACEME
-ISO639Language1	eng	REPLACEME
-JobAllowCommFlag	1	REPLACEME
-JobAllowTranscode	1	REPLACEME
-JobQueueCheckFrequency	60	REPLACEME
-JobQueueCPU	0	REPLACEME
-JobQueueMaxSimultaneousJobs	1	REPLACEME
-JobQueueWindowEnd	23:59	REPLACEME
-JobQueueWindowStart	00:00	REPLACEME
-KeyboardAccelerators	1	REPLACEME
-Language	EN	REPLACEME
-LastMusicPlaylistPush	0	REPLACEME
-LCDBacklightOn	1	REPLACEME
-LCDBigClock	0	REPLACEME
-LCDEnable	0	REPLACEME
-LCDHeartBeatOn	0	REPLACEME
-LCDKeyString	ABCDEF	REPLACEME
-LCDPopupTime	5	REPLACEME
-LCDShowChannel	1	REPLACEME
-LCDShowGeneric	1	REPLACEME
-LCDShowMenu	1	REPLACEME
-LCDShowMusic	1	REPLACEME
-LCDShowMusicItems	ArtistTitle	REPLACEME
-LCDShowRecStatus	0	REPLACEME
-LCDShowTime	1	REPLACEME
-LCDShowVolume	1	REPLACEME
-LircKeyPressedApp		REPLACEME
-ListAsShuffled	0	REPLACEME
-LiveTVInAllPrograms	0	REPLACEME
-LogCleanDays	14	REPLACEME
-LogCleanDays	14	REPLACEME
-LogCleanEnabled	0	REPLACEME
-LogCleanEnabled	0	REPLACEME
-LogCleanMax	30	REPLACEME
-LogCleanMax	30	REPLACEME
-LogCleanPeriod	14	REPLACEME
-LogCleanPeriod	14	REPLACEME
-LogMaxCount	100	REPLACEME
-LogMaxCount	100	REPLACEME
-LogPrintLevel	8	REPLACEME
-LogPrintLevel	8	REPLACEME
-LongChannelFormat	<num> <name>	REPLACEME
-MasterMixerVolume	70	REPLACEME
-MenuTheme	STB-menu	REPLACEME
-MixerControl	PCM	REPLACEME
-MixerDevice	/dev/mixer	REPLACEME
-MonitorDrives	0	REPLACEME
-MovieDataCommandLine	/usr/local/share/mythtv/mythvideo/scripts/imdb.pl -D	REPLACEME
-MovieListCommandLine	/usr/local/share/mythtv/mythvideo/scripts/imdb.pl -M tv=no;video=no	REPLACEME
-MoviePosterCommandLine	/usr/local/share/mythtv/mythvideo/scripts/imdb.pl -P	REPLACEME
-Mp3UseVBR	0	REPLACEME
-MTDac3Flag	0	REPLACEME
-MTDConcurrentTranscodes	1	REPLACEME
-MTDLogFlag	0	REPLACEME
-MTDNiceLevel	20	REPLACEME
-MTDPort	2442	REPLACEME
-MTDRipSize	0	REPLACEME
-MTDxvidFlag	1	REPLACEME
-MusicAudioDevice	default	REPLACEME
-MusicLocation	/data/media/audio	REPLACEME
-MusicShowRatings	0	REPLACEME
-MythArchiveAlwaysUseMythTranscode	1	REPLACEME
-MythArchiveChapterMenuAR	Video	REPLACEME
-MythArchiveCopyRemoteFiles	1	REPLACEME
-MythArchiveDateFormat	%a  %b  %d	REPLACEME
-MythArchiveDvdauthorCmd	dvdauthor	REPLACEME
-MythArchiveDVDLocation	/dev/dvd	REPLACEME
-MythArchiveEncodeToAc3	1	REPLACEME
-MythArchiveFfmpegCmd	ffmpeg	REPLACEME
-MythArchiveFileFilter	*.mpg *.mov *.avi *.mpeg *.nuv	REPLACEME
-MythArchiveGrowisofsCmd	growisofs	REPLACEME
-MythArchiveMainMenuAR	16:9	REPLACEME
-MythArchiveMkisofsCmd	mkisofs	REPLACEME
-MythArchiveMpeg2encCmd	mpeg2enc	REPLACEME
-MythArchiveMplexCmd	mplex	REPLACEME
-MythArchivePng2yuvCmd	png2yuv	REPLACEME
-MythArchiveShareDir	/usr/local/share/mythtv/mytharchive/	REPLACEME
-MythArchiveSpumuxCmd	spumux	REPLACEME
-MythArchiveTcrequantCmd	tcrequant	REPLACEME
-MythArchiveTempDir	/data/media/tmp	REPLACEME
-MythArchiveTimeFormat	%I:%M %p	REPLACEME
-MythArchiveUseFIFO	1	REPLACEME
-MythArchiveVideoFormat	NTSC	REPLACEME
-MythControlsVolume	1	REPLACEME
-mythdvd.DVDPlayerCommand	Internal	REPLACEME
-mythvideo.db_folder_view	1	REPLACEME
-mythvideo.ImageCacheSize	50	REPLACEME
-mythvideo.sort_ignores_case	1	REPLACEME
-NetworkControlEnabled	1	REPLACEME
-NetworkControlPort	6546	REPLACEME
-NonID3FileNameFormat	GENRE/ARTIST/ALBUM/TRACK_TITLE	REPLACEME
-NoPromptOnExit	0	REPLACEME
-NoWhitespace	0	REPLACEME
-OnlyImportNewMusic	0	REPLACEME
-OSDCC708CapitalsFont	FreeMono.ttf	REPLACEME
-OSDCC708CapitalsItalicFont	FreeMono.ttf	REPLACEME
-OSDCC708CasualFont	FreeMono.ttf	REPLACEME
-OSDCC708CasualItalicFont	FreeMono.ttf	REPLACEME
-OSDCC708CursiveFont	FreeMono.ttf	REPLACEME
-OSDCC708CursiveItalicFont	FreeMono.ttf	REPLACEME
-OSDCC708DefaultFontType	MonoSerif	REPLACEME
-OSDCC708MonoSansSerifFont	FreeMono.ttf	REPLACEME
-OSDCC708MonoSansSerifItalicFont	FreeMono.ttf	REPLACEME
-OSDCC708MonoSerifFont	FreeMono.ttf	REPLACEME
-OSDCC708MonoSerifItalicFont	FreeMono.ttf	REPLACEME
-OSDCC708PropSansSerifFont	FreeMono.ttf	REPLACEME
-OSDCC708PropSansSerifItalicFont	FreeMono.ttf	REPLACEME
-OSDCC708PropSerifFont	FreeMono.ttf	REPLACEME
-OSDCC708PropSerifItalicFont	FreeMono.ttf	REPLACEME
-OSDCC708TextZoom	100	REPLACEME
-OSDCCFont	FreeMono.ttf	REPLACEME
-OSDFont	FreeMono.ttf	REPLACEME
-OSDGeneralTimeout	2	REPLACEME
-OSDNotifyTimeout	6	REPLACEME
-OSDProgramInfoTimeout	3	REPLACEME
-OSDTheme	Gray-OSD	REPLACEME
-OSDThemeFontSizeType	default	REPLACEME
-ParanoiaLevel	Full	REPLACEME
-PassThruOutputDevice	Default	REPLACEME
-PCMMixerVolume	70	REPLACEME
-PersistentBrowseMode	1	REPLACEME
-PIPLocation	0	REPLACEME
-PlaybackBoxStartInTitle	1	REPLACEME
-PlaybackExitPrompt	2	REPLACEME
-PlaybackPreview	1	REPLACEME
-PlaybackPreviewLowCPU	1	REPLACEME
-PlayBoxEpisodeSort	Date	REPLACEME
-PlayBoxOrdering	1	REPLACEME
-PlayBoxShading	0	REPLACEME
-PlayBoxTransparency	1	REPLACEME
-PlayMode	none	REPLACEME
-PostCDRipScript		REPLACEME
-PreferredMPEG2Decoder	ffmpeg	REPLACEME
-PreviewFromBookmark	1	REPLACEME
-PVR350EPGAlphaValue	164	REPLACEME
-PVR350InternalAudioOnly	0	REPLACEME
-PVR350OutputEnable	0	REPLACEME
-PVR350VideoDev	/dev/video16	REPLACEME
-QtFontBig	25	REPLACEME
-QtFontMedium	16	REPLACEME
-QtFontSmall	12	REPLACEME
-QueryInitialFilter	0	REPLACEME
-RandomTheme	0	REPLACEME
-RealtimePriority	1	REPLACEME
-RecordFilePrefix	/data/media/video/recordings	REPLACEME
-RememberRecGroup	1	REPLACEME
-RepeatMode	all	REPLACEME
-RunFrontendInWindow	0	REPLACEME
-SelChangeRecThreshold	16	REPLACEME
-SelectChangesChannel	1	REPLACEME
-ServiceMythWEB	0	REPLACEME
-ServiceNFS	0	REPLACEME
-ServiceSamba	0	REPLACEME
-SetupPinCodeRequired	0	REPLACEME
-ShortDateFormat	M/d	REPLACEME
-ShowGroupInfo	0	REPLACEME
-ShowWholeTree	1	REPLACEME
-SlideshowBackground		REPLACEME
-SlideshowDelay	5	REPLACEME
-SlideshowOpenGLTransition	none	REPLACEME
-SlideshowOpenGLTransitionLength	2000	REPLACEME
-SlideshowTransition	none	REPLACEME
-SmartChannelChange	0	REPLACEME
-SmartForward	0	REPLACEME
-StickyKeys	1	REPLACEME
-Style		REPLACEME
-SubTitleCommand	-sid %s	REPLACEME
-TagSeparator	 - 	REPLACEME
-Theme	basic-blue	REPLACEME
-ThemeFontSizeType	default	REPLACEME
-ThemePainter	qt	REPLACEME
-TimeFormat	h:mm AP	REPLACEME
-timePerPage	4	REPLACEME
-TitlePlayCommand	mplayer dvd://%t -dvd-device %d -fs -zoom -vo xv -aid %a -channels %c	REPLACEME
-TranscodeCommand	transcode	REPLACEME
-TreeLevels	splitartist artist album title	REPLACEME
-TVVidModeForceAspect	0.0	REPLACEME
-TVVidModeForceAspect0	0.0	REPLACEME
-TVVidModeForceAspect1	0.0	REPLACEME
-TVVidModeForceAspect2	0.0	REPLACEME
-TVVidModeRefreshRate	0	REPLACEME
-TVVidModeRefreshRate0	0	REPLACEME
-TVVidModeRefreshRate1	0	REPLACEME
-TVVidModeRefreshRate2	0	REPLACEME
-TVVidModeResolution	640x480	REPLACEME
-TVVidModeResolution0	640x480	REPLACEME
-TVVidModeResolution1	640x480	REPLACEME
-TVVidModeResolution2	640x480	REPLACEME
-UDPNotifyPort	6948	REPLACEME
-UnknownCategory	Unknown	REPLACEME
-UnknownTitle	Unknown	REPLACEME
-upnp:UDN:urn:schemas-upnp-org:device:MediaServer:1	dee5b0fe-7087-4960-8794-428d3e01a61f	REPLACEME
-UseArrowAccels	1	REPLACEME
-UseDHCP	1	REPLACEME
-UseOutputPictureControls	1	REPLACEME
-UseVideoModes	0	REPLACEME
-UseVideoTimebase	0	REPLACEME
-UseVirtualKeyboard	1	REPLACEME
-VCDDeviceLocation	/dev/cdrom	REPLACEME
-VCDPlayerCommand	mplayer vcd:// -cdrom-device %d -fs -zoom -vo xv	REPLACEME
-VertScanPercentage	0	REPLACEME
-VideoAggressivePC	0	REPLACEME
-VideoArtworkDir	/data/media/images/posters	REPLACEME
-VideoBrowserNoDB	0	REPLACEME
-VideoDefaultParentalLevel	4	REPLACEME
-VideoGalleryAspectRatio	1	REPLACEME
-VideoGalleryColsPerPage	4	REPLACEME
-VideoGalleryNoDB	0	REPLACEME
-VideoGalleryRowsPerPage	3	REPLACEME
-VideoGallerySubtitle	1	REPLACEME
-VideoDefaultPlayer	/usr/bin/playmedia.sh VIDEO %s	REPLACEME
-VideoListUnknownFiletypes	1	REPLACEME
-VideoNewBrowsable	1	REPLACEME
-VideoStartupDir	/data/media/video/movies	REPLACEME
-VideoTreeLoadMetaData	1	REPLACEME
-VideoTreeNoDB	0	REPLACEME
-VidModeHeight0	0	REPLACEME
-VidModeHeight1	0	REPLACEME
-VidModeHeight2	0	REPLACEME
-VidModeWidth0	0	REPLACEME
-VidModeWidth1	0	REPLACEME
-VidModeWidth2	0	REPLACEME
-VisualCycleOnSongChange	0	REPLACEME
-VisualMode	Random	REPLACEME
-VisualModeDelay	0	REPLACEME
-VisualScaleHeight	1	REPLACEME
-VisualScaleWidth	1	REPLACEME
-WatchTVGuide	0	REPLACEME
-WebBrowserCommand	/usr/local/bin/mythbrowser	REPLACEME
-WebBrowserHideScrollbars	0	REPLACEME
-WebBrowserScrollMode	1	REPLACEME
-WebBrowserScrollSpeed	4	REPLACEME
-WebBrowserZoomLevel	20	REPLACEME
-XScanDisplacement	0	REPLACEME
-YScanDisplacement	0	REPLACEME
diff --git a/abs/mv-core/MythVantage-config/templates/sources/mv-core b/abs/mv-core/MythVantage-config/templates/sources/mv-core
deleted file mode 100644
index f9f6c97..0000000
--- a/abs/mv-core/MythVantage-config/templates/sources/mv-core
+++ /dev/null
@@ -1,2 +0,0 @@
-#Begin official list of mirrors
-Server = http://www.mythvantage.com/repo/mv-core
diff --git a/abs/mv-core/MythVantage-config/templates/sources/mv-core-testing b/abs/mv-core/MythVantage-config/templates/sources/mv-core-testing
deleted file mode 100644
index 1fce6ea..0000000
--- a/abs/mv-core/MythVantage-config/templates/sources/mv-core-testing
+++ /dev/null
@@ -1,2 +0,0 @@
-#Begin official list of mirrors
-Server = http://www.mythvantage.com/repo/mv-core-testing
diff --git a/abs/mv-core/MythVantage-config/templates/sources/mv-extra b/abs/mv-core/MythVantage-config/templates/sources/mv-extra
deleted file mode 100644
index e13640f..0000000
--- a/abs/mv-core/MythVantage-config/templates/sources/mv-extra
+++ /dev/null
@@ -1,2 +0,0 @@
-#Begin official list of mirrors
-Server = http://www.mythvantage.com/repo/mv-extra
diff --git a/abs/mv-core/MythVantage-config/templates/sources/mv-extra-testing b/abs/mv-core/MythVantage-config/templates/sources/mv-extra-testing
deleted file mode 100644
index c176add..0000000
--- a/abs/mv-core/MythVantage-config/templates/sources/mv-extra-testing
+++ /dev/null
@@ -1,2 +0,0 @@
-##Begin official list of mirrors
-Server = http://www.mythvantage.com/repo/mv-extra-testing
diff --git a/abs/mv-core/MythVantage-config/templates/sources/svc_pkg b/abs/mv-core/MythVantage-config/templates/sources/svc_pkg
deleted file mode 100644
index c1efdcc..0000000
--- a/abs/mv-core/MythVantage-config/templates/sources/svc_pkg
+++ /dev/null
@@ -1,3 +0,0 @@
-[svc_pkg]
-Server = http://REPLACEME/repo/mirror/svc_pkg/os/i686
-
diff --git a/abs/mv-core/MythVantage-config/templates/transmit/Time_Warner_SA3250/lircd.conf b/abs/mv-core/MythVantage-config/templates/transmit/Time_Warner_SA3250/lircd.conf
deleted file mode 100755
index 51db997..0000000
--- a/abs/mv-core/MythVantage-config/templates/transmit/Time_Warner_SA3250/lircd.conf
+++ /dev/null
@@ -1,413 +0,0 @@
-#
-
-begin remote 
- 
-   name   Time_Warner_SA3250 
-   flags CONST_LENGTH|RAW_CODES 
-   eps            30 
-   aeps          100 
- 
-   ptrail          0 
-   repeat     0     0 
-   gap    100240 
-   frequency   57600 
- 
-       begin raw_codes 
- 
-           name MUTE 
-               972     802     971     802    1887     778 
-               971     798     971     798     972     798 
-               971     798     972     798     971    1677 
-               972     802    1887    1656     992 
- 
-           name POWER 
-              3450    3229     894    2468     891    2468 
-               893     778     892    2468     891    2469 
-               917    2444     891    2468     892    2469 
-               891     779     892     778     918     752 
-               917     754     917     752     892    2471 
-               889     779     892     779     892     777 
-               892     779     892     777     868    2492 
-               892    2469     891    2470     890 
- 
-           name GUIDE 
-              3397    3285     890    2470     840    2519 
-               916     755     891    2470     839    2520 
-               891     780     891    2474     860    2495 
-               892     778     917     754     890     780 
-               891     781     864     804     917    2443 
-               865     805     891     779     866    2495 
-               864     805     892     779     891    2469 
-               865    2495     891    2469     866 
- 
- 
-           name INFO 
-              3449    3231     918    2441     920    2440 
-               920     750     947    2414     920    2440 
-               920     750     894     777     919     750 
-               947    2413     921     750     919     750 
-               920     751     919     752     918    2441 
-               921     749     895     776     919    2441 
-               920    2440     920    2441     920     749 
-               921    2439     921    2440     921 
- 
-           name UP 
-              3396    3285     915    2444     919    2442 
-               918     752     916    2444     919    2441 
-               919     751     916    2445     919     751 
-               890     780     916     753     917     754 
-               942     729     889     780     916    2445 
-               919     751     915     756     914    2448 
-               916     752     916    2444     918    2442 
-               919    2441     918    2443     918 
- 
-           name DOWN 
-              3421    3261     890    2470     918    2442 
-               919     751     916    2446     917    2441 
-               919    2442     918    2442     918     752 
-               916    2444     919     751     890     780 
-               916     755     915     755     915    2445 
-               919     753     914     755     889     781 
-               889     781     916    2444     919     752 
-               889    2471     919    2441     918 
- 
-           name LEFT 
-              3427    3255     918    2441     924    2437 
-               920     750     918    2442     920    2441 
-               919    2440     921    2439     921     750 
-               919     751     944     726     919     752 
-               917     753     918     751     944    2417 
-               920     750     893     777     919     751 
-               919     752     918    2441     921    2440 
-               920    2440     920    2440     921 
- 
-           name RIGHT 
-              3424    3258     892    2466     921    2439 
-               896     774     920    2441     920    2440 
-               920     750     920     751     945    2414 
-               921     750     919     751     920     750 
-               919     752     919     751     919    2440 
-               921     750     918     752     918    2442 
-               920    2440     921     749     918    2443 
-               920    2440     920    2441     919 
- 
-           name SELECT 
-              3424    3257     944    2416     919    2442 
-               919     750     918    2442     920    2441 
-               919     751     943     727     918    2442 
-               920    2440     920     752     916     752 
-               969     702     917     753     892    2468 
-               919     751     892     778     918    2442 
-               924    2436     921     750     917     753 
-               918    2443     919    2441     919 
- 
-           name SETTINGS 
-              3402    3278     871    2491     921    2438 
-               921     749     922    2440     919    2441 
-               919    2440     921     749     921     750 
-               895    2465     920    2440     921    2440 
-               920     749     896     775     921    2439 
-               920     749     923     748     895     775 
-               922    2439     920    2440     920     749 
-               897     774     896     774     921 
- 
-           name EXIT 
-              3400    3279     896    2464     921    2439 
-               921     750     895    2465     921    2439 
-               921     749     898     772     896    2465 
-               920    2440     920     750     920    2441 
-               920     749     896     774     870    2491 
-               921     749     921     749     895    2465 
-               921    2440     920     749     922     748 
-               897    2464     920     750     896 
- 
-           name PGUP 
-              3425    3255     920    2440     920    2440 
-               921     749     895    2466     920    2440 
-               920     749     920    2441     896    2464 
-               921     749     919    2445     917    2440 
-               920     750     920     750     920    2441 
-               921     748     921     749     920    2440 
-               921     750     919     752     919    2440 
-               921     749     921     750     919 
- 
-           name PGDN 
-              3400    3281     921    2438     921    2441 
-               920     749     895    2465     896    2465 
-               920    2440     920    2440     920    2440 
-               921     749     896    2465     895    2465 
-               920     750     895     775     920    2440 
-               921     749     921     750     895     775 
-               896     774     896     774     921    2439 
-               921     749     921     751     894 
- 
-           name VOLUP 
-               995     778    1886     779     994     775 
-               995     777     993     774     996     774 
-               995     775     995    1654    1885     778 
-               995     775     995     774     995 
- 
-           name VOLDN 
-               996     778     971     802    1862     803 
-               970     799     996     774     995     774 
-               996     774     995    1654    1886     778 
-               996     773     971    1678     991 
- 
-           name CHUP 
-              3421    3259     916    2444     918    2443 
-               918     751     917    2444     919    2441 
-               919    2441     919     751     916    2444 
-               919    2441     919    2443     918     751 
-               941     729     916     755     917    2442 
-               919     752     916     754     891     778 
-               918    2444     918     751     916     754 
-               917     753     916    2445     919 
- 
-           name CHDN 
-              3421    3260     915    2445     918    2442 
-               919     751     891    2469     919    2441 
-               927     745     915    2444     919    2441 
-               919    2441     919    2442     918     752 
-               915     755     890     780     917    2443 
-               919     752     916     754     915    2445 
-               919     751     915     755     890     781 
-               914     756     916    2445     917 
- 
-           name A 
-              3425    3258     916    2442     920    2441 
-               919     751     918    2442     919    2441 
-               920    2440     920    2441     919    2441 
-               919    2441     920     750     917    2443 
-               920     751     917     752     919    2442 
-               920     750     918     753     917     753 
-               917     753     942     728     917     753 
-               918    2442     920     750     942 
- 
-           name B 
-              3398    3283     916    2443     892    2470 
-               892     778     892    2468     891    2475 
-               886     779     916     754     892     777 
-               892     778     919    2442     891    2468 
-               918     753     892     778     891    2469 
-               892     778     892     778     918    2443 
-               891    2469     892    2467     893    2469 
-               891     778     918     753     892 
- 
-           name C 
-              3396    3283     891    2469     892    2468 
-               892     778     917    2444     892    2468 
-               892    2469     891     778     892     779 
-               893     777     892    2468     892    2468 
-               918     752     893     777     892    2469 
-               892     778     892     778     867     802 
-               918    2444     917    2442     868    2492 
-               893     778     892     779     916 
- 
-           name 1 
-              3424    3257     890    2470     865    2495 
-               891     780     892    2468     865    2495 
-               892     777     891     780     892     779 
-               890     780     916    2444     865     805 
-               891     779     917     753     916    2445 
-               865     805     916     754     892    2469 
-               865    2494     916    2445     865    2495 
-               891     779     917    2443     866 
- 
-           name 2 
-              3422    3258     916    2444     865    2496 
-               889     782     915    2444     865    2495 
-               917    2444     839     830     891     780 
-               915     755     890    2470     864     806 
-               917     753     891     780     866    2495 
-               864     805     891     779     892     779 
-               865    2494     865    2496     891    2469 
-               865     805     891    2469     865 
- 
-           name 3 
-              3397    3284     916    2443     892    2468 
-               892     779     893    2467     892    2468 
-               917     753     892    2469     891     778 
-               893     778     891    2469     892     778 
-               918     753     890     779     893    2468 
-               891     779     893     778     891    2469 
-               892     777     893    2468     891    2468 
-               917     754     943    2417     892 
- 
-           name 4 
-              3421    3261     890    2470     839    2520 
-               917     753     891    2470     865    2495 
-               917    2443     865    2495     890     781 
-               891     778     891    2470     865     804 
-               895     776     892     779     891    2468 
-               866     805     917     753     943     727 
-               866     805     889    2471     865    2494 
-               892     780     916    2444     865 
- 
-           name 5 
-              3396    3282     920    2441     892    2467 
-               894     778     891    2468     892    2469 
-               891     780     866     802     893    2470 
-               890     779     918    2443     891     777 
-               892     779     918     752     892    2468 
-               892     779     918     752     918    2443 
-               891    2469     891     779     891    2469 
-               892     778     891    2468     893 
- 
-           name 6 
-              3396    3284     918    2442     866    2494 
-               892     778     917    2444     866    2494 
-               917    2444     865     804     893    2468 
-               890     780     916    2445     890     779 
-               892     779     891     778     918    2443 
-               891     778     892     779     892     779 
-               891    2468     892     778     919    2444 
-               889     778     893    2468     891 
- 
-           name 7 
-              3398    3282     893    2467     892    2468 
-               893     779     891    2469     891    2468 
-               919     752     892    2467     892    2469 
-               891     779     892    2468     892     777 
-               893     778     918     752     892    2468 
-               893     779     916     753     918    2442 
-               892     779     891     778     893    2468 
-               892     778     893    2467     892 
- 
-           name 8 
-              3448    3232     892    2468     866    2494 
-               892     779     892    2467     867    2494 
-               891    2469     866    2495     891    2469 
-               865     805     968    2394     864     804 
-               918     753     891     779     892    2468 
-               866     804     917     754     891     780 
-               916     752     917     754     892    2469 
-               865     804     893    2468     890 
- 
-           name 9 
-              3422    3258     891    2469     839    2521 
-               891     780     892    2468     824    2536 
-               916     754     916     755     891     779 
-               866    2494     839    2522     891     778 
-               892     778     890     781     915    2448 
-               837     831     891     779     890    2470 
-               837    2523     942    2418     838     832 
-               892     778     890    2471     839 
- 
-           name 0 
-              3398    3284     891    2469     890    2469 
-               893     779     891    2468     892    2468 
-               892    2468     892     778     892     779 
-               891    2469     892    2468     893     778 
-               892     777     893     777     893    2469 
-               891     778     892     779     868     802 
-               917    2443     892    2469     890     779 
-               891     779     892    2468     893 
- 
-           name LAST 
-              3422    3258     891    2471     916    2443 
-               891     780     891    2469     272    3088 
-               865     805     916    2445     308    3052 
-               890    2469     892     779     915     756 
-               889     781     889     780     890    2471 
-               890     779     889     781     891    2471 
-               272    1397     890     779     891     781 
-               890    2469     448    2912     917 
- 
-           name FAV 
-              3423    3257     918    2442     944    2417 
-               917     753     892    2469     890    2471 
-               324    3036     890    2469     379     289 
-               167    2525     891    2470     379    2981 
-               890     780     378     270     242     781 
-               866     806     889    2469     786     884 
-               891     779     891     779     892     779 
-               916     754     890     779     892     778 
-               891    2470     839 
- 
-           name REW 
-              3420    3258     916    2445     326    3033 
-               891     780     916    2443     891    2469 
-               916    2445     838     831     918     754 
-               890    2471     837     832     916    2444 
-               838     832     891     779     916    2445 
-               838     831     892     779     890     780 
-               892    2469     839    2520     891     780 
-               915    2444     836     836     890 
- 
-           name PLAY 
-              3448    3233     916    2444     891    2469 
-               917     753     892    2468     918    2443 
-               941    2420     891    2468     917     754 
-               915     755     914    2446     918    2443 
-               916     754     916     753     945    2416 
-               943     727     941     729     918     752 
-               917     753     919    2442     916    2444 
-               915     755     943     728     916 
- 
-           name FF 
-              3420    3259     917    2442     946    2415 
-               918     752     916    2445     918    2441 
-               943     728     917     753     942     728 
-               892    2470     864     806     889    2471 
-               865     805     918     752     916    2443 
-               944     726     892     779     891    2470 
-               891    2469     915    2445     917     753 
-               890    2471     222    1447     891 
- 
-           name PAUSE 
-              3421    3259     891    2470     787    2573 
-               890     780     916    2444     840    2520 
-               892    2468     864     806     917    2444 
-               839     831     890     780     891     779 
-               891     780     891     779     889    2471 
-               839     831     916     755     915     754 
-               892    2469     839     830     917    2444 
-               840    2521     891    2469     840 
- 
-           name STOP 
-              3398    3284     889    2471     325    3036 
-               891     779     890    2470     395     290 
-               140    2535     889     781     890     781 
-               889    2470     274    1397     891    2470 
-               272    3087     917     754     890     780 
-               889    2472     293    1377     890     779 
-               916    2444     448    2913     916     754 
-               866    2495     325    1344     891     779 
-               915 
- 
-           name REC 
-              3421    3258     917    2444     916    2444 
-               942     729     942    2420     889    2469 
-               992    2367     942     730     891    2468 
-               917     754     916    2443     892    2470 
-               892     777     916     754     892    2467 
-               943     730     916     754     891     779 
-               917    2442     917     754     943    2417 
-               918     753     915     754     892 
- 
-           name BYPASS 
-              3450    3231     891    2470     890    2470 
-               917     753     916    2447     913    2445 
-               273    3088     889     780     890    2470 
-               891    2469     916     755     890     780 
-               942     727     918     752     916    2444 
-               890     782     916     754     865     805 
-               891    2469     891     780     889     781 
-               891    2468     259    3102     866 
- 
-           name TV/VCR 
-             19945    3915     612    1873     560    1926 
-               560    1925     561     931     560     931 
-               587     905     559     931     563     931 
-               557     932     561    1925     585     908 
-               583    1901     559     931     586     905 
-               585     907     610    1875     561    1924 
-               561    1926     559    1926     535    1951 
-               559    1925     586     907     585    1899 
-               560     931    1048    7898    3707    3862 
-               587    1899     586    1899     586    1900 
-               559     932     586     908     323 
- 
-       end raw_codes 
- 
- end remote
diff --git a/abs/mv-core/MythVantage-config/templates/xine.config.template b/abs/mv-core/MythVantage-config/templates/xine.config.template
deleted file mode 100644
index 966487f..0000000
--- a/abs/mv-core/MythVantage-config/templates/xine.config.template
+++ /dev/null
@@ -1,754 +0,0 @@
-#
-# xine config file
-#
-.version:2
-
-# Entries which are still set to their default values are commented out.
-# Remove the '#' at the beginning of the line, if you want to change them.
-
-# Enable deinterlacing by default
-# bool, default: 0
-#gui.deinterlace_by_default:0
-
-# Configuration experience level
-# { Beginner  Advanced  Expert  Master of the known universe }, default: 0
-gui.experience_level:Expert
-
-# Enable OSD support
-# bool, default: 1
-#gui.osd_enabled:1
-
-# Dismiss OSD time (s)
-# numeric, default: 3
-#gui.osd_timeout:3
-
-# Ask user for playback with unsupported codec
-# bool, default: 0
-#gui.play_anyway:0
-
-# Automatically reload old playlist
-# bool, default: 0
-#gui.playlist_auto_reload:0
-
-# Audio visualization plugin
-# { oscope  fftscope  fftgraph  goom }, default: 0
-gui.post_audio_plugin:fftgraph
-
-# gui skin theme
-# { Antares  Centori  KeramicRH8  cloudy  xinetic }, default: 4
-gui.skin:KeramicRH8
-
-# Change xine's behavior for unexperienced user
-# bool, default: 1
-#gui.smart_mode:1
-
-# Snapshot location
-# string, default: /home/jams
-#gui.snapshotdir:/home/jams
-
-# Display splash screen
-# bool, default: 1
-gui.splash:0
-
-# Subtitle autoloading
-# bool, default: 1
-#gui.subtitle_autoload:1
-
-# Visual animation style
-# { None  Post Plugin  Stream Animation }, default: 1
-#gui.visual_anim:Post Plugin
-
-# Windows stacking (more)
-# bool, default: 0
-#gui.always_layer_above:0
-
-# Audio mixer control method
-# { Sound card  Software }, default: 0
-#gui.audio_mixer_method:Sound card
-
-# Visiblility behavior of panel
-# bool, default: 0
-#gui.auto_panel_visibility:0
-
-# Visibility behavior of output window
-# bool, default: 0
-#gui.auto_video_output_visibility:0
-
-# Deinterlace plugin.
-# string, default: tvtime:method=LinearBlend,cheap_mode=1,pulldown=0,use_progressive_frame_flag=1
-#gui.deinterlace_plugin:tvtime:method=LinearBlend,cheap_mode=1,pulldown=0,use_progressive_frame_flag=1
-
-# Event sender behavior
-# bool, default: 1
-#gui.eventer_sticky:1
-
-# Windows stacking
-# bool, default: 0
-#gui.layer_above:0
-
-# Use unscaled OSD
-# bool, default: 1
-gui.osd_use_unscaled:0
-
-# Screensaver reset interval (s)
-# numeric, default: 10
-#gui.screensaver_timeout:10
-
-# Menu shortcut style
-# { Windows style  Emacs style }, default: 0
-#gui.shortcut_style:Windows style
-
-# Stream information
-# bool, default: 0
-#gui.sinfo_auto_update:0
-
-# Skin Server Url
-# string, default: http://xine.sourceforge.net/skins/skins.slx
-#gui.skin_server_url:http://xine.sourceforge.net/skins/skins.slx
-
-# Chapter hopping
-# bool, default: 1
-#gui.skip_by_chapter:1
-
-# New stream sizes resize output window
-# bool, default: 1
-#gui.stream_resize_window:1
-
-# Tips timeout (ms)
-# numeric, default: 5000
-#gui.tips_timeout:5000
-
-# gui tips visibility
-# bool, default: 1
-#gui.tips_visible:1
-
-# Name of video display
-# string, default:
-#gui.video_display:
-
-# Synchronized X protocol (debug)
-# bool, default: 0
-#gui.xsynchronize:0
-
-# Double size for small streams (require stream_resize_window)
-# bool, default: 0
-#gui.zoom_small_stream:0
-
-# Logo mrl
-# string, default: file:/usr/share/xine/skins/xine-ui_logo.mpv
-#gui.logo_mrl:file:/usr/share/xine/skins/xine-ui_logo.mpv
-
-# use XVidModeExtension when switching to fullscreen
-# bool, default: 0
-#gui.use_xvidext:0
-
-# height for xinerama fullscreen (-8192 = autodetect)
-# numeric, default: -8192
-#gui.xinerama_fullscreen_height:-8192
-
-# width for xinerama fullscreen (-8192 = autodetect)
-# numeric, default: -8192
-#gui.xinerama_fullscreen_width:-8192
-
-# x coordinate for xinerama fullscreen (-8192 = autodetect)
-# numeric, default: -8192
-#gui.xinerama_fullscreen_x:-8192
-
-# y coordinate for xinerama fullscreen (-8192 = autodetect)
-# numeric, default: -8192
-#gui.xinerama_fullscreen_y:-8192
-
-# Screens to use in order to do a very fullscreen in xinerama mode. (example 0 2 3)
-# string, default: 0 1
-#gui.xinerama_use_screens:0 1
-
-# Amplification level
-# [0..200], default: 100
-#gui.amp_level:100
-
-# gui panel visibility
-# bool, default: 1
-gui.panel_visible:0
-
-# numeric, default: 200
-gui.panel_x:21
-
-# numeric, default: 100
-gui.panel_y:1050
-
-gui.control_x:186
-
-gui.control_y:46
-
-gui.dropped_frames_warning:0
-
-gui.eventer_x:1041
-
-gui.eventer_y:781
-
-gui.mrl_browser_x:23
-
-gui.mrl_browser_y:9
-
-gui.setup_x:717
-
-gui.setup_y:227
-
-gui.viewlog_x:200
-
-gui.viewlog_y:210
-
-# color specification yuv-opacity
-# string, default: 8080c0-f
-#gui.osdmenu.color_focused_button:8080c0-f
-
-# color specification yuv-opacity
-# string, default: 808080-f
-#gui.osdmenu.color_focused_slider:808080-f
-
-# color specification yuv-opacity
-# string, default: ff8080-f
-#gui.osdmenu.color_focused_slider_knob:ff8080-f
-
-# color specification yuv-opacity
-# string, default: 808080-f
-#gui.osdmenu.color_focused_text_border:808080-f
-
-# color specification yuv-opacity
-# string, default: ff8080-f
-#gui.osdmenu.color_focused_text_foreground:ff8080-f
-
-# color specification yuv-opacity
-# string, default: 0080c0-f
-#gui.osdmenu.color_label_border:0080c0-f
-
-# color specification yuv-opacity
-# string, default: c08080-f
-#gui.osdmenu.color_label_foreground:c08080-f
-
-# color specification yuv-opacity
-# string, default: 0080c0-f
-#gui.osdmenu.color_label_window:0080c0-f
-
-# color specification yuv-opacity
-# string, default: 008000-f
-#gui.osdmenu.color_slider:008000-f
-
-# color specification yuv-opacity
-# string, default: ffff00-f
-#gui.osdmenu.color_slider_knob:ffff00-f
-
-# color specification yuv-opacity
-# string, default: 008000-f
-#gui.osdmenu.color_text_border:008000-f
-
-# color specification yuv-opacity
-# string, default: ffff00-f
-#gui.osdmenu.color_text_foreground:ffff00-f
-
-# color specification yuv-opacity
-# string, default: 0080c0-f
-#gui.osdmenu.color_text_window:0080c0-f
-
-# directory a media in dvd device will be mounted
-# string, default: /dvd
-#gui.osdmenu.dvd_mountpoint:/dvd
-
-# palette (foreground-border-background) to use for subtitles and OSD
-# { white-black-transparent  white-none-transparent  white-none-translucid  yellow-black-transparent }, default: 0
-#ui.osd.text_palette:white-black-transparent
-
-# audio driver to use
-# { auto  null  alsa  oss  esd  file  none }, default: 0
-audio.driver:oss
-
-# a/v sync method to use by OSS
-# { auto  getodelay  getoptr  softsync  probebuffer }, default: 0
-#audio.oss_sync_method:auto
-
-# use A/52 dynamic range compression
-# bool, default: 0
-#audio.a52.dynamic_range:0
-
-# downmix audio to 2 channel surround stereo
-# bool, default: 0
-#audio.a52.surround_downmix:0
-
-# A/52 volume
-# [0..200], default: 100
-#audio.a52.level:100
-
-# OSS audio device name
-# { auto  /dev/dsp  /dev/sound/dsp }, default: 0
-#audio.device.oss_device_name:auto
-
-# OSS audio device number, -1 for none
-# numeric, default: -1
-#audio.device.oss_device_number:-1
-
-# OSS audio mixer number, -1 for none
-# numeric, default: -1
-#audio.device.oss_mixer_number:-1
-
-audio.device.alsa_front_device:default
-
-# speaker arrangement
-# { Mono 1.0  Stereo 2.0  Headphones 2.0  Stereo 2.1  Surround 3.0  Surround 4.0  Surround 4.1  Surround 5.0  Surround 5.1  Surround 6.0  Surround 6.1  Surround 7.1  Pass Through }, default: 1
-#audio.output.speaker_arrangement:Stereo 2.0
-
-# offset for digital passthrough
-# numeric, default: 0
-#audio.synchronization.passthrough_offset:0
-
-# play audio even on slow/fast speeds
-# bool, default: 0
-#audio.synchronization.slow_fast_audio:0
-
-# method to sync audio and video
-# { metronom feedback  resample }, default: 0
-#audio.synchronization.av_sync_method:metronom feedback
-
-# always resample to this rate (0 to disable)
-# numeric, default: 0
-#audio.synchronization.force_rate:0
-
-# enable resampling
-# { auto  off  on }, default: 0
-#audio.synchronization.resample_mode:auto
-
-# startup audio volume
-# [0..100], default: 50
-#audio.volume.mixer_volume:50
-
-# restore volume level at startup
-# bool, default: 0
-#audio.volume.remember_volume:0
-
-# video driver to use
-# { auto  aadxr3  dxr3  xv  opengl  SyncFB  xshm  none  xxmc  sdl  vidixfb  vidix  fb  xvmc }, default: 0
-#video.driver:auto
-
-# pitch alignment workaround
-# bool, default: 0
-#video.device.xv_pitch_alignment:0
-
-# disable exact alpha blending of overlays
-# bool, default: 0
-#video.output.disable_exact_alphablend:0
-
-# disable all video scaling
-# bool, default: 0
-#video.output.disable_scaling:0
-
-# horizontal image position in the output window
-# [0..100], default: 50
-#video.output.horizontal_position:50
-
-# vertical image position in the output window
-# [0..100], default: 50
-#video.output.vertical_position:50
-
-# deinterlace method (deprecated)
-# { none  bob  weave  greedy  onefield  onefield_xv  linearblend }, default: 4
-video.output.xv_deinterlace_method:linearblend
-
-# MPEG-4 postprocessing quality
-# [0..6], default: 3
-#video.processing.ffmpeg_pp_quality:3
-
-# DXR3 device number
-# numeric, default: 0
-#dxr3.device_number:0
-
-# swap odd and even lines
-# bool, default: 0
-#dxr3.encoding.swap_fields:0
-
-# add black bars to correct aspect ratio
-# bool, default: 1
-#dxr3.encoding.add_bars:1
-
-# use smooth play mode for mpeg encoder playback
-# bool, default: 1
-#dxr3.encoding.alt_play_mode:1
-
-# device used for CD audio
-# string, default: /dev/cdrom
-#media.audio_cd.device:/dev/cdrom
-
-# slow down disc drive to this speed factor
-# numeric, default: 4
-#media.audio_cd.drive_slowdown:4
-
-# query CDDB
-# bool, default: 1
-#media.audio_cd.use_cddb:1
-
-# CDDB cache directory
-# string, default: /home/jams/.xine/cddbcache
-#media.audio_cd.cddb_cachedir:/home/jams/.xine/cddbcache
-
-# CDDB server port
-# numeric, default: 8880
-#media.audio_cd.cddb_port:8880
-
-# CDDB server name
-# string, default: freedb.freedb.org
-#media.audio_cd.cddb_server:freedb.freedb.org
-
-# directory for saving streams
-# string, default:
-#media.capture.save_dir:
-
-# Number of dvb card to use.
-# numeric, default: 0
-#media.dvb.adapter:0
-
-# Remember last DVB channel watched
-# bool, default: 1
-#media.dvb.remember_channel:1
-
-# Last DVB channel viewed
-# numeric, default: -1
-#media.dvb.last_channel:-1
-
-# default language for DVD playback
-# string, default: en
-#media.dvd.language:en
-
-# region the DVD player claims to be in (1 to 8)
-# numeric, default: 1
-#media.dvd.region:1
-
-# device used for DVD playback
-# string, default: /dev/dvd
-#media.dvd.device:/dev/dvd
-
-# raw device set up for DVD access
-# string, default: /dev/rdvd
-#media.dvd.raw_device:/dev/rdvd
-
-# read-ahead caching
-# bool, default: 1
-#media.dvd.readahead:1
-
-# CSS decryption method
-# { key  disc  title }, default: 0
-#media.dvd.css_decryption_method:key
-
-# play mode when title/chapter is given
-# { entire dvd  one chapter }, default: 0
-#media.dvd.play_single_chapter:entire dvd
-
-# unit for seeking
-# { seek in program chain  seek in program }, default: 0
-#media.dvd.seek_behaviour:seek in program chain
-
-# unit for the skip action
-# { skip program  skip part  skip title }, default: 0
-#media.dvd.skip_behaviour:skip program
-
-# path to the title key cache
-# string, default: /home/jams/.dvdcss/
-#media.dvd.css_cache_path:/home/jams/.dvdcss/
-
-# file browsing start location
-# string, default: /home/jams
-#media.files.origin_path:/home/jams
-
-# list hidden files
-# bool, default: 0
-#media.files.show_hidden_files:0
-
-# network bandwidth
-# { 14.4 Kbps (Modem)  19.2 Kbps (Modem)  28.8 Kbps (Modem)  33.6 Kbps (Modem)  34.4 Kbps (Modem)  57.6 Kbps (Modem)  115.2 Kbps (ISDN)  262.2 Kbps (Cable/DSL)  393.2 Kbps (Cable/DSL)  524.3 Kbps (Cable/DSL)  1.5 Mbps (T1)  10.5 Mbps (LAN) }, default: 10
-#media.network.bandwidth:1.5 Mbps (T1)
-
-# Timeout for network stream reading (in seconds)
-# numeric, default: 30
-#media.network.timeout:30
-
-# Domains for which to ignore the HTTP proxy
-# string, default:
-#media.network.http_no_proxy:
-
-# HTTP proxy host
-# string, default:
-#media.network.http_proxy_host:
-
-# HTTP proxy password
-# string, default:
-#media.network.http_proxy_password:
-
-# HTTP proxy port
-# numeric, default: 80
-#media.network.http_proxy_port:80
-
-# HTTP proxy username
-# string, default:
-#media.network.http_proxy_user:
-
-# MMS protocol
-# { auto  TCP  HTTP }, default: 0
-#media.network.mms_protocol:auto
-
-# automatically advance VCD track/entry
-# bool, default: 1
-#media.vcd.autoadvance:1
-
-# VCD default type to use on autoplay
-# { MPEG track  entry  segment  playback-control item }, default: 3
-#media.vcd.autoplay:playback-control item
-
-# CD-ROM drive used for VCD when none given
-# string, default:
-#media.vcd.device:
-
-# VCD position slider range
-# { auto  track  entry }, default: 0
-#media.vcd.length_reporting:auto
-
-# show 'rejected' VCD LIDs
-# bool, default: 0
-#media.vcd.show_rejected:0
-
-# VCD format string for stream comment field
-# string, default: %P - Track %T
-#media.vcd.comment_format:%P - Track %T
-
-# VCD debug flag mask
-# numeric, default: 0
-#media.vcd.debug:0
-
-# VCD format string for display banner
-# string, default: %F - %I %N%L%S, disk %c of %C - %v %A
-#media.vcd.title_format:%F - %I %N%L%S, disk %c of %C - %v %A
-
-# v4l radio device
-# string, default: /dev/v4l/radio0
-#media.video4linux.radio_device:/dev/v4l/radio0
-
-# v4l video device
-# string, default: /dev/v4l/video0
-#media.video4linux.video_device:/dev/v4l/video0
-
-# device used for WinTV-PVR 250/350 (pvr plugin)
-# string, default: /dev/video0
-#media.wintv_pvr.device:/dev/video0
-
-# path to RealPlayer codecs
-# string, default: /usr/lib/win32
-#decoder.external.real_codecs_path:/usr/lib/win32
-
-# path to Win32 codecs
-# string, default: /usr/lib/win32
-#decoder.external.win32_codecs_path:/usr/lib/win32
-
-# subtitle size
-# { tiny  small  normal  large  very large  huge }, default: 1
-#subtitles.separate.subtitle_size:small
-
-# subtitle vertical offset
-# numeric, default: 0
-#subtitles.separate.vertical_offset:0
-
-# font for subtitles
-# string, default: sans
-#subtitles.separate.font:sans
-
-# encoding of the subtitles
-# string, default: iso-8859-1
-#subtitles.separate.src_encoding:iso-8859-1
-
-# use unscaled OSD if possible
-# bool, default: 1
-#subtitles.separate.use_unscaled_osd:1
-
-# default duration of subtitle display in seconds
-# numeric, default: 4
-#subtitles.separate.timeout:4
-
-# frames per second to generate
-# numeric, default: 14
-#effects.goom.fps:14
-
-# goom image height
-# numeric, default: 240
-#effects.goom.height:240
-
-# goom image width
-# numeric, default: 320
-#effects.goom.width:320
-
-# colorspace conversion method
-# { Fast but not photorealistic  Slow but looks better }, default: 0
-#effects.goom.csc_method:Fast but not photorealistic
-
-# number of audio buffers
-# numeric, default: 230
-#engine.buffers.audio_num_buffers:230
-
-# number of video buffers
-# numeric, default: 500
-#engine.buffers.video_num_buffers:500
-
-# default number of video frames
-# numeric, default: 15
-#engine.buffers.video_num_frames:15
-
-# priority for a/52 decoder
-# numeric, default: 0
-#engine.decoder_priorities.a/52:0
-
-# priority for bitplane decoder
-# numeric, default: 0
-#engine.decoder_priorities.bitplane:0
-
-# priority for dts decoder
-# numeric, default: 0
-#engine.decoder_priorities.dts:0
-
-# priority for dvaudio decoder
-# numeric, default: 0
-#engine.decoder_priorities.dvaudio:0
-
-# priority for dxr3-mpeg2 decoder
-# numeric, default: 0
-#engine.decoder_priorities.dxr3-mpeg2:0
-
-# priority for dxr3-spudec decoder
-# numeric, default: 0
-#engine.decoder_priorities.dxr3-spudec:0
-
-# priority for faad decoder
-# numeric, default: 0
-#engine.decoder_priorities.faad:0
-
-# priority for ffmpeg-wmv8 decoder
-# numeric, default: 0
-#engine.decoder_priorities.ffmpeg-wmv8:0
-
-# priority for ffmpeg-wmv9 decoder
-# numeric, default: 0
-#engine.decoder_priorities.ffmpeg-wmv9:0
-
-# priority for ffmpegaudio decoder
-# numeric, default: 0
-#engine.decoder_priorities.ffmpegaudio:0
-
-# priority for ffmpegvideo decoder
-# numeric, default: 0
-#engine.decoder_priorities.ffmpegvideo:0
-
-# priority for gdkpixbuf decoder
-# numeric, default: 0
-#engine.decoder_priorities.gdkpixbuf:0
-
-# priority for gsm610 decoder
-# numeric, default: 0
-#engine.decoder_priorities.gsm610:0
-
-# priority for image decoder
-# numeric, default: 0
-#engine.decoder_priorities.image:0
-
-# priority for mad decoder
-# numeric, default: 0
-#engine.decoder_priorities.mad:0
-
-# priority for mpc decoder
-# numeric, default: 0
-#engine.decoder_priorities.mpc:0
-
-# priority for mpeg2 decoder
-# numeric, default: 0
-#engine.decoder_priorities.mpeg2:0
-
-# priority for nsf decoder
-# numeric, default: 0
-#engine.decoder_priorities.nsf:0
-
-# priority for pcm decoder
-# numeric, default: 0
-#engine.decoder_priorities.pcm:0
-
-# priority for qta decoder
-# numeric, default: 0
-#engine.decoder_priorities.qta:0
-
-# priority for qtv decoder
-# numeric, default: 0
-#engine.decoder_priorities.qtv:0
-
-# priority for real decoder
-# numeric, default: 0
-#engine.decoder_priorities.real:0
-
-# priority for realadec decoder
-# numeric, default: 0
-#engine.decoder_priorities.realadec:0
-
-# priority for rgb decoder
-# numeric, default: 0
-#engine.decoder_priorities.rgb:0
-
-# priority for spucc decoder
-# numeric, default: 0
-#engine.decoder_priorities.spucc:0
-
-# priority for spucmml decoder
-# numeric, default: 0
-#engine.decoder_priorities.spucmml:0
-
-# priority for spudec decoder
-# numeric, default: 0
-#engine.decoder_priorities.spudec:0
-
-# priority for spudvb decoder
-# numeric, default: 0
-#engine.decoder_priorities.spudvb:0
-
-# priority for sputext decoder
-# numeric, default: 0
-#engine.decoder_priorities.sputext:0
-
-# priority for theora decoder
-# numeric, default: 0
-#engine.decoder_priorities.theora:0
-
-# priority for vorbis decoder
-# numeric, default: 0
-#engine.decoder_priorities.vorbis:0
-
-# priority for win32a decoder
-# numeric, default: 0
-#engine.decoder_priorities.win32a:0
-
-# priority for win32v decoder
-# numeric, default: 0
-#engine.decoder_priorities.win32v:0
-
-# priority for yuv decoder
-# numeric, default: 0
-#engine.decoder_priorities.yuv:0
-
-# media format detection strategy
-# { default  reverse  content  extension }, default: 0
-#engine.demux.strategy:default
-
-# memcopy method used by xine
-# { probe  libc  kernel  mmx  mmxext  sse }, default: 0
-engine.performance.memcpy_method:libc
-
-# percentage of discarded frames to tolerate
-# numeric, default: 10
-#engine.performance.warn_discarded_threshold:10
-
-# percentage of skipped frames to tolerate
-# numeric, default: 10
-#engine.performance.warn_skipped_threshold:10
-
-# allow implicit changes to the configuration (e.g. by MRL)
-# bool, default: 0
-#misc.implicit_config:0
-
diff --git a/abs/mv-core/MythVantage-config/templates/xorg/96xx_supported.txt b/abs/mv-core/MythVantage-config/templates/xorg/96xx_supported.txt
deleted file mode 100644
index dd4833a..0000000
--- a/abs/mv-core/MythVantage-config/templates/xorg/96xx_supported.txt
+++ /dev/null
@@ -1,175 +0,0 @@
-    NVIDIA GPU product                    Device PCI ID
-    
-    GeForce 6800 Ultra                    0x0040
-    GeForce 6800                          0x0041
-    GeForce 6800 XE                       0x0043
-    GeForce 6800 XT                       0x0044
-    GeForce 6800 GT                       0x0045
-    GeForce 6800 GT                       0x0046
-    GeForce 6800 GS                       0x0047
-    GeForce 6800 XT                       0x0048
-    Quadro FX 4000                        0x004E
-    GeForce 7800 GTX                      0x0090
-    GeForce 7800 GTX                      0x0091
-    GeForce 7800 GT                       0x0092
-    GeForce 7800 GS                       0x0093
-    GeForce Go 7800                       0x0098
-    GeForce Go 7800 GTX                   0x0099
-    Quadro FX 4500                        0x009D
-    GeForce 6800 GS                       0x00C0
-    GeForce 6800                          0x00C1
-    GeForce 6800 LE                       0x00C2
-    GeForce 6800 XT                       0x00C3
-    GeForce Go 6800                       0x00C8
-    GeForce Go 6800 Ultra                 0x00C9
-    Quadro FX Go1400                      0x00CC
-    Quadro FX 3450/4000 SDI               0x00CD
-    Quadro FX 1400                        0x00CE
-    GeForce 6800/GeForce 6800 Ultra       0x00F0
-    GeForce 6600/GeForce 6600 GT          0x00F1
-    GeForce 6600                          0x00F2
-    GeForce 6200                          0x00F3
-    GeForce 6600 LE                       0x00F4
-    GeForce 7800 GS                       0x00F5
-    GeForce 6800 GS                       0x00F6
-    Quadro FX 3400/4400                   0x00F8
-    GeForce 6800 Ultra                    0x00F9
-    GeForce PCX 5750                      0x00FA
-    GeForce PCX 5900                      0x00FB
-    Quadro FX 330/GeForce PCX 5300        0x00FC
-    Quadro NVS 280 PCI-E/Quadro FX 330    0x00FD
-    Quadro FX 1300                        0x00FE
-    GeForce PCX 4300                      0x00FF
-    GeForce2 MX/MX 400                    0x0110
-    GeForce2 MX 100/200                   0x0111
-    GeForce2 Go                           0x0112
-    Quadro2 MXR/EX/Go                     0x0113
-    GeForce 6600 GT                       0x0140
-    GeForce 6600                          0x0141
-    GeForce 6600 LE                       0x0142
-    GeForce 6600 VE                       0x0143
-    GeForce Go 6600                       0x0144
-    GeForce 6610 XL                       0x0145
-    GeForce Go 6600 TE/6200 TE            0x0146
-    GeForce Go 6600                       0x0148
-    GeForce Go 6600 GT                    0x0149
-    Quadro NVS 440                        0x014A
-    Quadro FX 550                         0x014C
-    Quadro FX 540                         0x014E
-    GeForce 6200                          0x014F
-    GeForce 6500                          0x0160
-    GeForce 6200 TurboCache(TM)           0x0161
-    GeForce Go 6200                       0x0164
-    Quadro NVS 285                        0x0165
-    GeForce Go 6400                       0x0166
-    GeForce Go 6200                       0x0167
-    GeForce Go 6400                       0x0168
-    GeForce4 MX 460                       0x0170
-    GeForce4 MX 440                       0x0171
-    GeForce4 MX 420                       0x0172
-    GeForce4 MX 440-SE                    0x0173
-    GeForce4 440 Go                       0x0174
-    GeForce4 420 Go                       0x0175
-    GeForce4 420 Go 32M                   0x0176
-    GeForce4 460 Go                       0x0177
-    Quadro4 550 XGL                       0x0178
-    GeForce4 440 Go 64M                   0x0179
-    Quadro NVS                            0x017A
-    Quadro4 500 GoGL                      0x017C
-    GeForce4 410 Go 16M                   0x017D
-    GeForce4 MX 440 with AGP8X            0x0181
-    GeForce4 MX 440SE with AGP8X          0x0182
-    GeForce4 MX 420 with AGP8X            0x0183
-    GeForce4 MX 4000                      0x0185
-    Quadro4 580 XGL                       0x0188
-    Quadro NVS with AGP8X                 0x018A
-    Quadro4 380 XGL                       0x018B
-    Quadro NVS 50 PCI                     0x018C
-    GeForce2 Integrated GPU               0x01A0
-    GeForce 7300 LE                       0x01D1
-    Quadro NVS 110M                       0x01D7
-    GeForce Go 7300                       0x01D7
-    GeForce Go 7400                       0x01D8
-    Quadro NVS 110M                       0x01DA
-    Quadro NVS 120M                       0x01DB
-    Quadro FX 350M                        0x01DC
-    Quadro FX 350                         0x01DE
-    GeForce 7300 GS                       0x01DF
-    GeForce4 MX Integrated GPU            0x01F0
-    GeForce3                              0x0200
-    GeForce3 Ti 200                       0x0201
-    GeForce3 Ti 500                       0x0202
-    Quadro DCC                            0x0203
-    GeForce 6800                          0x0211
-    GeForce 6800 LE                       0x0212
-    GeForce 6800 GT                       0x0215
-    GeForce 6800 XT                       0x0218
-    GeForce 6150                          0x0240
-    GeForce 6150 LE                       0x0241
-    GeForce 6100                          0x0242
-    GeForce4 Ti 4600                      0x0250
-    GeForce4 Ti 4400                      0x0251
-    GeForce4 Ti 4200                      0x0253
-    Quadro4 900 XGL                       0x0258
-    Quadro4 750 XGL                       0x0259
-    Quadro4 700 XGL                       0x025B
-    GeForce4 Ti 4800                      0x0280
-    GeForce4 Ti 4200 with AGP8X           0x0281
-    GeForce4 Ti 4800 SE                   0x0282
-    GeForce4 4200 Go                      0x0286
-    Quadro4 980 XGL                       0x0288
-    Quadro4 780 XGL                       0x0289
-    Quadro4 700 GoGL                      0x028C
-    GeForce 7900 GTX                      0x0290
-    GeForce 7900 GT                       0x0291
-    GeForce Go 7900 GS                    0x0298
-    GeForce Go 7900 GTX                   0x0299
-    Quadro FX 2500M                       0x029A
-    Quadro FX 1500M                       0x029B
-    Quadro FX 5500                        0x029C
-    Quadro FX 3500                        0x029D
-    Quadro FX 1500                        0x029E
-    Quadro FX 4500 X2                     0x029F
-    GeForce 7600 GS                       0x02E1
-    GeForce FX 5800 Ultra                 0x0301
-    GeForce FX 5800                       0x0302
-    Quadro FX 2000                        0x0308
-    Quadro FX 1000                        0x0309
-    GeForce FX 5600 Ultra                 0x0311
-    GeForce FX 5600                       0x0312
-    GeForce FX 5600XT                     0x0314
-    GeForce FX Go5600                     0x031A
-    GeForce FX Go5650                     0x031B
-    Quadro FX Go700                       0x031C
-    GeForce FX 5200                       0x0320
-    GeForce FX 5200 Ultra                 0x0321
-    GeForce FX 5200                       0x0322
-    GeForce FX 5200LE                     0x0323
-    GeForce FX Go5200                     0x0324
-    GeForce FX Go5250                     0x0325
-    GeForce FX 5500                       0x0326
-    GeForce FX 5100                       0x0327
-    GeForce FX Go5200 32M/64M             0x0328
-    Quadro NVS 280 PCI                    0x032A
-    Quadro FX 500/600 PCI                 0x032B
-    GeForce FX Go53xx                     0x032C
-    GeForce FX Go5100                     0x032D
-    GeForce FX 5900 Ultra                 0x0330
-    GeForce FX 5900                       0x0331
-    GeForce FX 5900XT                     0x0332
-    GeForce FX 5950 Ultra                 0x0333
-    GeForce FX 5900ZT                     0x0334
-    Quadro FX 3000                        0x0338
-    Quadro FX 700                         0x033F
-    GeForce FX 5700 Ultra                 0x0341
-    GeForce FX 5700                       0x0342
-    GeForce FX 5700LE                     0x0343
-    GeForce FX 5700VE                     0x0344
-    GeForce FX Go5700                     0x0347
-    GeForce FX Go5700                     0x0348
-    Quadro FX Go1000                      0x034C
-    Quadro FX 1100                        0x034E
-    GeForce 7600 GT                       0x0391
-    GeForce 7600 GS                       0x0392
-    GeForce Go 7600                       0x0398
-    Quadro FX 560                         0x039E
\ No newline at end of file
diff --git a/abs/mv-core/MythVantage-config/templates/xorg/modeline.ATSC b/abs/mv-core/MythVantage-config/templates/xorg/modeline.ATSC
deleted file mode 100644
index b2cd709..0000000
--- a/abs/mv-core/MythVantage-config/templates/xorg/modeline.ATSC
+++ /dev/null
@@ -1,33 +0,0 @@
-ModeLine "ATSC-720p60Hz" 74.160 1280 1352 1392 1648 720 725 730 750
-
-ModeLine "My480p" 28.6 720 744 768 900 480 484 492 525
-
-ModeLine "My540p" 37.26 960 976 1008 1104 540 542 548 563 +hsync +vsync
-
-ModeLine "My720p"  73.825 1280 1320 1368 1640 720 722 724 751 +hsync +vsync  74.086 MHz 44.955 kHz 5$
-
-ModeLine "My720p2" 73.825 1280 1320 1368 1640 720 722 724 751 +hsync +vsync  74.086 MHz 44.955 kHz 5$
-
-ModeLine "My1080i" 79.84 1920 2040 2200 2368 1080 1090 1106 1125 +vsync -hsync interlace
-
-ModeLine "My1080i2" 74.52 1920 1952 2016 2208 1080 1084 1096 1126 -hsync -vsync interlace
-
-Modeline "My1920x1080_i" 74.52 1920 1952 2016 2208 1080 1084 1096 1126 -HSync -VSync Interlace
-
-Modeline "in1080_i" 74.52 1760 1888 2096 2208 960 1012 1028 1126 -HSync -VSync Interlace
-
-Modeline "1920x1080_59i" 76.11 1920 1952 2240 2272 1080 1104 1110 1135 interlace
-
-Modeline "1920x1080_60i" 77.60 1920 1952 2240 2272 1080 1104 1110 1135 interlace
-
-Modeline "1920x1080_61i" 79.08 1920 1952 2248 2280 1080 1104 1110 1135 interlace
-
-Modeline "1776x1000_60i" 65.91 1776 1808 2056 2088 1000 1023 1028 1051 interlace
-
-Modeline "1920x1080_30" 77.60 1920 1952 2240 2272 1080 1104 1110 1135
-
-Modeline "1760x960_60i" 62.39 1760 1792 2024 2056 960 982 987 1009 interlace
-
-Modeline "1280x720_60.00" 74.25 1280 1352 1432 1648 720 725 730 750 -hsync -vsync
-
-Modeline "1280x720_50.00" 74.25 1280 1360 1400 1984 720 725 730 750 -hsync -vsync
diff --git a/abs/mv-core/MythVantage-config/templates/xorg/modeline.DVD b/abs/mv-core/MythVantage-config/templates/xorg/modeline.DVD
deleted file mode 100644
index 9e846d0..0000000
--- a/abs/mv-core/MythVantage-config/templates/xorg/modeline.DVD
+++ /dev/null
@@ -1,9 +0,0 @@
-#DVD-NativeModes
-ModeLine "NTSC-DVD-59.94i" 13.5 720 736 800 858 480 484 492 525 Interlace
-ModeLine "NTSC-DVD-60i" 13.514 720 736 800 858 480 484 492 525 Interlace
-ModeLine "NTSC-DVD-59.94p" 27.0 720 736 800 858 480 484 492 525
-ModeLine "NTSC-DVD-60p" 27.027 720 736 800 858 480 484 492 525
-ModeLine "NTSC-DVD-71.93p" 32.4 720 736 800 858 480 484 492 525
-ModeLine "NTSC-DVD-72p" 32.432 720 736 800 858 480 484 492 525
-ModeLine "NTSC-DVD-119.88p" 54.0 720 736 800 858 480 484 492 525
-ModeLine "NTSC-DVD-120p" 54.054 720 736 800 858 480 484 492 525
diff --git a/abs/mv-core/MythVantage-config/templates/xorg/modeline.NTSC b/abs/mv-core/MythVantage-config/templates/xorg/modeline.NTSC
deleted file mode 100644
index 5536c1b..0000000
--- a/abs/mv-core/MythVantage-config/templates/xorg/modeline.NTSC
+++ /dev/null
@@ -1,10 +0,0 @@
-#Analog-RegularModes
-ModeLine "NTSCspec-59.94i" 14.318 768 784 848 910 483 484 492 525 Interlace
-ModeLine "NTSCspec-59.94p" 28.636 768 784 848 910 483 484 492 525
-ModeLine "Laserdisk-59.94i" 567 583 647 684 483 484 492 525 Interlace
-ModeLine "Laserdisk-59.94p" 567 583 647 684 483 484 492 525
-ModeLine "Broadcast-59.94i" 483 484 492 525 Interlace
-ModeLine "Broadcast-59.94p" 483 484 492 525
-ModeLine "VHS-59.94i" 483 484 492 525 Interlace
-ModeLine "VHS-59.94p" 483 484 492 525
-
diff --git a/abs/mv-core/MythVantage-config/templates/xorg/modeline.VESA b/abs/mv-core/MythVantage-config/templates/xorg/modeline.VESA
deleted file mode 100644
index a026f64..0000000
--- a/abs/mv-core/MythVantage-config/templates/xorg/modeline.VESA
+++ /dev/null
@@ -1,163 +0,0 @@
-# 640x350 @ 85Hz (VESA) hsync: 37.9kHz
-ModeLine "640x350"    31.5  640  672  736  832    350  382  385  445 +hsync -vsync
-
-# 640x400 @ 85Hz (VESA) hsync: 37.9kHz
-ModeLine "640x400"    31.5  640  672  736  832    400  401  404  445 -hsync +vsync
-
-# 720x400 @ 85Hz (VESA) hsync: 37.9kHz
-ModeLine "720x400"    35.5  720  756  828  936    400  401  404  446 -hsync +vsync
-
-# 640x480 @ 60Hz (Industry standard) hsync: 31.5kHz
-ModeLine "640x480"    25.2  640  656  752  800    480  490  492  525 -hsync -vsync
-
-# 640x480 @ 72Hz (VESA) hsync: 37.9kHz
-ModeLine "640x480"    31.5  640  664  704  832    480  489  491  520 -hsync -vsync
-
-# 640x480 @ 75Hz (VESA) hsync: 37.5kHz
-ModeLine "640x480"    31.5  640  656  720  840    480  481  484  500 -hsync -vsync
-
-# 640x480 @ 85Hz (VESA) hsync: 43.3kHz
-ModeLine "640x480"    36.0  640  696  752  832    480  481  484  509 -hsync -vsync
-
-# 800x600 @ 56Hz (VESA) hsync: 35.2kHz
-ModeLine "800x600"    36.0  800  824  896 1024    600  601  603  625 +hsync +vsync
-
-# 800x600 @ 60Hz (VESA) hsync: 37.9kHz
-ModeLine "800x600"    40.0  800  840  968 1056    600  601  605  628 +hsync +vsync
-
-# 800x600 @ 72Hz (VESA) hsync: 48.1kHz
-ModeLine "800x600"    50.0  800  856  976 1040    600  637  643  666 +hsync +vsync
-
-# 800x600 @ 75Hz (VESA) hsync: 46.9kHz
-ModeLine "800x600"    49.5  800  816  896 1056    600  601  604  625 +hsync +vsync
-
-# 800x600 @ 85Hz (VESA) hsync: 53.7kHz
-ModeLine "800x600"    56.3  800  832  896 1048    600  601  604  631 +hsync +vsync
-
-# 1024x768i @ 43Hz (industry standard) hsync: 35.5kHz
-ModeLine "1024x768"   44.9 1024 1032 1208 1264    768  768  776  817 +hsync +vsync Interlace
-
-# 1024x768 @ 60Hz (VESA) hsync: 48.4kHz
-ModeLine "1024x768"   65.0 1024 1048 1184 1344    768  771  777  806 -hsync -vsync
-
-# 1024x768 @ 70Hz (VESA) hsync: 56.5kHz
-ModeLine "1024x768"   75.0 1024 1048 1184 1328    768  771  777  806 -hsync -vsync
-
-# 1024x768 @ 75Hz (VESA) hsync: 60.0kHz
-ModeLine "1024x768"   78.8 1024 1040 1136 1312    768  769  772  800 +hsync +vsync
-
-# 1024x768 @ 85Hz (VESA) hsync: 68.7kHz
-ModeLine "1024x768"   94.5 1024 1072 1168 1376    768  769  772  808 +hsync +vsync
-
-# 1152x864 @ 75Hz (VESA) hsync: 67.5kHz
-ModeLine "1152x864"  108.0 1152 1216 1344 1600    864  865  868  900 +hsync +vsync
-
-# 1280x960 @ 60Hz (VESA) hsync: 60.0kHz
-ModeLine "1280x960"  108.0 1280 1376 1488 1800    960  961  964 1000 +hsync +vsync
-
-# 1280x960 @ 85Hz (VESA) hsync: 85.9kHz
-ModeLine "1280x960"  148.5 1280 1344 1504 1728    960  961  964 1011 +hsync +vsync
-
-# 1280x1024 @ 60Hz (VESA) hsync: 64.0kHz
-ModeLine "1280x1024" 108.0 1280 1328 1440 1688   1024 1025 1028 1066 +hsync +vsync
-
-# 1280x1024 @ 75Hz (VESA) hsync: 80.0kHz
-ModeLine "1280x1024" 135.0 1280 1296 1440 1688   1024 1025 1028 1066 +hsync +vsync
-
-# 1280x1024 @ 85Hz (VESA) hsync: 91.1kHz
-ModeLine "1280x1024" 157.5 1280 1344 1504 1728   1024 1025 1028 1072 +hsync +vsync
-
-# 1600x1200 @ 60Hz (VESA) hsync: 75.0kHz
-ModeLine "1600x1200" 162.0 1600 1664 1856 2160   1200 1201 1204 1250 +hsync +vsync
-# 1600x1200 @ 65Hz (VESA) hsync: 81.3kHz
-ModeLine "1600x1200" 175.5 1600 1664 1856 2160   1200 1201 1204 1250 +hsync +vsync
-
-# 1600x1200 @ 70Hz (VESA) hsync: 87.5kHz
-ModeLine "1600x1200" 189.0 1600 1664 1856 2160   1200 1201 1204 1250 +hsync +vsync
-
-# 1600x1200 @ 75Hz (VESA) hsync: 93.8kHz
-ModeLine "1600x1200" 202.5 1600 1664 1856 2160   1200 1201 1204 1250 +hsync +vsync
-
-# 1600x1200 @ 85Hz (VESA) hsync: 106.3kHz
-ModeLine "1600x1200" 229.5 1600 1664 1856 2160   1200 1201 1204 1250 +hsync +vsync
-
-# 1792x1344 @ 60Hz (VESA) hsync: 83.6kHz
-ModeLine "1792x1344" 204.8 1792 1920 2120 2448   1344 1345 1348 1394 -hsync +vsync
-
-# 1792x1344 @ 75Hz (VESA) hsync: 106.3kHz
-ModeLine "1792x1344" 261.0 1792 1888 2104 2456   1344 1345 1348 1417 -hsync +vsync
-
-# 1856x1392 @ 60Hz (VESA) hsync: 86.3kHz
-ModeLine "1856x1392" 218.3 1856 1952 2176 2528   1392 1393 1396 1439 -hsync +vsync
-
-# 1856x1392 @ 75Hz (VESA) hsync: 112.5kHz
-ModeLine "1856x1392" 288.0 1856 1984 2208 2560   1392 1393 1396 1500 -hsync +vsync
-
-# 1920x1440 @ 60Hz (VESA) hsync: 90.0kHz
-ModeLine "1920x1440" 234.0 1920 2048 2256 2600   1440 1441 1444 1500 -hsync +vsync
-
-# 1920x1440 @ 75Hz (VESA) hsync: 112.5kHz
-ModeLine "1920x1440" 297.0 1920 2064 2288 2640   1440 1441 1444 1500 -hsync +vsync
-
-# 640x480 @ 100.00 Hz (GTF) hsync: 50.90 kHz; pclk: 43.16 MHz
-ModeLine "640x480"  43.16  640 680 744 848  480 481 484 509  -HSync +Vsync
-
-# 768x576 @ 60.00 Hz (GTF) hsync: 35.82 kHz; pclk: 34.96 MHz
-ModeLine "768x576"  34.96  768 792 872 976  576 577 580 597  -HSync +Vsync
-
-# 768x576 @ 72.00 Hz (GTF) hsync: 43.27 kHz; pclk: 42.93 MHz
-ModeLine "768x576"  42.93  768 800 880 992  576 577 580 601  -HSync +Vsync
-
-# 768x576 @ 75.00 Hz (GTF) hsync: 45.15 kHz; pclk: 45.51 MHz
-ModeLine "768x576"  45.51  768 808 888 1008  576 577 580 602  -HSync +Vsync
-
-# 768x576 @ 85.00 Hz (GTF) hsync: 51.42 kHz; pclk: 51.84 MHz
-ModeLine "768x576"  51.84  768 808 888 1008  576 577 580 605  -HSync +Vsync
-
-# 768x576 @ 100.00 Hz (GTF) hsync: 61.10 kHz; pclk: 62.57 MHz
-ModeLine "768x576"  62.57  768 816 896 1024  576 577 580 611  -HSync +Vsync
-
-# 800x600 @ 100.00 Hz (GTF) hsync: 63.60 kHz; pclk: 68.18 MHz
-ModeLine "800x600"  68.18  800 848 936 1072  600 601 604 636  -HSync +Vsync
-
-# 1024x768 @ 100.00 Hz (GTF) hsync: 81.40 kHz; pclk: 113.31 MHz
-ModeLine "1024x768"  113.31  1024 1096 1208 1392  768 769 772 814  -HSync +Vsync
-
-# 1152x864 @ 60.00 Hz (GTF) hsync: 53.70 kHz; pclk: 81.62 MHz
-ModeLine "1152x864"  81.62  1152 1216 1336 1520  864 865 868 895  -HSync +Vsync
-
-# 1152x864 @ 85.00 Hz (GTF) hsync: 77.10 kHz; pclk: 119.65 MHz
-ModeLine "1152x864"  119.65  1152 1224 1352 1552  864 865 868 907  -HSync +Vsync
-
-# 1152x864 @ 100.00 Hz (GTF) hsync: 91.50 kHz; pclk: 143.47 MHz
-ModeLine "1152x864"  143.47  1152 1232 1360 1568  864 865 868 915  -HSync +Vsync
-
-# 1280x960 @ 72.00 Hz (GTF) hsync: 72.07 kHz; pclk: 124.54 MHz
-ModeLine "1280x960"  124.54  1280 1368 1504 1728  960 961 964 1001  -HSync +Vsync
-
-# 1280x960 @ 75.00 Hz (GTF) hsync: 75.15 kHz; pclk: 129.86 MHz
-ModeLine "1280x960"  129.86  1280 1368 1504 1728  960 961 964 1002  -HSync +Vsync
-
-# 1280x960 @ 100.00 Hz (GTF) hsync: 101.70 kHz; pclk: 178.99 MHz
-ModeLine "1280x960"  178.99  1280 1376 1520 1760  960 961 964 1017  -HSync +Vsync
-
-# 1280x1024 @ 100.00 Hz (GTF) hsync: 108.50 kHz; pclk: 190.96 MHz
-ModeLine "1280x1024"  190.96  1280 1376 1520 1760  1024 1025 1028 1085  -HSync +Vsync
-
-# 1400x1050 @ 60.00 Hz (GTF) hsync: 65.22 kHz; pclk: 122.61 MHz
-ModeLine "1400x1050"  122.61  1400 1488 1640 1880  1050 1051 1054 1087  -HSync +Vsync
-
-# 1400x1050 @ 72.00 Hz (GTF) hsync: 78.77 kHz; pclk: 149.34 MHz
-ModeLine "1400x1050"  149.34  1400 1496 1648 1896  1050 1051 1054 1094  -HSync +Vsync
-
-# 1400x1050 @ 75.00 Hz (GTF) hsync: 82.20 kHz; pclk: 155.85 MHz
-ModeLine "1400x1050"  155.85  1400 1496 1648 1896  1050 1051 1054 1096  -HSync +Vsync
-
-# 1400x1050 @ 85.00 Hz (GTF) hsync: 93.76 kHz; pclk: 179.26 MHz
-ModeLine "1400x1050"  179.26  1400 1504 1656 1912  1050 1051 1054 1103  -HSync +Vsync
-
-# 1400x1050 @ 100.00 Hz (GTF) hsync: 111.20 kHz; pclk: 214.39 MHz
-ModeLine "1400x1050"  214.39  1400 1512 1664 1928  1050 1051 1054 1112  -HSync +Vsync
-
-# 1600x1200 @ 100.00 Hz (GTF) hsync: 127.10 kHz; pclk: 280.64 MHz
-ModeLine "1600x1200"  280.64  1600 1728 1904 2208  1200 1201 1204 1271  -HSync +Vsync
diff --git a/abs/mv-core/MythVantage-config/templates/xorg/modeline.custom b/abs/mv-core/MythVantage-config/templates/xorg/modeline.custom
deleted file mode 100644
index ca6d678..0000000
--- a/abs/mv-core/MythVantage-config/templates/xorg/modeline.custom
+++ /dev/null
@@ -1 +0,0 @@
-ModeLine "CustomModeline" 14.318 768 784 848 910 483 484 492 525 Interlace
diff --git a/abs/mv-core/MythVantage-config/templates/xorg/xorg.conf.ati b/abs/mv-core/MythVantage-config/templates/xorg/xorg.conf.ati
deleted file mode 100644
index 8c75552..0000000
--- a/abs/mv-core/MythVantage-config/templates/xorg/xorg.conf.ati
+++ /dev/null
@@ -1,98 +0,0 @@
-Section "ServerFlags"
-	Option "AutoAddDevices" "False"
-EndSection
-
-Section "ServerLayout"
-	Identifier     "X.org Configured"
-	Screen      0  "aticonfig-Screen[0]" 0 0
-	InputDevice    "Mouse0" "CorePointer"
-	InputDevice    "Keyboard0" "CoreKeyboard"
-EndSection
-
-Section "Files"
-#	RgbPath      "/usr/share/X11/rgb"
-	ModulePath   "/usr/lib/xorg/modules"
-	FontPath     "/usr/share/fonts/misc"
-	FontPath     "/usr/share/fonts/75dpi"
-	FontPath     "/usr/share/fonts/100dpi"
-	FontPath     "/usr/share/fonts/TTF"
-	FontPath     "/usr/share/fonts/Type1"
-EndSection
-
-Section "Module"
-	Load  "xtrap"
-	Load  "dbe"
-	Load  "record"
-	Load  "extmod"
-	Load  "dri"
-	Load  "type1"
-	Load  "freetype"
-EndSection
-
-Section "InputDevice"
-	Identifier  "Keyboard0"
-	Driver      "kbd"
-EndSection
-
-Section "InputDevice"
-	Identifier  "Mouse0"
-	Driver      "mouse"
-	Option	    "Protocol" "auto"
-	Option	    "Device" "/dev/input/mice"
-	Option	    "ZAxisMapping" "4 5 6 7"
-EndSection
-
-Section "Monitor"
-	Identifier   "Monitor0"
-	VendorName   "Monitor Vendor"
-	ModelName    "Monitor Model"
-EndSection
-
-Section "Monitor"
-	Identifier   "aticonfig-Monitor[0]"
-#	HorizSync    
-#	VertRefresh 
-	Option	    "VendorName" "ATI Proprietary Driver"
-	Option	    "ModelName" "Generic Autodetecting Monitor"
-	Option	    "DPMS" "true"
-EndSection
-
-Section "Device"
-
-        ### Available Driver options are:-
-        ### Values: <i>: integer, <f>: float, <bool>: "True"/"False",
-        ### <string>: "String", <freq>: "<f> Hz/kHz/MHz"
-        ### [arg]: arg optional
-        #Option     "ShadowFB"           	# [<bool>]
-        #Option     "DefaultRefresh"     	# [<bool>]
-        #Option     "ModeSetClearScreen" 	# [<bool>]
-	Identifier  "Card0"
-	Driver      "vesa"
-	VendorName  "ATI Technologies Inc"
-	BoardName   "RV370 5B60 [Radeon X300 (PCIE)]"
-	BusID       "PCI:1:0:0"
-EndSection
-
-Section "Device"
-	Identifier  "aticonfig-Device[0]"
-	Driver      "fglrx"
-#INSERT HERE
-
-#	Option	    "ForceMonitors" "tv,nocrt1,notmds1"
-#	Option	    "TVStandard" "SCART"
-#	Option	    "TVFormat" "PAL-B"
-EndSection
-
-
-Section "Screen"
-	Identifier "aticonfig-Screen[0]"
-	Device     "aticonfig-Device[0]"
-	Monitor    "aticonfig-Monitor[0]"
-	DefaultDepth     24
-	SubSection "Display"
-		Viewport   0 0
-		Depth     24
-		Modes    "640x480"
-	EndSubSection
-EndSection
-
diff --git a/abs/mv-core/MythVantage-config/templates/xorg/xorg.conf.intel b/abs/mv-core/MythVantage-config/templates/xorg/xorg.conf.intel
deleted file mode 100644
index c4a67c9..0000000
--- a/abs/mv-core/MythVantage-config/templates/xorg/xorg.conf.intel
+++ /dev/null
@@ -1,152 +0,0 @@
-Section "ServerFlags"
-        Option "AutoAddDevices" "False"
-EndSection
-
-Section "ServerLayout"
-	Identifier     "Xorg Configured"
-	Screen      0  "Screen0" 0 0
-	InputDevice    "Keyboard0" "CoreKeyboard"
-	InputDevice    "PS/2 Mouse" "CorePointer"
-# Serial Mouse not detected
-# USB Mouse not detected
-EndSection
-
-Section "ServerFlags"
-	Option "AllowMouseOpenFail"  "true"
-	
-EndSection
-
-Section "Files"
-#	RgbPath      "/usr/share/X11/rgb"
-	ModulePath   "/usr/lib/xorg/modules"
-	FontPath     "/usr/share/fonts/misc:unscaled"
-	FontPath     "/usr/share/fonts/misc"
-	FontPath     "/usr/share/fonts/75dpi:unscaled"
-	FontPath     "/usr/share/fonts/75dpi"
-	FontPath     "/usr/share/fonts/100dpi:unscaled"
-	FontPath     "/usr/share/fonts/100dpi"
-	FontPath     "/usr/share/fonts/PEX"
-# Additional fonts: Locale, Gimp, TTF...
-	FontPath     "/usr/share/fonts/cyrillic"
-#	FontPath     "/usr/share/lib/X11/fonts/latin2/75dpi"
-#	FontPath     "/usr/share/lib/X11/fonts/latin2/100dpi"
-# True type and type1 fonts are also handled via xftlib, see /etc/X11/XftConfig!
-	FontPath     "/usr/share/fonts/Type1"
-	FontPath     "/usr/share/fonts/ttf/western"
-	FontPath     "/usr/share/fonts/ttf/decoratives"
-	FontPath     "/usr/share/fonts/truetype"
-	FontPath     "/usr/share/fonts/truetype/openoffice"
-	FontPath     "/usr/share/fonts/truetype/ttf-bitstream-vera"
-	FontPath     "/usr/share/fonts/latex-ttf-fonts"
-	FontPath     "/usr/share/fonts/defoma/CID"
-	FontPath     "/usr/share/fonts/defoma/TrueType"
-EndSection
-
-Section "Module"
-        Load  "ddc"  # ddc probing of monitor
-	Load  "dbe"
-	Load  "dri"
-	Load  "extmod"
-	Load  "glx"
-        Load  "bitmap" # bitmap-fonts
-	Load  "type1"
-	Load  "freetype"
-	Load  "record"
-EndSection
-
-Section "InputDevice"
-	Identifier  "Keyboard0"
-	Driver      "keyboard"
-        Option      "CoreKeyboard"
-	Option "XkbRules" "xorg"
-	Option "XkbModel" "pc105"
-	Option "XkbLayout" ""
-	Option "XkbVariant" ""
-EndSection
-
-Section "InputDevice"
-	Identifier  "Serial Mouse"
-	Driver      "mouse"
-	Option      "Protocol" "Microsoft"
-	Option      "Device" "/dev/ttyS0"
-	Option      "Emulate3Buttons" "true"
-	Option      "Emulate3Timeout" "70"
-	Option	    "SendCoreEvents"  "true"
-EndSection
-
-Section "InputDevice"
-	Identifier  "PS/2 Mouse"
-	Driver      "mouse"
-	Option      "Protocol" "auto"
-	Option          "ZAxisMapping"          "4 5"
-	Option      "Device" "/dev/psaux"
-	Option      "Emulate3Buttons" "true"
-	Option      "Emulate3Timeout" "70"
-	Option	    "SendCoreEvents"  "true"
-EndSection
-
-Section "InputDevice"
-        Identifier      "USB Mouse"
-        Driver          "mouse"
-        Option          "Device"                "/dev/input/mice"
-	Option		"SendCoreEvents"	"true"
-        Option          "Protocol"              "IMPS/2"
-        Option          "ZAxisMapping"          "4 5"
-        Option          "Buttons"               "5"
-EndSection
-
-# Auto-generated by Archie mkxcfg
-
-Section "Monitor"
-	Identifier "Monitor0"
-		Option "DPMS" "true"
-EndSection
-
-# Auto-generated by Archie mkxcfg
-
-Section "Device"
-	Identifier  "Card0"
-	Driver      "intel"
-	VendorName  "All"
-	BoardName   "All"
-EndSection
-
-Section "Screen"
-	Identifier "Screen0"
-	Device     "Card0"
-	Monitor    "Monitor0"
-	DefaultColorDepth 16
-	SubSection "Display"
-		Depth     1
-		Modes "1024x768" "800x600" "640x480"
-	EndSubSection
-	SubSection "Display"
-		Depth     4
-		Modes "1024x768" "800x600" "640x480"
-	EndSubSection
-	SubSection "Display"
-		Depth     8
-		Modes "1024x768" "800x600" "640x480"
-	EndSubSection
-	SubSection "Display"
-		Depth     15
-		Modes "1024x768" "800x600" "640x480"
-	EndSubSection
-	SubSection "Display"
-		Depth     16
-		Modes  "800x600" 
-		virtual 800 600 
-	EndSubSection
-	SubSection "Display"
-		Depth     24
-		Modes "1024x768" "800x600" "640x480"
-	EndSubSection
-	SubSection "Display"
-		Depth     32
-		Modes "1024x768" "800x600" "640x480"
-	EndSubSection
-EndSection
-
-Section "DRI"
-	Mode 0666
-EndSection
diff --git a/abs/mv-core/MythVantage-config/templates/xorg/xorg.conf.nvidia b/abs/mv-core/MythVantage-config/templates/xorg/xorg.conf.nvidia
deleted file mode 100755
index 6e005a2..0000000
--- a/abs/mv-core/MythVantage-config/templates/xorg/xorg.conf.nvidia
+++ /dev/null
@@ -1,93 +0,0 @@
-# nvidia-xconfig: X configuration file generated by nvidia-xconfig
-# nvidia-xconfig:  version 1.0  (buildmeister@builder3)  Tue Aug  1 21:11:12 PDT 2006
-Section "ServerFlags"
-        Option "AutoAddDevices" "False"
-EndSection
-
-Section "ServerLayout"
-    Identifier     "Layout0"
-    Screen      0  "Screen0"
-    InputDevice    "Keyboard0" "CoreKeyboard"
-    InputDevice    "Mouse0" "CorePointer"
-EndSection
-
-Section "Files"
-#    RgbPath         "/usr/X11R6/lib/X11/rgb"
-EndSection
-
-Section "Module"
-    Load           "dbe"
-    Load           "extmod"
-    Load           "type1"
-    Load           "freetype"
-    Load           "glx"
-EndSection
-
-Section "InputDevice"
-    # generated from default
-    Identifier     "Mouse0"
-    Driver         "mouse"
-    Option         "Protocol" "auto"
-    Option         "Device" "/dev/psaux"
-    Option         "Emulate3Buttons" "no"
-    Option         "ZAxisMapping" "4 5"
-EndSection
-
-Section "InputDevice"
-    # generated from default
-    Identifier     "Keyboard0"
-    Driver         "keyboard"
-EndSection
-
-Section "Monitor"
-    Identifier     "Monitor0"
-    VendorName     "Unknown"
-    ModelName      "Unknown"
-#    HorizSync       
-#    VertRefresh    
-    Option         "DPMS" "false"
-    DisplaySize  203 153
-    Modeline  "1280x720" 74.25   1280 1316 1452 1644    720  720  723  751 -hsync +vsync
-    Modeline  "1280x720_60.00" 74.25 1280 1352 1432 1648 720 725 730 750 -hsync -vsync
-    ModeLine  "848x480" 34.0 848 880 1016 1072 480 494 495 527 -hsync -vsync
-    Modeline  "800x600" 38.34 800 832 928 1024 600 604 608 624 -HSync -VSync 
-    ModeLine "NTSC-DVD-72p" 32.432 720 736 800 858 480 484 492 525
-#INSERT MODELINE
-EndSection
-
-Section "Device"
-    Identifier     "Device0"
-    Driver         "nvidia"
-    VendorName     "NVIDIA Corporation"
-    Option "DPI" "100 x 100"
-    Option "NoLogo" "1"    
-	
-#INSERT HERE
-
-#END OPTIONS
-
-#    Option "ConnectedMonitor" "DFP"
-#    Option "FlatPanelProperties" "Scaling = centered, Dithering = enabled"
-#    Option "DigitalVibrance" "0"
-#    Option "TransparentIndex" "0"
-#    Option  "CursorShadowAlpha" "64"
-#    Option  "CursorShadowXOffset"  "4"
-#    Option  "UseEdidFreqs" "True"
-#    Option  "NvAGP" "1"
- 
-
-
-
-EndSection
-
-Section "Screen"
-    Identifier     "Screen0"
-    Device         "Device0"
-    Monitor        "Monitor0"
-    DefaultDepth    24
-    SubSection     "Display"
-        Depth       24
-        Modes     "1280x720" 
-    EndSubSection
-EndSection
-
diff --git a/abs/mv-core/MythVantage-config/templates/xorg/xorg.conf.vesa b/abs/mv-core/MythVantage-config/templates/xorg/xorg.conf.vesa
deleted file mode 100755
index 90b426b..0000000
--- a/abs/mv-core/MythVantage-config/templates/xorg/xorg.conf.vesa
+++ /dev/null
@@ -1,75 +0,0 @@
-# nvidia-xconfig: X configuration file generated by nvidia-xconfig
-# nvidia-xconfig:  version 1.0  (buildmeister@builder3)  Tue Aug  1 21:11:12 PDT 2006
-Section "ServerFlags"
-        Option "AutoAddDevices" "False"
-EndSection
-
-Section "ServerLayout"
-    Identifier     "Layout0"
-    Screen      0  "Screen0"
-    InputDevice    "Keyboard0" "CoreKeyboard"
-    InputDevice    "Mouse0" "CorePointer"
-EndSection
-
-Section "Files"
-#    RgbPath         "/usr/X11R6/lib/X11/rgb"
-EndSection
-
-Section "Module"
-    Load           "dbe"
-    Load           "extmod"
-    Load           "type1"
-    Load           "freetype"
-  
-EndSection
-
-Section "InputDevice"
-    # generated from default
-    Identifier     "Mouse0"
-    Driver         "mouse"
-    Option         "Protocol" "auto"
-    Option         "Device" "/dev/psaux"
-    Option         "Emulate3Buttons" "no"
-    Option         "ZAxisMapping" "4 5"
-EndSection
-
-Section "InputDevice"
-    # generated from default
-    Identifier     "Keyboard0"
-    Driver         "keyboard"
-EndSection
-
-Section "Monitor"
-    Identifier     "Monitor0"
-    VendorName     "Unknown"
-    ModelName      "Unknown"
-    HorizSync       30.0 - 110.0
-    VertRefresh     50.0 - 150.0
-    Option         "DPMS" "false"
-    Modeline  "1280x720" 74.25   1280 1316 1452 1644    720  720  723  751 -hsync +vsync
-    Modeline  "1280x720_60.00" 74.25 1280 1352 1432 1648 720 725 730 750 -hsync -vsync
-    ModeLine  "848x480" 34.0 848 880 1016 1072 480 494 495 527 -hsync -vsync
-    Modeline  "800x600" 38.34 800 832 928 1024 600 604 608 624 -HSync -VSync 
-    ModeLine "NTSC-DVD-72p" 32.432 720 736 800 858 480 484 492 525
-EndSection
-
-Section "Device"
-    Identifier     "Device0"
-    Driver         "vesa"
-    VendorName     "Generic Corporation"
-    Option "DPI" "100 x 100"
-
-
-EndSection
-
-Section "Screen"
-    Identifier     "Screen0"
-    Device         "Device0"
-    Monitor        "Monitor0"
-    DefaultDepth    24
-    SubSection     "Display"
-        Depth       24
-        Modes     "1280x720" 
-    EndSubSection
-EndSection
-
diff --git a/abs/mv-core/MythVantage-config/templates/xorg/xorg.conf.via b/abs/mv-core/MythVantage-config/templates/xorg/xorg.conf.via
deleted file mode 100644
index 96cae54..0000000
--- a/abs/mv-core/MythVantage-config/templates/xorg/xorg.conf.via
+++ /dev/null
@@ -1,80 +0,0 @@
-# nvidia-xconfig: X configuration file generated by nvidia-xconfig
-# nvidia-xconfig:  version 1.0  (buildmeister@builder3)  Tue Aug  1 21:11:12 PDT 2006
-Section "ServerFlags"
-        Option "AutoAddDevices" "False"
-EndSection
-
-Section "ServerLayout"
-    Identifier     "Layout0"
-    Screen      0  "Screen0"
-    InputDevice    "Keyboard0" "CoreKeyboard"
-    InputDevice    "Mouse0" "CorePointer"
-EndSection
-
-Section "Files"
-#    RgbPath         "/usr/X11R6/lib/X11/rgb"
-EndSection
-
-Section "Module"
-    Load           "dbe"
-    Load           "glx"
-    Load           "extmod"
-    Load           "type1"
-    Load           "freetype"
-    Load           "dri"
-EndSection
-
-Section "InputDevice"
-    # generated from default
-    Identifier     "Mouse0"
-    Driver         "mouse"
-    Option         "Protocol" "auto"
-    Option         "Device" "/dev/psaux"
-    Option         "Emulate3Buttons" "no"
-    Option         "ZAxisMapping" "4 5"
-EndSection
-
-Section "InputDevice"
-    # generated from default
-    Identifier     "Keyboard0"
-    Driver         "keyboard"
-EndSection
-
-Section "Monitor"
-    Identifier     "Monitor0"
-    VendorName     "Unknown"
-    ModelName      "Unknown"
-    HorizSync       30.0 - 110.0
-    VertRefresh     50.0 - 150.0
-    Option         "DPMS" "false"
-    Modeline  "1280x720" 74.25   1280 1316 1452 1644    720  720  723  751 -hsync +vsync
-    Modeline  "1280x720_60.00" 74.25 1280 1352 1432 1648 720 725 730 750 -hsync -vsync
-    ModeLine  "848x480" 34.0 848 880 1016 1072 480 494 495 527 -hsync -vsync
-    Modeline  "800x600" 38.34 800 832 928 1024 600 604 608 624 -HSync -VSync 
-    ModeLine "NTSC-DVD-72p" 32.432 720 736 800 858 480 484 492 525
-EndSection
-
-Section "Device"
-    Identifier     "Device0"
-    Driver         "via"
-    VendorName     "via"
-    Option "DPI" "100 x 100"
-
-
-EndSection
-
-Section "Screen"
-    Identifier     "Screen0"
-    Device         "Device0"
-    Monitor        "Monitor0"
-    DefaultDepth    16
-    SubSection     "Display"
-        Depth       16
-	 Modes "800x600"
-    EndSubSection
-EndSection
-
-Section "DRI"
-	  Group   "video"
-	    Mode    0666
-    EndSection
diff --git a/abs/mv-core/MythVantage-config/templates/xorg/xorg.conf.vmware b/abs/mv-core/MythVantage-config/templates/xorg/xorg.conf.vmware
deleted file mode 100755
index c4db4bf..0000000
--- a/abs/mv-core/MythVantage-config/templates/xorg/xorg.conf.vmware
+++ /dev/null
@@ -1,75 +0,0 @@
-# nvidia-xconfig: X configuration file generated by nvidia-xconfig
-# nvidia-xconfig:  version 1.0  (buildmeister@builder3)  Tue Aug  1 21:11:12 PDT 2006
-Section "ServerFlags"
-        Option "AutoAddDevices" "False"
-EndSection
-
-Section "ServerLayout"
-    Identifier     "Layout0"
-    Screen      0  "Screen0"
-    InputDevice    "Keyboard0" "CoreKeyboard"
-    InputDevice    "Mouse0" "CorePointer"
-EndSection
-
-Section "Files"
-#    RgbPath         "/usr/X11R6/lib/X11/rgb"
-EndSection
-
-Section "Module"
-    Load           "dbe"
-    Load           "extmod"
-    Load           "type1"
-    Load           "freetype"
-    Load           "glx"
-EndSection
-
-Section "InputDevice"
-    # generated from default
-    Identifier     "Mouse0"
-    Driver         "mouse"
-    Option         "Protocol" "auto"
-    Option         "Device" "/dev/psaux"
-    Option         "Emulate3Buttons" "no"
-    Option         "ZAxisMapping" "4 5"
-EndSection
-
-Section "InputDevice"
-    # generated from default
-    Identifier     "Keyboard0"
-    Driver         "keyboard"
-EndSection
-
-Section "Monitor"
-    Identifier     "Monitor0"
-    VendorName     "Unknown"
-    ModelName      "Unknown"
-    HorizSync       30.0 - 110.0
-    VertRefresh     50.0 - 150.0
-    Option         "DPMS" "false"
-    Modeline  "1280x720" 74.25   1280 1316 1452 1644    720  720  723  751 -hsync +vsync
-    Modeline  "1280x720_60.00" 74.25 1280 1352 1432 1648 720 725 730 750 -hsync -vsync
-    ModeLine  "848x480" 34.0 848 880 1016 1072 480 494 495 527 -hsync -vsync
-    Modeline  "800x600" 38.34 800 832 928 1024 600 604 608 624 -HSync -VSync 
-    ModeLine "NTSC-DVD-72p" 32.432 720 736 800 858 480 484 492 525
-EndSection
-
-Section "Device"
-    Identifier     "Device0"
-    Driver         "vmware"
-    VendorName     "NVIDIA Corporation"
-    Option "DPI" "100 x 100"
-
-
-EndSection
-
-Section "Screen"
-    Identifier     "Screen0"
-    Device         "Device0"
-    Monitor        "Monitor0"
-    DefaultDepth    24
-    SubSection     "Display"
-        Depth       24
-        Modes     "1280x720" 
-    EndSubSection
-EndSection
-
diff --git a/abs/mv-core/MythVantage-config/timezip.py b/abs/mv-core/MythVantage-config/timezip.py
deleted file mode 100755
index bf6b389..0000000
--- a/abs/mv-core/MythVantage-config/timezip.py
+++ /dev/null
@@ -1,232 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-# import MySQL module
-#used to import the zipcode/timezone/nfs info fromMBE
-import MySQLdb
-import sys
-import getopt
-import socket
-
-
-def usage():
-    print " -h --help"
-    print " -d  --installdb"
-    print " -m --masterdb"
-    print " -n  --hostname of current machine"
-
-def printvars():
-    print "masterdb: " + masterdb
-    print "installdb:" + installdb
-    print "hostname: " + thishostname
-    print "BEhostname:" + BEhostname
-    print "zipcode:" + zipcode
-    print "timezone:" + tz
-    print "timezone region:" + tz_region
-    print "timezone subregion:" + tz_subregion
-    print "nfsip:" + nfsip
-    print "nfstoggle:" + nfstoggle
-    print "nfsmount:"  + nfsmount
-    print "hobbitclient:" + hobbitclient
-# connect
-def selectvars():
-
-    global BEhostname
-    global zipcode
-    global tz
-    global tz_region
-    global tz_subregion
-    global nfsip
-    global nfstoggle
-    global nfsmount
-    global hobbitclient
-
-    db = MySQLdb.connect(host=masterdb, user="mythtv", passwd="mythtv", db="mythconverg")
-    # create a cursor
-    cursor = db.cursor()
-    # execute SQL statement
-    cursor.execute("select hostname from settings where value='BackendServerIP' and data=(%s)",(masterdb))
-    result = cursor.fetchone()
-    try:
-        BEhostname=result[0]
-    except TypeError:
-        BEhostname=""
-
-    cursor.execute("select data from settings where value='HostZipcode' and hostname=(%s)",(BEhostname))
-    result = cursor.fetchone()
-    try:
-        zipcode =  result[0]
-    except TypeError:
-        zipcode=""
-
-    cursor.execute("select data from settings where value='HostCentralNFSIP' and hostname=(%s)",(BEhostname))
-    result = cursor.fetchone()
-    try:
-        nfsip=result[0]
-    except TypeError:
-        nfsip=""
-
-    cursor.execute("select data from settings where value='HostHaveCentralNFS' and hostname=(%s)",(BEhostname))
-    result = cursor.fetchone()
-    try:
-        nfstoggle=result[0]
-    except TypeError:
-        nfstoggle=""
-
-    cursor.execute("select data from settings where value='HostNFSmountpoint' and hostname=(%s)",(BEhostname))
-    result = cursor.fetchone()
-    try:
-        nfsmount=result[0]
-    except TypeError:
-        nfsmount=""
-
-    cursor.execute("select data from settings where value='HostTimeZone' and hostname=(%s)",(BEhostname))
-    result = cursor.fetchone()
-    try:
-        tz=result[0]
-    except TypeError:
-        tz=""
-##########
-    cursor.execute("select data from settings where value='HostTimeZoneRegion' and hostname=(%s)",(BEhostname))
-    result = cursor.fetchone()
-    try:
-        tz_region=result[0]
-    except TypeError:
-        tz_region=""
-    tempsubregion="HostTimeZoneRegion_" + tz_region
-
-    cursor.execute("select data from settings where value=%s and hostname=(%s)",(tempsubregion,BEhostname))
-    result = cursor.fetchone()
-    try:
-        tz_subregion=result[0]
-    except TypeError:
-        tz_subregion=""
-###############
-    if  ( thishostname != BEhostname ):
-        cursor.execute("select data from settings where value='GlobalServiceHobbitserver'")
-        result = cursor.fetchone()
-        try:
-            hobbitclient=result[0]
-        except TypeError:
-            hobbitclient="1"
-
-
-
-def insertvars():
-
-    db = MySQLdb.connect(host=installdb, user="mythtv", passwd="mythtv", db="mythconverg")
-    cursor = db.cursor()
-#inserting the zipcode
-    cursor.execute("select * from settings where value='HostZipcode' and hostname=(%s)",(thishostname))
-    result = cursor.fetchone()
-    if ( zipcode!="" ):
-        if (result == None):
-            cursor.execute("INSERT INTO  settings (value,data,hostname) VALUES ('HostZipcode',(%s),(%s))",(zipcode,thishostname))
-            print "inserting zipcode"
-        else:
-            cursor.execute("update settings set data=(%s) where hostname=(%s) and value='HostZipcode'",(zipcode,thishostname))
-            print "updating zipcode"
-
-#inserting the timezone
-    cursor.execute("select *  from settings where value='HostTimeZone' and hostname=(%s)",(thishostname))
-    result = cursor.fetchone()
-    if ( tz != ""):
-         if (result == None):
-            cursor.execute("INSERT INTO  settings (value,data,hostname) VALUES ('HostTimeZone',(%s),(%s))",(tz,thishostname))
-            print "inserting timezone"
-         else:
-            cursor.execute("update settings set data=(%s) where hostname=(%s) and value='HostTimeZone'",(tz,thishostname))
-            print "updating timezone"
-
-    cursor.execute("select *  from settings where value='HostTimeZoneRegion' and hostname=(%s)",(thishostname))
-    result = cursor.fetchone()
-    if ( tz != ""):
-         if (result == None):
-            cursor.execute("INSERT INTO  settings (value,data,hostname) VALUES ('HostTimeZoneRegion',(%s),(%s))",(tz_region,thishostname))
-            print "inserting timezone region"
-         else:
-            cursor.execute("update settings set data=(%s) where hostname=(%s) and value='HostTimeZoneRegion'",(tz_region,thishostname))
-            print "updating timezone region"
-
-    tempsubregion="HostTimeZoneRegion_" + tz_region
-    cursor.execute("select *  from settings where value=%s and hostname=(%s)",(tempsubregion,thishostname))
-    result = cursor.fetchone()
-    if ( tz != ""):
-         if (result == None):
-            cursor.execute("INSERT INTO  settings (value,data,hostname) VALUES ((%s),(%s),(%s))",(tempsubregion,tz_subregion,thishostname))
-            print "inserting timezone subregion"
-         else:
-            cursor.execute("update settings set data=(%s) where hostname=(%s) and value=(%s)",(tempsubregion,tz_subregion,thishostname))
-            print "updating timezone subregion"
-
-
-#start of NFSIP
-    cursor.execute("select data from settings where value='HostCentralNFSIP' and hostname=(%s)",(thishostname))
-    result = cursor.fetchone()
-    if ( nfsip != ""):
-        if (result == None):
-            cursor.execute("INSERT INTO  settings (value,data,hostname) VALUES ('HostCentralNFSIP',(%s),(%s))",(nfsip,thishostname))
-            print "inserting nfsip"
-
-    if (nfstoggle != ""):
-        cursor.execute("select data from settings where value='HostHaveCentralNFS' and hostname=(%s)",(thishostname))
-        result = cursor.fetchone()
-        if (result == None):
-            cursor.execute("INSERT INTO  settings (value,data,hostname) VALUES ('HostHaveCentralNFS',(%s),(%s))",(nfstoggle,thishostname))
-            print "inserting nfstoggle"
-
-    if ( nfsmount !="") :
-        cursor.execute("select data from settings where value='HostNFSmountpoint' and hostname=(%s)",(thishostname))
-        result = cursor.fetchone()
-        if (result == None):
-            cursor.execute("INSERT INTO  settings (value,data,hostname) VALUES ('HostNFSmountpoint',(%s),(%s))",(nfsmount,thishostname))
-            print "inserting nfsmountpoint"
-
-#hobbitclient
-    cursor.execute("select *  from settings where value='HostServiceHobbitclient' and hostname=(%s)",(thishostname))
-    result = cursor.fetchone()
-    if ( tz != ""):
-         if (result == None):
-            cursor.execute("INSERT INTO  settings (value,data,hostname) VALUES ('HostServiceHobbitclient',(%s),(%s))",(hobbitclient,thishostname))
-            print "inserting hobbitcleint"
-         else:
-            cursor.execute("update settings set data=(%s) where hostname=(%s) and value='HostServiceHobbitclient'",(hobbitclient,thishostname))
-            print "updating hobbitclient"
-
-
-def main(argv):
-    global masterdb
-    global installdb
-    global thishostname
-    thishostname=""
-    global BEhostname
-    global zipcode
-    global tz
-    global tz_region
-    global tz_subregion
-
-    global nfsip
-    global hobbitclient
-    try:
-        opts, args = getopt.getopt(argv, "hm:d:n:", ["help", "masterdb=", "installdb=" , "hostname=" ] )
-    except getopt.GetoptError:
-        sys.exit(2)
-    for opt, arg in opts:
-        if opt in ("-h", "--help"):
-             usage()
-             sys.exit()
-        elif opt in ( "-d" , "--installdb"):
-             installdb = arg
-        elif opt in ("-m", "--masterdb"):
-             masterdb = arg
-        elif opt in ("-n", "--hostname"):
-             thishostname = arg
-
-    if ( thishostname == "" ):
-         thishostname = socket.gethostname()
-
-    selectvars()
-    printvars()
-    insertvars()
-if __name__ == "__main__":
-    main(sys.argv[1:])
-
diff --git a/abs/mv-core/MythVantage-config/timezone.bin b/abs/mv-core/MythVantage-config/timezone.bin
deleted file mode 100755
index cff931a..0000000
--- a/abs/mv-core/MythVantage-config/timezone.bin
+++ /dev/null
diff --git a/abs/mv-core/MythVantage-config/xconfig.sh b/abs/mv-core/MythVantage-config/xconfig.sh
deleted file mode 100755
index 2fad821..0000000
--- a/abs/mv-core/MythVantage-config/xconfig.sh
+++ /dev/null
@@ -1,363 +0,0 @@
-#!/bin/bash
-#SET DISPLAYCARD to force a cardtype
-#SET DISPLAYRES to force Xres, ENV takes precendent over cmdline
-#displayres=cmdline
-#NVPKGS="ati-dri xf86-video-ati xf86-video-radeonhd intel-dri xf86-video-intel unichrome-dri xf86-video-unichrome xf86-video-mga xf86-video-savage xf86-video-trident"
-NVPKGS="ati-dri xf86-video-ati xf86-video-radeonhd intel-dri xf86-video-intel xf86-video-mga xf86-video-savage xf86-video-trident unichrome-dri xf86-video-openchrome"
-BASE=""
-. /etc/profile
-NVIDIA_96XX="$TEMPLATES/xorg/96xx_supported.txt"
-#TEMPLATES="/usr/share/templates"
-MYTHHOME=$BASE/home/mythtv
-
-function Xvalues {
-    CMDLINE=$(cat /proc/cmdline)
-    echo "$CMDLINE" | grep -q forceXvesa
-    if [ $? = 0  ]
-    then
-        VGACARDTYPE=vesa
-        Xcardtype=$VGACARDTYPE
-    else
-        VGACARDTYPE=`lspci | grep -i vga | sort -r | head -n 1 | cut -d: -f3 | cut -d" " -f2`
-        VGAPCIID=`lspci | grep -i vga | sort -r | head -n 1 | cut -d" " -f1`
-        CARDID=`lspci -n | grep "$VGAPCIID" | grep 10de | cut -d" " -f3 | cut -d: -f2`
-        VENDORID=`lspci -n | grep "$VGAPCIID" | grep 10de | cut -d" " -f3 | cut -d: -f1`
-    fi
-    #force VGACARDTYPE
-    if [ ! x$DISPLAYCARD = x ]
-    then
-        VGACARDTYPE=$DISPLAYCARD
-        Xcardtype=$VGACARDTYPE
-    fi
-    echo "Will use $VGACARDTYPE"
-    currentmode=`cat "$BASE/etc/X11/xorg.conf" | grep Modes | awk -Fs '{ print $2 }'`
-}
-
-function presetupX {
-    if [ -f /etc/sysconfig/IGNORE_X ]
-    then
-        echo "Will not run xconfig.sh due to presence of /etc/sysconfig/IGNORE_X"
-        return 1
-    else
-        if  [ "$XIgnoreConfig" = 1 ]
-        then
-            echo "Using User supplied X"
-            if [ -f "$MYTHHOME/templates/xorg.user" ]
-            then
-                cp -f "$MYTHHOME/templates/xorg.user" "$XORG_CONF"
-            else
-                echo "Didn't find the file"
-                echo "Copy your config file to $MYTHHOME/templates/xorg.user" > "$XORG_CONF"
-            fi
-        else
-            if [ "$XUseAdvanced" = 1 ]
-            then
-                setupAdvancedX
-            else
-                setupX
-            fi
-        fi
-    fi
-
-}
-
-function setupAdvancedX {
-    echo "#doing the advanced" > /tmp/options
-    Xcategory=`echo "$Xresadvanced" | cut -d_ -f1`
-    Xres=`echo "$Xresadvanced" | cut -d_ -f2`
-    echo "$Xcategory"
-    if [ "$Xcategory" = "nVidia Modeline" ]
-    then
-        Xres=""
-        if [ "$XnVidia1080p" = "1" ]
-        then
-            Xres="${Xres} \"1920x1080_60\""
-        fi
-        if [ "$XnVidia1080i" = "1" ]
-        then
-            Xres="${Xres}  \"1920x1080_60i\""
-        fi
-        if [ "$XnVidia720p" = "1" ]
-        then
-            Xres="${Xres}  \"1280x720_60\""
-        fi
-        if [ "$XnVidia480p" = "1" ]
-        then
-            Xres="${Xres}  \"720x480_60\""
-        fi
-            ML="\t Modes ${Xres}"
-    else
-
-    ML="\t Modes \"${Xres}\""
-    fi
-#    echo $ML
-    case $Xcardtype in
-        NVIDIA|nVidia|nvidia)
-            case $Xconnection in
-                DVI)    ConnectedMonitor=DFP ;;
-                vga)    ConnectedMonitor=CRT;;
-                Auto)   ConnectedMonitor=Auto;;
-                TV)     ConnectedMonitor=TV
-                        echo "Option \"TVStandard\" \"$XTVstandard\""  >>/tmp/options
-                        echo "Option \"TVOutFormat\" \"$XTVconnection\"" >> /tmp/options
-                    ;;
-            esac
-            if [ "$ConnectedMonitor" = Auto ]
-            then
-                echo "auto connection"
-            else
-                echo "Option \"ConnectedMonitor\" \"$ConnectedMonitor\"" >> /tmp/options
-                echo "Option \"FlatPanelProperties\" \"Scaling = centered, Dithering = enabled\"" >> /tmp/options
-                echo "Option \"DigitalVibrance\" \"0\"" >> /tmp/options
-            fi
-
-            if  [ "$XignoreEDID" = 1 ]
-            then
-                EDIDvalue=true
-                EDIDFREQ=false
-                DS="    DisplaySize $XDisplaysize"
-                HS="    HorizSync   $XHsync"
-                VR="    VertRefresh $XVrefresh"
-            else
-                EDIDvalue=false
-                EDIDFREQ=true
-                DS="# Display size edid used "
-                HS="# Hsync edid used "
-                VR="# Vertrefresh edid used "
-            fi
-            echo "Option  \"UseEdidFreqs\" \"$EDIDFREQ\"" >> /tmp/options
-            echo "Option  \"IgnoreEDID\" \"$EDIDvalue\"" >> /tmp/options
-
-
-            sed -e "s/^.*Modes.*$/${ML}/" \
-                -e "/INSERT MODELINE/r  $TEMPLATES/xorg/modeline.$Xcategory" \
-                -e "s/^.*DisplaySize.*$/ $DS/" \
-                -e "s/^#.*HorizSync.*$/ $HS/g" \
-                -e "s/^#.*VertRefresh.*$/ $VR/g" \
-                -e "/INSERT HERE/r /tmp/options" "$TEMPLATES/xorg/xorg.conf.nvidia" > "$XORG_CONF"
-            ;;
-
-        ati|ATI)
-            case $Xconnection in
-                DVI)    ConnectedMonitor="tmds1,nocrt1,notv";;
-                VGA)    ConnectedMonitor="crt1,notmds1,notv" ;;
-                TV)     ConnectedMonitor="tv,nocrt1,notmds1"
-                        echo "Option \"TVStandard\" \"$XTVstandard\""  >>/tmp/options
-                        echo "Option \"TVFormat\" \"$XTVconnection\"" >> /tmp/options
-                    ;;
-            esac
-            if  [ "$XignoreEDID" = 1 ]
-            then
-                DS="    DisplaySize $XDisplaysize"
-                HS="    HorizSync   $XHsync"
-                VR="    VertRefresh $XVrefresh"
-            else
-                DS="# Display size edid used "
-                HS="# Hsync edid used "
-                VR="# Vertrefresh edid used "
-            fi
-
-            echo "Option \"ForceMonitors\" \"$ConnectedMonitor\"" >> /tmp/options
-
-            sed -e "s/^.*Modes.*$/\t $ML/" \
-                -e "/INSERT MODELINE/r  $TEMPLATES/xorg/modeline.$Xcategory" \
-                -e "s/^.*DisplaySize.*$/ $DS/" \
-                -e "s/^#.*HorizSync.*$/ $HS/g" \
-                -e "s/^#.*VertRefresh.*$/ $VR/g" \
-                -e "/INSERT HERE/r /tmp/options" "$TEMPLATES/xorg/xorg.conf.ati"  > "$XORG_CONF"
-            ;;
-
-        via|VIA|Via|S3)
-            # Need to add appropriate Modules, Device and DRI sections
-            # See the http://www.mythtv.org/wiki/XvMC wiki page
-            echo "no via here"
-            ;;
-
-        *)
-            echo "unknown card type"
-            ;;
-    esac
-}
-
-
-function setupX {
-    Xvalues
-    #echo "$currentmode  ____   ${Xres}"
-    #if [ "${currentmode}" != \"${Xres}\" ]
-    if [ x = x ]
-    then
-        case $VGACARDTYPE in
-            nVidia)
-                if [ ${Xres} = Auto ]
-                then
-                    sed -e "/^.*Modes.*$/d" "$TEMPLATES/xorg/xorg.conf.nvidia" > "$XORG_CONF"
-                else
-                    sed -e "s/^.*Modes.*$/\t Modes \"${Xres}\"/" "$TEMPLATES/xorg/xorg.conf.nvidia" > "$XORG_CONF"
-                fi
-                if [ "$TESTMODE" != "test" ]
-                then
-                    #nvidia check right here
-                    grep -qi "$CARDID" "$NVIDIA_96XX"
-                    if [ $? = 0 ]
-                    then
-                        #install 96xx drivers
-                        echo "installing nvidia 96xx drivers"
-                        pacman --noconfirm  -Rd libgl > /dev/null 2>&1
-                        pacman --noconfirm  -R $NVPKGS > /dev/null 2>&1
-                        pacman --noconfirm  -S nvidia-96xx nvidia-96xx-utils  > /dev/null 2>&1
-                    else
-                        #install latest drivers
-                        echo "installing current nvidia drivers"
-                        pacman --noconfirm  -Rd libgl > /dev/null 2>&1
-                        pacman --noconfirm  -R $NVPKGS > /dev/null 2>&1
-                        pacman --noconfirm  -S nvidia nvidia-utils > /dev/null 2>&1
-                    fi
-                fi
-	        echo "/usr/lib/libXvMCNVIDIA_dynamic.so.1" > "$XVMC_CONFIG"
-                ;;
-
-      #      VMware)
-      #              sed -e "s/^.*Modes.*$/\t Modes \"${Xres}\"/" "$TEMPLATES/xorg/xorg.conf.vmware" > "$XORG_CONF"
-      #              ;;
-
-            VIA|S3)
-                # There are actually multiple options here
-                # xf86-video-openchrome
-                # xf86-video-unichrome
-                # There is also a seperate driver for the Unichrome Pro
-                if [ ${Xres} = Auto ]
-                then
-                    sed -e "/^.*Modes.*$/d" "$TEMPLATES/xorg/xorg.conf.via" > "$XORG_CONF"
-                else
-                    sed -e "s/^.*Modes.*$/\t Modes \"${Xres}\"/" "$TEMPLATES/xorg/xorg.conf.via" > "$XORG_CONF"
-                fi
-                if [ "$TESTMODE" != "test" ]
-                then
-                    if [ "$OPENCHROME" = "1" ]
-                    then
-                        pacman --noconfirm  -R nvidia nvidia-utils > /dev/null 2>&1
-                        pacman --noconfirm  -S libgl unichrome-dri xf86-video-openchrome > /dev/null 2>&1
-                    else
-                        pacman --noconfirm  -R nvidia nvidia-utils > /dev/null 2>&1
-                        pacman --noconfirm  -S libgl unichrome-dri xf86-video-unichrome > /dev/null 2>&1
-                    fi
-                fi
-                # I'm making educated guesses here...
-                if lspci | grep "VGA" | grep -qi "Unichrome Pro"
-                then
-                    if [ -f "/usr/lib/libchromeXvMCPro.so.1" ]
-                    then
-	                echo "/usr/lib/libchromeXvMCPro.so.1" > "$XVMC_CONFIG"
-                    else
-	                echo "/usr/lib/libviaXvMCPro.so.1" > "$XVMC_CONFIG"
-                    fi
-                else
-                    if [ -f "/usr/lib/libchromeXvMC.so.1" ]
-                    then
-	                echo "/usr/lib/libchromeXvMC.so.1" > "$XVMC_CONFIG"
-                    else
-                        echo "/usr/lib/libviaXvMC.so.1" > "$XVMC_CONFIG"
-                    fi
-                fi
-                ;;
-
-            Intel|intel)
-               if [ ${Xres} = Auto ]
-                then
-                    sed -e "/^.*Modes.*$/d" "$TEMPLATES/xorg/xorg.conf.intel" > "$XORG_CONF"
-                else
-                    sed -e "s/^.*Modes.*$/\t Modes \"${Xres}\"/" "$TEMPLATES/xorg/xorg.conf.intel" > "$XORG_CONF"
-                fi
-                if [ "$TESTMODE" != "test" ]
-                then
-                    pacman --noconfirm -R nvidia-utils > /dev/null 2>&1
-                    pacman --noconfirm -S libgl > /dev/null 2>&1
-                fi
-	        echo "/usr/lib/libIntelXvMC.so.1" > "$XVMC_CONFIG"
-                ;;
-
-            vesa|InnoTek)
-                if [ ${Xres} = Auto ]
-                then
-                    sed -e "/^.*Modes.*$/d" "$TEMPLATES/xorg/xorg.conf.vesa" > "$XORG_CONF"
-                else
-                    sed -e "s/^.*Modes.*$/\t Modes \"${Xres}\"/" "$TEMPLATES/xorg/xorg.conf.vesa" > "$XORG_CONF"
-                fi
-                ;;
-
-            *)
-                XCONF=/root/xorg.conf.new
-                XCONFB=/etc/X11/xorg.conf.install
-                X -configure
-                if [ -f "$XCONF" ]
-                then
-                    echo "Using $XCONF"
-                    if [ ${Xres} = Auto ]
-                    then
-                        grep -v Modes "$XCONF" | sed -e 's/dev\/mouse/dev\/psaux/g'> "$XORG_CONF"
-                    else
-                        grep -v Modes "$XCONF" | sed -e "/Depth.*16/a Modes \"${Xres}\" " -e "/Depth.*24/a Modes \"${Xres}\""     -e 's/dev\/mouse/dev\/psaux/g'> "$XORG_CONF"
-                    fi
-                elif [ -f "$XCONFB" ]
-                then
-                    echo "Using $XCONFB"
-                    if [ ${Xres} = Auto ]
-                    then
-                        sed -e "/^.*Modes.*$/d" "$XCONFB" > "$XORG_CONF"
-                    else
-                        sed -e "s/^.*Modes.*$/\t Modes \"${Xres}\"/" "$XCONFB" > "$XORG_CONF"
-                    fi
-                else
-                    echo "Xorg configuration failed"
-                fi
-                rm -f "$XCONF" 2>&1 > /dev/null
-                ;;
-        esac
-    fi
-
-}
-
-#MAIN
-TESTMODE="$1"
-if [ "$TESTMODE" = "test" ]
-then
-    XORG_CONF="/tmp/xorg.conf.test"
-    XVMC_CONFIG="/tmp/XvMCConfig.test"
-    XUseAdvanced="1"
-    XIgnoreConfig="${2}"
-    Xcardtype="${3}"
-    XIgnoreEDID="${4}"
-    Xconnection="${5}"
-    XHsync="${6}"
-    XVrefresh="${7}"
-    Xresadvanced="${8}"
-    XTVstandard="${9}"
-    XTVconnection="${10}"
-    XDisplaysize="${11}"
-else
-    if [ -f /etc/systemconfig ]
-    then
-        . /etc/systemconfig
-    else
-        Xres="800x600"
-    fi
-    CMDLINE=$(cat /proc/cmdline)
-    echo $CMDLINE | grep -q displayres
-    if [ $? = 0 ]
-    then
-        TEMPVAR=${CMDLINE#*displayres=}
-        DSR=${TEMPVAR%% *}
-    fi
-    if [ ! x$DSR = x ]
-    then
-        Xres=$DSR
-    fi
-    if [ ! x$DISPLAYRES = x ]
-    then
-        Xres=$DISPLAYRES
-    fi
-
-    XORG_CONF="/etc/X11/xorg.conf"
-    XVMC_CONFIG="/etc/X11/XvMCConfig"
-fi
-presetupX
diff --git a/abs/mv-core/MythVantage-system/45-event.rules b/abs/mv-core/MythVantage-system/45-event.rules
deleted file mode 100644
index f88dc0c..0000000
--- a/abs/mv-core/MythVantage-system/45-event.rules
+++ /dev/null
@@ -1 +0,0 @@
-KERNEL=="event*",	NAME="input/%k", MODE="0640" , GROUP="users"
diff --git a/abs/mv-core/MythVantage-system/PKGBUILD b/abs/mv-core/MythVantage-system/PKGBUILD
deleted file mode 100644
index 895a5ad..0000000
--- a/abs/mv-core/MythVantage-system/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-pkgname=MythVantage-system
-pkgver=1.0
-pkgrel=11
-arch=('i686')
-MVDIR=$startdir/pkg/usr/MythVantage
-BINDIR=$startdir/pkg/usr/bin
-install=STB.install
-pkgdesc="scripts and things related to having a automated system"
-depends=(unclutter  ghosd ncid func wol )
-provides=(STB-system)
-
-binfiles="playmedia.sh  STB-start  saytime.sh restartfrontend.sh backup_job  restore_job.sh  update_system update_system_all repo_sync.sh backend_control.sh load-modules-mythvantage.sh file_time_offset.py grabkey.py  imdb-bulk-update.pl notify.py optimize_mythdb.py myth_mtc.py myth_mtc.sh firstboot.sh initial_db_run"
-
-source=(startfrontend inittab  STBWINDOWMANAGER smolt.cron  $binfiles mfegdbcommands.txt mbegdbcommands.txt 45-event.rules)
-
-build() {
-        cd $startdir/src
-	install -m755 -D STBWINDOWMANAGER $startdir/pkg/etc/X11/STBWINDOWMANAGER
-        install -m755 -D startfrontend $startdir/pkg/etc/X11/Sessions/STB
-	install -m755 -D mfegdbcommands.txt $MVDIR/mfegdbcommands.txt
-	install -m755 -D mbegdbcommands.txt $MVDIR/mbegdbcommands.txt
-####### install to /usr/MythVantage/bin/
-mkdir -p $BINDIR
-for i in $binfiles
-do
-	item=$i
-	install -m755 -D $item $MVDIR/bin/$item
-	echo $item
-	cd $BINDIR
-	pwd
-	ln -s  ../MythVantage/bin/$i .
-
-	cd -
-done
-##########
-
-	install -m755 -D smolt.cron $startdir/pkg/etc/cron.weekly/smolt.cron
-
-	install -m755 -D 45-event.rules $startdir/pkg/etc/udev/rules.d/45-event.rules
-
-
-}
-
diff --git a/abs/mv-core/MythVantage-system/STB-start b/abs/mv-core/MythVantage-system/STB-start
deleted file mode 100644
index 39a50f0..0000000
--- a/abs/mv-core/MythVantage-system/STB-start
+++ /dev/null
@@ -1,160 +0,0 @@
-#!/bin/sh
-. /etc/profile
-# $Xorg: startx.cpp,v 1.3 2000/08/17 19:54:29 cpqbld Exp $
-#
-# This is just a sample implementation of a slightly less primitive
-# interface than xinit.  It looks for user .xinitrc and .xserverrc
-# files, then system xinitrc and xserverrc files, else lets xinit choose
-# its default.  The system xinitrc should probably do things like check
-# for .Xresources files and merge them in, startup up a window manager,
-# and pop a clock and serveral xterms.
-#
-# Site administrators are STRONGLY urged to write nicer versions.
-#
-# $XFree86: xc/programs/xinit/startx.cpp,v 3.16tsi Exp $
-
-
-userclientrc=/etc/X11/Sessions/STB
-userserverrc=$HOME/.xserverrc
-sysclientrc=/usr/X11R6/lib/X11/xinit/xinitrc
-sysserverrc=/usr/X11R6/lib/X11/xinit/xserverrc
-defaultclient=/usr/X11R6/bin/xterm
-defaultserver=/usr/X11R6/bin/X
-defaultclientargs=""
-defaultserverargs=""
-clientargs=""
-serverargs=""
-
-
-
-
-
-
-if [ -f $userclientrc ]; then
-    defaultclientargs=$userclientrc
-elif [ -f $sysclientrc ]; then
-    defaultclientargs=$sysclientrc
-fi
-
-
-
-
-if [ -f $userserverrc ]; then
-    defaultserverargs=$userserverrc
-elif [ -f $sysserverrc ]; then
-    defaultserverargs=$sysserverrc
-fi
-
-whoseargs="client"
-while [ x"$1" != x ]; do
-    case "$1" in
-    # '' required to prevent cpp from treating "/*" as a C comment.
-    /''*|\./''*)
-	if [ "$whoseargs" = "client" ]; then
-	    if [ x"$clientargs" = x ]; then
-		client="$1"
-	    else
-		clientargs="$clientargs $1"
-	    fi
-	else
-	    if [ x"$serverargs" = x ]; then
-		server="$1"
-	    else
-		serverargs="$serverargs $1"
-	    fi
-	fi
-	;;
-    --)
-	whoseargs="server"
-	;;
-    *)
-	if [ "$whoseargs" = "client" ]; then
-	    clientargs="$clientargs $1"
-	else
-	    # display must be the FIRST server argument
-	    if [ x"$serverargs" = x ] && \
-		 expr "$1" : ':[0-9][0-9]*$' > /dev/null 2>&1; then
-		display="$1"
-	    else
-		serverargs="$serverargs $1"
-	    fi
-	fi
-	;;
-    esac
-    shift
-done
-
-# process client arguments
-if [ x"$client" = x ]; then
-    # if no client arguments either, use rc file instead
-    if [ x"$clientargs" = x ]; then
-	client="$defaultclientargs"
-    else
-	client=$defaultclient
-    fi
-fi
-
-# process server arguments
-if [ x"$server" = x ]; then
-    # if no server arguments or display either, use rc file instead
-    if [ x"$serverargs" = x -a x"$display" = x ]; then
-	server="$defaultserverargs"
-    else
-	server=$defaultserver
-    fi
-fi
-
-if [ x"$XAUTHORITY" = x ]; then
-    XAUTHORITY=$HOME/.Xauthority
-    export XAUTHORITY
-fi
-
-removelist=
-
-
-# set up default Xauth info for this machine
-case `uname` in
-Linux*)
-	if [ -z "`hostname --version 2>&1 | grep GNU`" ]; then
-		hostname=`hostname -f`
-	else
-		hostname=`hostname`
-	fi
-	;;
-*)
-	hostname=`hostname`
-	;;
-esac
-
-authdisplay=${display:-:0}
-mcookie=`mcookie`
-for displayname in $authdisplay $hostname$authdisplay; do
-    if ! xauth list "$displayname" | grep "$displayname " >/dev/null 2>&1; then
-        xauth -q << EOF 
-add $displayname . $mcookie
-EOF
-	removelist="$displayname $removelist"
-    fi
-done
-
-
-xinit $client $clientargs -- $server $display $serverargs
-
-if [ x"$removelist" != x ]; then
-    xauth remove $removelist
-fi
-
-
-
-
-
-if command -v deallocvt > /dev/null 2>&1; then
-    deallocvt
-fi
-
-
-
-
-
-
-
diff --git a/abs/mv-core/MythVantage-system/STB.install b/abs/mv-core/MythVantage-system/STB.install
deleted file mode 100644
index 2dbfd19..0000000
--- a/abs/mv-core/MythVantage-system/STB.install
+++ /dev/null
@@ -1,116 +0,0 @@
-# This is a default template for a post-install scriptlet.  You can
-# remove any functions you don't need (and this header).
-
-# arg 1:  the new package version
-pre_install() {
-/bin/true
-}
-
-# arg 1:  the new package version
-post_install() {
-MVDIR=/usr/MythVantage/bin
-#	ln -s  $MVDIR/backup_job /etc/cron.daily/backup_cron
-#	ln -s  $MVDIR/update_system  /etc/cron.daily/xupdate_system_cron
-	ln -s  $MVDIR/repo_sync.sh  /etc/cron.daily/zrepo_sync.sh
-	ln -s  $MVDIR/myth_mtc.sh  /etc/cron.daily/myth_mtc.sh
-	
-	if [ ! -e /etc/cron.tenminutes ]
-	then
-		mkdir /etc/cron.tenminutes
-	fi
-	
-	ln -s $MVDIR/grabkey.py  /etc/cron.tenminutes/grabkey.py
-
-
-LINE="nobody    ALL = NOPASSWD: /sbin/sv stop mythbackend"
-LINE1="nobody    ALL = NOPASSWD: /sbin/sv start mythbackend"
-LINE2="nobody    ALL = NOPASSWD: /usr/bin/backup_job"
-LINE3="nobody    ALL = NOPASSWD: /bin/ls"
-LINE4="nobody    ALL = NOPASSWD: /usr/bin/restore_job.sh"
-LINE5="nobody    ALL = NOPASSWD: /usr/bin/update_system"
-LINE7="nobody    ALL = NOPASSWD: /sbin/poweroff"
-LINE8="nobody    ALL = NOPASSWD: /usr/bin/update_system_all"
-LINE9="nobody    ALL = NOPASSWD: /usr/bin/func"
-LINE10="nobody    ALL = NOPASSWD: /data/srv/hobbit/server/ext/hbfunc.py"
-LINE11="nobody    ALL = NOPASSWD: /usr/bin/certmaster-ca"
-LINE12="nobody    ALL = NOPASSWD: /sbin/reboot"
-LINE13="nobody    ALL = NOPASSWD: /usr/MythVantage/bin/build_diskless.sh"
-LINE14="nobody    ALL = NOPASSWD: /sbin/sv stop dnsmasq"
-LINE15="nobody    ALL = NOPASSWD: /sbin/sv start dnsmasq"
-LINE16="nobody    ALL = NOPASSWD: /sbin/sv hup  dnsmasq"
-LINE17="mythtv    ALL =(ALL) NOPASSWD: ALL"
-LINE18="nobody    ALL = NOPASSWD: /sbin/sv restart frontend"
-LINE19="nobody    ALL = NOPASSWD: /usr/bin/killall -9 mythfrontend"
-
-for i in "$LINE" "$LINE1" "$LINE2" "$LINE3" "$LINE4" "$LINE5" "$LINE7" "$LINE8" "$LINE9"  "$LINE10" "$LINE11" "$LINE12" "$LINE13" "$LINE14" "$LINE15" "$LINE16" "$LINE17" "$LINE18" "$LINE19"
-do
-        cp /etc/sudoers /etc/sudoers.bak
-        grep -q "$i" /etc/sudoers
-        if [ $? != 0 ]
-        then
-                echo  "$i" >> /etc/sudoers
-                visudo -cf /etc/sudoers
-                if [ ! $? = 0 ]
-                then
-                        cp /etc/sudoers.bak /etc/sudoers
-			echo $i
-                        echo "Error adding files"
-                        exit 1
-                fi
-        fi
-done
-
-REALTIME="session         required        pam_limits.so"
-grep -q "pam_limits.so" /etc/pam.d/su
-        if [ $? != 0 ]
-        then
-		echo "$REALTIME" >>  /etc/pam.d/su
-
-	fi
-
-mkdir -p /data/home/mythtv/capture
-chown mythtv:mythtv /data/home/mythtv/capture
-
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-pre_upgrade() {
-	if [ -e  /etc/cron.daily/backup_cron ]
-	then
-		rm -f  /etc/cron.daily/backup_cron
-	fi
-	if [ -e /etc/cron.daily/xupdate_system_cron ]
-	then
-		rm -f /etc/cron.daily/xupdate_system_cron
-	fi
-
-	if [ -e /etc/cron.daily/myth_mtc.py ]
-	then
-		rm -f /etc/cron.daily/myth_mtc.py
-	fi
-
-
-
-
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-	post_install
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  /bin/true
-}
-
-# arg 1:  the old package version
-post_remove() {
-  /bin/true
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/mv-core/MythVantage-system/STBWINDOWMANAGER b/abs/mv-core/MythVantage-system/STBWINDOWMANAGER
deleted file mode 100644
index e2ac216..0000000
--- a/abs/mv-core/MythVantage-system/STBWINDOWMANAGER
+++ /dev/null
@@ -1,2 +0,0 @@
-#STBWINDOWMANAGER="/usr/bin/evilwm -fn fixed -bw 0"
-STBWINDOWMANAGER="/usr/bin/e16"
diff --git a/abs/mv-core/MythVantage-system/backend_control.sh b/abs/mv-core/MythVantage-system/backend_control.sh
deleted file mode 100755
index 53b973b..0000000
--- a/abs/mv-core/MythVantage-system/backend_control.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-#. /etc/systemconfig
-#echo $@ > /tmp/parms
-#start Slavebackend: fusion 192.168.1.120
-COMMAND=$1
-BETYPE=$2
-eval LAST=\$$#
-dbhost=`echo $LAST`
-
-
-MESSAGE=""
-case $COMMAND in
-	stop)   MESSAGE=`/usr/bin/curl http://$dbhost:1337/bestop.cgi 2>/dev/null`
-		;;
-	
-	start ) 
-		MESSAGE=`/usr/bin/curl http://$dbhost:1337/bestart.cgi 2>/dev/null`
-       		;;
-	
-	restart)
-		/usr/bin/backend_control.sh stop $dbhost
-		sleep 3
-		/usr/bin/backend_control.sh start $dbhost	
-#		/tmp/backend_control.sh start $dbhost	
-		;;
-	clearcache) 
-		MESSAGE2=`/usr/bin/curl http://$dbhost:1337/beclear.cgi 2>/dev/null` 
-esac
-exit 0
-if [ ! "x$MESSAGE" = x ]
-then
-	xsay -t 3 "$MESSAGE"
-fi
-
diff --git a/abs/mv-core/MythVantage-system/backup_job b/abs/mv-core/MythVantage-system/backup_job
deleted file mode 100755
index c3997ab..0000000
--- a/abs/mv-core/MythVantage-system/backup_job
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash
-echo "#########################################################"
-echo "Starting  backup	"
-. /etc/profile
-. /etc/systemconfig
-BACKUPDIR=/data/database_backup
-DATE=`date +%F_%H-%M`
-mkdir -p $BACKUPDIR/$DATE
-
-#backup db
-pacman -Q mysql 2>/dev/null
-if [ $? = 0 ]
-then
-	mysqldump mythconverg > $BACKUPDIR/$DATE/mythconverg
-	mysqldump ncid > $BACKUPDIR/$DATE/ncid
-        mysqldump webcal > $BACKUPDIR/$DATE/webcal
-fi
-
-#backup etc
-cp -rp /etc  $BACKUPDIR/$DATE/etc
-cp -rp /var/lib/oss $BACKUPDIR/$DATE/oss
-
-#backup func keys
-cp -rp /data/srv/func $BACKUPDIR/$DATA/func
-
-#make_zip file
-cd $BACKUPDIR
-tar -zcvf $BACKUPDIR/backup.$DATE.tgz  $DATE
-
-if [ -d $BACKUPDIR/$DATE ]
-then
-	rm -rf $BACKUPDIR/$DATE
-fi
-
-if [ -f /data/srv/hobbit/server/ext/hbnotes.py ]
-then
-	/data/srv/hobbit/server/ext/hbnotes.py
-	chown nobody:nobody /data/srv/httpd/htdocs/hobbit/notes/* 2> /dev/null >/dev/null
-
-
-fi
-
-
-#Remote copy
-if [ x$RemoteBackup = x1 ]
-then
-    localRemoteCheck=`echo $RemoteBackupDir | cut -d: -f1`
-    if [  x$localRemoteCheck =  xdir ]
-    then
-        localRemotedir=`echo $RemoteBackupDir | cut -d: -f2`
-        cmd="cp $BACKUPDIR/backup.$DATE.tgz  $localRemotedir"
-        echo "copying$BACKUPDIR/backup.$DATE.tgz to  $localRemotedir  "
-    else
-#        sshcmd="scp -o StrictHostKeyChecking=no -o ConnectTimeout=1 -i /data/srv/.nobody_ssh/id_dsa $BACKUPDIR/backup.$DATE.tgz"
-#        cmd="${sshcmd}  mythtv@${RemoteBackupDir}:/data/database_backup/"
-	/usr/bin/func  ${RemoteBackupDir} copyfile  -f  $BACKUPDIR/backup.$DATE.tgz  --remotepath $BACKUPDIR/backup.$DATE.tgz
-
-        echo "copying$BACKUPDIR/backup.$DATE.tgz to  ${RemoteBackupDir}:/data/database_backup/"
-    fi
-    $cmd
-fi
-
-echo "#########################################################"
diff --git a/abs/mv-core/MythVantage-system/file_time_offset.py b/abs/mv-core/MythVantage-system/file_time_offset.py
deleted file mode 100755
index f2973d0..0000000
--- a/abs/mv-core/MythVantage-system/file_time_offset.py
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/python
-
-
-import time
-import os
-import glob
-import getopt
-import sys
-def main(argv):
-    filecount=0
-#    root = "/tmp"
-#    offset = 4
-    now = int(time.time())
-
-
-    try:
-        opts, args = getopt.getopt(argv, "hs:d:")
-    except getopt.GetoptError:
-        sys.exit(2)
-    for opt, arg in opts:
-        if opt in ("-h", "--help"):
-                print "-s seconds -d /testdir"
-                print "default if 4 seconds"
-                sys.exit()
-        elif opt in ( "-s" ):
-                offset = int(arg)
-        elif opt in ("-d"):
-                root = arg
-
-    for item in glob.glob(root+"/*"):
-        lastmodDate = os.path.getmtime(item)
-        tdiff= now-lastmodDate
-        #print tdiff, offset
-
-        if tdiff > offset:
-            filecount+=1
-    print filecount
-if __name__ == "__main__":
-    main(sys.argv[1:])
diff --git a/abs/mv-core/MythVantage-system/firstboot.sh b/abs/mv-core/MythVantage-system/firstboot.sh
deleted file mode 100755
index b329f5a..0000000
--- a/abs/mv-core/MythVantage-system/firstboot.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-. ~/.configured
-ATTEMPT=0
-function try_smolt {
-	((ATTEMPT=ATTEMPT+1))
-#	echo $ATTEMPT
-	status=$(echo "jump mythsmolt" | telnet localhost 6546 2>&1)
-	echo $status|grep -q refused
- 	status=$?
-	if [ $status  != 0  ]
-	then
-		fb_status=0
-		echo "FB=NO" > ~/.configured
-	fi
-	if [ $ATTEMPT = 200 ]
-	then
-		fb_status=0
-	fi
-}
-
-if [ ! -e /tmp/debug ]
-then
-	if [ ! -e /tmp/nomfe ]
-	then
-		if [ ! -e ~/.mythtv/pub-uuid ]
-		then
-			if [ x$FB != xNO ]
-			then
-				fb_status=4
-				while [ $fb_status != 0 ]
-				do
-					try_smolt
-					if [ $fb_status != 0  ]
-					then
-						sleep 1
-					fi
-				done
-			fi
-		fi
-	fi
-fi
-
-
-
diff --git a/abs/mv-core/MythVantage-system/grabkey.py b/abs/mv-core/MythVantage-system/grabkey.py
deleted file mode 100755
index 66d630b..0000000
--- a/abs/mv-core/MythVantage-system/grabkey.py
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/usr/bin/python
-#polls the hobbit server for ghost clients.  If it finds ghosts it will make a new bb-hosts file
-#with the new clients.
-#Will not add duplicate clients
-#return code of 0 means a new file was written, anything else is an error or no inserts occured
-import urllib2
-import string
-import sys
-import os
-
-def readkeyfile():
-	global keylist
-	try:
-		infile = open('/data/home/mythtv/.ssh/authorized_keys', 'r')
-	except(IOError), e:
-           keylist=''
-    	else:
-    		keylist = infile.readlines()
-		infile.close()
-
-
-def grabkey(server):
-	global numberlines
-	global mbekey
-	url="http://" + server + ":1337/serverkey.cgi"
-
-	try:
-		f = urllib2.urlopen(url)
-	except urllib2.HTTPError, e:
-		if e.code != 200:
-			print 'error find key'
-			sys.exit(1)
-	else:
-		mbekey = f.readlines()
-		f.close()
-        numberlines = len(mbekey)
-        #print mbekey
-
-
-def makenewkeyfile():
-	global keylist
-	global mbekey
-	global numberlines
-	global numinserts
-	numinserts=0
-	outlist = []
-	for item in keylist:
-		if item not in outlist:
-			outlist.append(item)
-
-	for item in mbekey:
-#		line = item.rstrip()
-		#nline = "%s #" % (line)
-		#nline = nline + '\n'
-		if item not in outlist:
-			outlist.append(item)
-			#print "adding: " + item
-			numinserts = numinserts + 1
-	if numinserts > 0:
-		try:
-			outfile = open("/data/home/mythtv/.ssh/authorized_keys","w")
-		except(IOError), e:
-        		os.system('mkdir -p /data/home/mythtv/.ssh') 
-			outfile = open("/data/home/mythtv/.ssh/authorized_keys","w")
-		for i in outlist:
-			outfile.write(i + '\n' )
-			outfile.close
-			os.system('chown -R mythtv /data/home/mythtv/.ssh')
-			os.system('chmod 700 /data/home/mythtv/.ssh/authorized_keys')
-		
-
-global infile
-global keylist
-global numberlines
-global numinserts
-global mbekey
-numinserts = 0
-readkeyfile()
-
-#print numberlines
-#print mbekey
-
-try:
-	infile = open('/etc/systemconfig', 'r')
-except(IOError), e:
-	sys.exit(1)
-else:
-    		keylist = infile.readlines()
-		infile.close()
-for  item in keylist:
-	if item.startswith("dbhost"):
-		itemlist=item.split("=")
-		server=itemlist[1].strip()
-		server=server.rstrip()
-		server=server.strip('"')
-		server=server.rstrip('"')
-grabkey(server)
-
-
-if numberlines > 0:
-	makenewkeyfile()
-else:
-	print "nothing to add"
-
-
-if numinserts < 1:
-	sys.exit(1)
-else:
-	sys.exit(0)
-
-
diff --git a/abs/mv-core/MythVantage-system/imdb-bulk-update.pl b/abs/mv-core/MythVantage-system/imdb-bulk-update.pl
deleted file mode 100644
index 87a9668..0000000
--- a/abs/mv-core/MythVantage-system/imdb-bulk-update.pl
+++ /dev/null
@@ -1,720 +0,0 @@
-#!/usr/bin/perl
-################################################################################
-# Wrapper for imdb.pl tool for bulk movie metadata updates for mythdora        #
-#                                                                              #
-# 08/28/2007                                                                   #
-# Ryan Pisani <mythdora@thepisanis.com>                                        #
-################################################################################
-#Parts of this were adopted from imdbbatchupdater.pl which in turn uses much   #
-#of the original imdb.pl. This is a simpler wrapper to maintain and it utilizes#
-#the standard imdb.pl shipped with mythvideo.                                  #
-################################################################################
-#version: 1.0 : Initial roll-out works with imdb.pl 1.3                        #
-#version: 1.1 : Added some further error checking                              #
-#version: 1.2 : Added -Manual flag for manual entering of IMDBIDs              #
-#version: 1.3 : Added -fileup metadata update for newly added/removed movies   #
-#version: 1.4 : Duplicate menu will default to first entry in the returned     #
-#               list.                                                          #
-#               Added -Exclude flag to mark any items with non-imdb match with #
-#               a bogus imdb number to be skipped in later searches.           #
-#               Added -help for extended examples in usage                     #
-#version: 1.5 : Added -Folder flag to overide videopath for new video search   #
-#               Fixed hash sort of new files so that entries with more than 1  #
-#               entry in the DB will not be "true" in new check.               #
-#               Fixed a bug in the newvideo find where multiples were added    #
-#               Fixed a bug in the newvideo find where multiples were added    #
-#version:1.5.1: Added showlevel fix in -Fileup to fix incorrect default showlvl# 
-#version: 1.6 : Found bug in -Title lookups where title was updated blank      # 
-################################################################################
-use strict;
-use DBI;
-use Getopt::Long;
-use File::Find;
-use File::Basename;
-use Sys::Hostname;
-
-#Set Global Path For Execution
-$ENV{PATH}="/bin:/usr/sbin:/usr/bin:/sbin";
-
-#Defaults & global declarations here
-my $dbhost = '127.0.0.1';
-my $db = 'mythconverg';
-my $dbuser = 'mythtv';
-my $dbpass = 'mythtv';
-my $imdbnum;  		#imdbnum set from imdb.pl
-my $movie;  		#movie title set from query
-my $intid;  		#incremental id for videometadata table
-my @FAILEDLOOKUP;	#array to store failed lookups
-my $imdb= '/usr/local/share/mythtv/mythvideo/scripts/imdb.pl';
-my $posters; 		#coverart directory
-my $new;		#-N flag
-my $all;		#-A flag
-my $sqlstat;		#used to store sql statments
-my $stitle;		#grabbed from input for title search
-my $dup;		#set if dupskip is on
-my $manual;		#set if manual is on
-my $host = hostname;	#the executing hosts machine name
-my $fileup;		#set if fileup is on
-my $exclude;		#set if exclude is on
-my $currentimdb;	#dbs current imdb number before lookup is set
-my $help;  		#pass to usage if help flag i set for extended
-my $folder; 		#set if -Folder is set to overide DB for Videopath
-my $title;		#Global Title to carry 
-
-
-GetOptions("Posters=s"=>\$posters,
-	   "A"=>\$all,
-	   "N"=>\$new,
-	   "Fileup"=>\$fileup,
-	   "help"=>\$help,
-	   "Exclude"=>\$exclude,
-	   "Manual"=>\$manual,
-	   "Dupskip"=>\$dup,
-	   "Title=s"=>\$stitle,
-	   "Folder=s"=>\$folder,
-           "Host=s"=>\$dbhost,
-           "User=s"=>\$dbuser,
-           "Imdb=s"=>\$imdb,
-           "Password=s"=>\$dbpass);
-
-
-if ( $help eq '1' ) {
-
-	#Show extended usage
-	usage($help);
-
-}
-
-#One quick sanity check here for anyone looking to -A and -Exclude together
-
-if ( $exclude eq '1' && $all eq '1' ) {
-
-print <<STOP;
-
-**********************************Warning***************************************
-
-	-Exclude and -A are not recommended to be used together. If they are 
-        used together you may find yourself seriously pissed off. 
-
-	-Exclude and -A will override any you may have previously entered in 
-        manually because IMDB lookup may have failed. Furthermore the files 
-        will go back to no-data and excluded from future searches.
-
-	It is in your best interest to use -Exclude only with -N
-
-	You have been warned. 
-
-**********************************Warning***************************************
-
-Hit [Enter] to exit, or type 'go' to continue with -Exclude and -A:
-STOP
-
-chomp(my $choice=<STDIN>);
-
-	if ( "$choice" ne "go" ) {
-
-		exit;
-
-	}
-
-}
-
-
-#if the file update flag is set we'll update the db videometadata before continuing
-if ( $fileup eq '1' ) {
-
-        findnewvids($folder);
-
-}
-
-#Now parse sql options in an order that we care about
-if ( $stitle ne "" ) {
-
-	$sqlstat = "select inetref, filename, intid from videometadata where title like \"%$stitle%\"";
-
-}
-
-elsif ( $all eq '1') {
-
-	$sqlstat = "select inetref, filename, intId from videometadata order by title";
-
-}
-
-elsif ( $new eq '1' ) {
-
-	$sqlstat = "select inetref, filename, intId, title from videometadata where inetref=\"00000000\" order by title";
-
-}
-
-else {
-
-	usage();
-
-}	
-
-
-#Check to see if posters have been defined if not grab from db
-if ( $posters eq "" ) {
-
-	$posters=getposter();
-
-}
-
-#Check for the posters directory & perms
-if ( ! -d "$posters" || ! -w "$posters" ) {
-	
-	die "\nError: $posters doesn't exist or is not writable\n\n";
-
-}
-
-
-#Check for imdb.pl script or the one defined
-if ( ! -x "$imdb" ) {
-
-	die "Error: $imdb.pl is not executable\n";
-
-}
-
-
-#print "$sqlstat\n";
-
-#Prepare the sql connection 
-my $dbh = DBI->connect("dbi:mysql:$db:$dbhost","$dbuser","$dbpass");
-
-my $sth = $dbh->prepare($sqlstat);
-
-$sth->execute || die  "SQL statement failed";
-
-while (my @row=$sth->fetchrow_array) {
-
-	#Grab current imdb number in DB
-	chomp($currentimdb = "$row[0]");
-
-	#Grab incremental id in DB for rewrite
-	chomp($intid = "$row[2]");
-
-        lc($movie = `basename "$row[1]"`);
-
-	#Grab file id in DB for search
-	chomp($movie);
-
-	#Grab title data 
-	chomp(my $title= "$row[3]");
-
-	sep();
-
-	#print "current:$currentimdb , intid:$intid, movie: $movie, title: $title\n";
-	#check to see if -Manual flag is set
-	if ( $manual ne '1' ) {
-
-		print "Searching for IMDB movieID for $movie\n";
-		chomp(($imdbnum)=(split /:/, `$imdb -M "$movie"`) [0] ); 
-		
-	}	
-	else {
-
-		print "Enter the IMDB movieID for $movie\n";
-                print "Enter the corresponding imdb number([Enter] to skip):";
-		chomp($imdbnum=<STDIN>);
-	}
-
-	#We'll check the imdb ids here. If they're longer than expected we assume
-	#it to be more than one return
-	if (length($imdbnum) > '8') {
-
-		#Check the multiple entries and skip if flag is set
-		if ($dup ne '1') {
-
-			my @TITLES=`$imdb -M "$movie"`; 
-
-			print "More than one match for $movie exists at IMDB\n";
-	
-			for (my $i=0;$i<=$#TITLES;$i++) {
-
-				print "$i) $TITLES[$i]";
-
-			}
-
-                        print "Select a title ([0] Default, [x] to skip, [m] manual imdb number):";
-			chomp(my $choice=<STDIN>);
-
-			#print "my choice $choice\n";
-			if ($choice eq "") {
-
-				$choice="0";
-				chomp($imdbnum=(split /:/, $TITLES[$choice]) [0]);
-			}
-				
-			elsif ($choice eq "x") {
-
-				$imdbnum="";
-	                	push(@FAILEDLOOKUP, "$movie");
-
-
-			}	
-
-			elsif ($choice =~ /[0-9]/) {
-
-				chomp($imdbnum=(split /:/, $TITLES[$choice]) [0]);
-				#print $imdbnum;
-
-			}
-
-			elsif ($choice eq "m") {
-
-				print "Enter IMDB number: ";
-				chomp($imdbnum=<STDIN>);
-			}
-
-			else { 
-
-				die "Not a valid selection\n";
-
-			}
-		}
-		else {
-
-			$imdbnum="";
-			push(@FAILEDLOOKUP, "$movie");
-		}
-
-	}
-
-	#Else check for failed lookups and -Exclude flag
-	elsif ( "$imdbnum" eq "" && "$exclude" eq "1" && "$currentimdb" eq "00000000" ) {
-		
-		#We set a new bogus one to be ignored in later -N searches
-		$imdbnum="99999999";
-
-		push(@FAILEDLOOKUP, "$movie");
-
-	}
-		
-	
-	#Log the failed lookups here for later
-	elsif ( "$imdbnum" eq "" ) {
-
-		push(@FAILEDLOOKUP, "$movie");
-
-		#print $#FAILEDLOOKUP;
-
-	}
-		
-		
-	
-	#now check for imdbnumber from query
-	if ( "$imdbnum" ne "" ) {
-	
-		my $coverfile;
-		my $year;
-		my $director;
-		my $plot;
-		my $userrating;
-		my $rating;
-		my $time;
-
-		#If bogus is set do this first
-		if ("$imdbnum" eq "99999999") {
-
-			$coverfile="No Cover";
-			$year="1895";
-			$director="Unknown";
-			$plot="Unknown";
-			$userrating="0";
-			$rating="NR";
-			$time="0";
-		}
-
-		else {
-
-			#Now lets fine the cover image
-			#print "Going to use $imdb -P $imdbnum\n";
-			chomp(my $cover=`$imdb -P "$imdbnum"`);
-			#print "$cover";
-
-			if ($cover =~ /jpg/) {
-
-				$coverfile="$posters/$imdbnum.jpg";
-				print "Retrieving $cover\n";
-				system("wget $cover -O $coverfile >/dev/null 2>&1");
-				
-			}	
-			else {
-
-	        		$coverfile="No Cover";	
-
-			}
-
-	
-			#Now get the rest of the imdb data
-			undef my @TEMPDATA;
-			@TEMPDATA=`$imdb -D $imdbnum`;
-			chomp(($title)=(split /Title:/, $TEMPDATA[0])[1]);
-			$title=~s/"//g;
-			chomp(($year)=(split /Year:/, $TEMPDATA[1])[1]);
-			chomp(($director)=(split /Director:/, $TEMPDATA[2])[1]);
-			chomp(($plot)=(split /Plot:/, $TEMPDATA[3])[1]);
-			$plot=~s/"//g;
-			chomp(($userrating)=(split /UserRating:/, $TEMPDATA[4])[1]);
-			chomp(($rating)=(split /MovieRating:/, $TEMPDATA[5])[1]);
-			chomp(($time)=(split /Runtime:/, $TEMPDATA[6])[1]);
-
-			#print $#TEMPDATA;
-			#print "$title\n $year\n $director\n $plot\n $userrating\n $rating\n $time\n";
-		}
-
-	
-
-		#Now let's write that data into the db
-		print "Updating videometadata with new information\n";
-		my $sqlstat="update videometadata set title=\"$title\", year=\"$year\", director=\"$director\", plot=\"$plot\", userrating=\"$userrating\", coverfile=\"$coverfile\", rating=\"$rating\", length=\"$time\", inetref=\"$imdbnum\" where intid=\"$intid\"";	
-
-
-		my $sth = $dbh->prepare($sqlstat);
-
-		$sth->execute || die  "SQL statement failed\n";
-
-	
-	}	
-	
-}
-
-if ( $#FAILEDLOOKUP >= 0 ) {
-
-print "\n\nThe following videos had imdb lookup errors:\n @FAILEDLOOKUP\n";
-
-}
-
-
-sub usage {
-
-	my $help=$_[0];
-	my $comm=basename($0);
-
-print <<STOP;
-
-usage: $comm -[Required] -[Optional] -[Host] parameters
-
-   Required parameters:
-     -A Get IMDB data for ALL movies in database
-     -N Get IMDB data for movies with no IMDBID in database
-     -Title Get IMDB data for movie(s) matching a quoted pattern
-
-   Optional parameters:
-     -Exclude Mark entries with no result with imdb placeholder (DEFAULT: OFF)
-     -Fileup Search for new/removed videos and update database (DEFAULT: OFF)
-     -Manual Query for manual IMDB number for each title (DEFAULT: OFF)
-     -Dupskip Ignore the videos that find multiple imdb results (DEFAULT: OFF)
-
-    Host parameters:
-     -Host Specify a database host (DEFAULT:$dbhost)
-     -User Specify a database user (DEFAULT:$dbuser)
-     -Password Specify a database password (DEFAULT:$dbpass)
-     -Imdb Specify path to a working imdb.pl (DEFAULT:$imdb)
-     -Posters Specify a cover art directory if different from entry in DB
-     -Folder Specify a video folder to search if differs from entry in DB
-   
-   Example:
-     $comm -N -Host myhostname -User mythuser -Password mythpass 
-
-   Use $comm -help for extended examples
-STOP
-
-if ( $help eq '1' ) {
-print <<STOP;
-
-   New file check with IMDB lookup and non-local DB:
-     $comm -N -Fileup -Host 192.168.1.50
-  
-   New file check with IMDB lookup and future exclusion for non-match:
-     $comm -N -Fileup -Exclude 
-
-   New file check, IMDB lookup for ALL movies, skipping multiple IMDB returns:
-     $comm -A -Fileup -Dupskip
-   
-   Title search with Manual IMDB entry
-     $comm -Title "Austin Powers" -Manual
-STOP
-}
-exit;
-}
-
-
-#Get Posters directory from host if possible out of settings
-sub getposter {
-
-	my $sqlstat="select data from settings where hostname=\'$host\' and value=\'VideoArtworkDir\'";
-
-	my $dbh = DBI->connect("dbi:mysql:$db:$dbhost","$dbuser","$dbpass") || die  usage();
-
-	my $sth = $dbh->prepare($sqlstat); 
-
-	$sth->execute || die  "SQL statement failed";
-
-	chomp(my $posters=$sth->fetchrow_array);
-
-	return($posters);
-
-}
-
-#Routine to locate new & removed videos and update videometadata accordingly
-sub findnewvids {
-
-	my $folder=$_[0]; 
-	my $videopath;
-
-        sep();
-
-
-	if ( $folder eq "" ) {
-
-        print "Retrieving Video Path for this $host from $db.settings\n";
-
-        #First get video directory path from settings database for exectuting host
-        my $sqlstat="select data from settings where hostname=\'$host\' and value=\'VideoStartupDir\'";
-
-        my $dbh = DBI->connect("dbi:mysql:$db:$dbhost","$dbuser","$dbpass");
-
-        my $sth = $dbh->prepare($sqlstat);
-
-        $sth->execute || die  "SQL statement failed";
-
-        chomp($videopath=$sth->fetchrow_array);
-
-	}
-	else {
-		print "Setting Video Path with manual override to $folder\n";
-		chomp($videopath="$folder");
-
-	}
-        sep(1);
-
-        #Now let's get the ignored file types so that we can truly ignore any overrides
-        print "Retrieving ignored files extensions from $db.videometadata\n";
-
-        $sqlstat = "select extension from videotypes where f_ignore=\"1\" order by extension";
-
-        my $dbh = DBI->connect("dbi:mysql:$db:$dbhost","$dbuser","$dbpass");
-
-        my $sth = $dbh->prepare($sqlstat);
-
-        $sth->execute || die  "SQL statement failed";
-
-        my @ITYPES;
-        #put the ignored extensions found in the DB into an array
-        while (my @row=$sth->fetchrow_array) {
-
-                        push(@ITYPES,"@row");
-
-        }
-
-        sep(1);
-        #Now look at allowed extensions and create an array to use when finding files
-        #We'll append these to a list of pre-defined ones below
-
-        print "Retrieving allowable file extensions from $db.videometadata\n";
-
-        $sqlstat = "select extension from videotypes where f_ignore=\"0\" order by extension";
-
-        my $dbh = DBI->connect("dbi:mysql:$db:$dbhost","$dbuser","$dbpass");
-
-        my $sth = $dbh->prepare($sqlstat);
-
-        $sth->execute || die  "SQL statement failed";
-
-
-        #Array of commonly allowed video extensions
-        my @TYPES=(".wmv",".avi",".vob",".iso",".bin",".mpeg",".mpg",".mp4",".mov");
-
-        #put the extensions found in the DB into an array
-        while (my @row=$sth->fetchrow_array) {
-
-                if ( "@TYPES" !~ /@row/ ) {
-
-                        push(@TYPES,".@row");
-
-                }
-
-
-        }
-
-        my @FTYPES;
-
-        #Pull any ignored extensions out of final file type search string
-        foreach (@TYPES) {
-
-                if ( "@ITYPES" !~ /$_/ ) {
-
-                        push(@FTYPES,"($_)\\Z|");
-
-                }
-
-
-        }
-
-        my $types=join"",@FTYPES;
-
-        #Take the last | off of the search string
-        chop($types);
-
-        sep(1);
-
-        #Search for all files that match our allow file extension patterns as defined in $types
-        my @FILES;
-        find (sub{
-
-                my $file=$File::Find::name ;
-                if ( $file =~ /$types/i) {
-                        push(@FILES,"$file");
-                        #print "$file\n";
-                }
-
-        }, "$videopath");
-
-        @FILES=sort(@FILES);
-	
-	my $totalfiles="$#FILES" + 1;
-	
-	if ($totalfiles gt '1') {
-
-        	print "Found $totalfiles total videos in $videopath\n";
-        	sep(1);
-
-	}
-	else {
-
-		die "No video files were found in $videopath\n";
-	
-
-	}
-
-        #Now lets see what's in videometadata
-        print "Retrieving a list of known videos from $db.videometadata\n";
-
-        sep(1);
-
-        $sqlstat = "select filename from videometadata where filename like \"%$videopath%\" order by filename";
-
-        my $dbh = DBI->connect("dbi:mysql:$db:$dbhost","$dbuser","$dbpass");
-
-        my $sth = $dbh->prepare($sqlstat);
-
-        $sth->execute || die  "SQL statement failed";
-
-        #put those extensions found in the DB into an array
-
-        my @LISTINDB;
-        while (my @row=$sth->fetchrow_array) {
-
-                push(@LISTINDB,"@row");
-
-        }
-
-        print "Scrubbing the database for any videos that no longer exist in $videopath\n";
-
-        my @FILESINDB;  #Database entries with an actual file associated
-        #Now scrub database entries for any files that are no longer present
-        foreach (@LISTINDB) {
-
-                if (! -e "$_") {
-
-                      print "\nRemoving entry for $_ from database\n";
-
-                      $sqlstat = "delete from videometadata where filename=\"$_\"";
-
-                      my $dbh = DBI->connect("dbi:mysql:$db:$dbhost","$dbuser","$dbpass");
-
-                      my $sth = $dbh->prepare($sqlstat);
-
-                      $sth->execute || die  "SQL statement failed";
-
-                }
-                else {
-
-                        #Add to new scrubbed list
-                        push(@FILESINDB, "$_");
-
-                }
-
-
-
-        }
-
-        sep();
-
-
-        my %count =();
-
-        my @FILESDIFF;
-        #Now well check to see what files differ between DB entries the Data
-        foreach my $element (@FILESINDB, @FILES) {
-
-                $count{$element}++;
-
-        }
-        foreach my $element (keys %count) {
-
-                if ( $count{$element} < 2 ) {
-
-                        push(@FILESDIFF, $element);
-			print "$element\n";
-
-                }
-        }
-
-        #Now we tell the user how many updates to be made
-	my $totaldiff="$#FILESDIFF" + 1;
-
-	if ($totaldiff gt '0') {
-
-        	print "Found a total of $totaldiff to be added to database\n";
-        	sep (1);
-	
-	}
-	else {
-
-		print "Found no new videos to be added to database\n";
-
-	}
-
-        #Now we need to grab just a title and populate the db with
-        foreach (@FILESDIFF) {
-
-                my $title=basename($_,@TYPES);
-
-                print "\nAdding entry for $_ to $db.videometadata\n";
-
-                $sqlstat = "insert into videometadata (title,director,rating,inetref,coverfile,filename,showlevel) values(\"$title\",\"Unknown\",\"NR\",\"00000000\",\"No Cover\",\"$_\",\"1\");";
-
-                my $dbh = DBI->connect("dbi:mysql:$db:$dbhost","$dbuser","$dbpass");
-
-                my $sth = $dbh->prepare($sqlstat);
-
-                $sth->execute || die  "SQL statement failed";
-
-        }
-
-        #print "@FILESDIFF\n";
-
-
-
-}
-
-
-
-
-#Prints a easy on the eye separator
-sub sep {
-
-	if (defined $_[0]) {	
-
-		print "=============================================================================\n";
-		sleep $_[0];
-	}
-	else {
-
-		print "=============================================================================\n";
-
-	}
-
-}
diff --git a/abs/mv-core/MythVantage-system/initial_db_run b/abs/mv-core/MythVantage-system/initial_db_run
deleted file mode 100644
index edc3784..0000000
--- a/abs/mv-core/MythVantage-system/initial_db_run
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-. /etc/profile
-. /etc/systemconfig
-rundb=1
-
-if [ -f /var/log/mfdb.first.log ]
-then
-    #check exit code
-    rundb=`tail -1 /var/log/mfdb.first.log`
-fi
-
-if [ ! $rundb = 0 ]
-then
-    echo "Running 1st mythfilldatabase"
-    echo "Do not remove this file.  This file is used to determine if mythfilldatabase needs to run before starting mythbackend" >  /var/log/mfdb.first.log
-
-
-    /usr/bin/mythfilldatabase 2>&1 >> /var/log/mfdb.first.log
-
-    echo $? >> /var/log/mfdb.first.log
-fi
-
-
-
diff --git a/abs/mv-core/MythVantage-system/inittab b/abs/mv-core/MythVantage-system/inittab
deleted file mode 100644
index caa0542..0000000
--- a/abs/mv-core/MythVantage-system/inittab
+++ /dev/null
@@ -1,34 +0,0 @@
-#
-# /etc/inittab
-#
-
-#  Runlevels:
-#    0    Halt
-#    1(S)	Single-user
-#    2    Not used
-#    3    Multi-user
-#    4    Not used
-#    5    X11
-#    6    Reboot
-
-id:3:initdefault:
-
-rc::sysinit:/etc/rc.sysinit
-rs:S1:wait:/etc/rc.single
-rm:2345:wait:/etc/rc.multi
-rh:06:wait:/etc/rc.shutdown
-su:S:wait:/sbin/sulogin -p
-
-c1:2345:respawn:/sbin/agetty 38400 vc/1 linux
-c2:2345:respawn:/sbin/agetty 38400 vc/2 linux
-c3:2345:respawn:/sbin/agetty 38400 vc/3 linux
-c4:2345:respawn:/sbin/agetty 38400 vc/4 linux
-c5:2345:respawn:/sbin/agetty 38400 vc/5 linux
-c6:2345:respawn:/sbin/agetty 38400 vc/6 linux
-
-ca::ctrlaltdel:/sbin/shutdown -t3 -r now
-
-x:5:respawn:/usr/bin/xdm -nodaemon
-
-SV:345:respawn:/usr/bin/svscan /service
-# End of file
diff --git a/abs/mv-core/MythVantage-system/load-modules-mythvantage.sh b/abs/mv-core/MythVantage-system/load-modules-mythvantage.sh
deleted file mode 100755
index 8382a29..0000000
--- a/abs/mv-core/MythVantage-system/load-modules-mythvantage.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-#/usr/bin/load-modules-mythvantage.sh  UNLOAD LCD
-. /etc/systemconfig
-
-case $1 in
-UNLOAD|unload )
-            MODULELIST=`grep /etc/modules.mythvantage $2`
-            for i in $MODULELIST
-            do
-                /sbin/rmmod $i
-            done
-
-            ;;
-
-   *)   echo "- Loading MythVantage-modules"
-        #try to load the cx88 modules
-        if [ ! x$SystemType = xFrontend_only ]
-        then
-        	/sbin/modprobe cx88-dvb 2>/dev/null
-        fi
-
-        if [ -f /etc/modules.mythvantage ]
-        then
-	       while read line
-	       do
-                module=`echo $line |cut -d# -f1`
-	           /sbin/modprobe $module
-
-	       done < /etc/modules.mythvantage
-        fi
-esac
-
diff --git a/abs/mv-core/MythVantage-system/mbegdbcommands.txt b/abs/mv-core/MythVantage-system/mbegdbcommands.txt
deleted file mode 100644
index dda675b..0000000
--- a/abs/mv-core/MythVantage-system/mbegdbcommands.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-handle SIGPIPE nostop noprint
-handle SIG33 nostop noprint
-set logging on
-set pagination off
-set args  -v most
-run
-thread apply all bt full
-set logging off
diff --git a/abs/mv-core/MythVantage-system/mfegdbcommands.txt b/abs/mv-core/MythVantage-system/mfegdbcommands.txt
deleted file mode 100644
index cf59068..0000000
--- a/abs/mv-core/MythVantage-system/mfegdbcommands.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-handle SIGPIPE nostop noprint
-handle SIG33 nostop noprint
-set logging on
-set pagination off
-set args -d  -v most
-run
-thread apply all bt full
-set logging off
\ No newline at end of file
diff --git a/abs/mv-core/MythVantage-system/myth_mtc.py b/abs/mv-core/MythVantage-system/myth_mtc.py
deleted file mode 100755
index faeee84..0000000
--- a/abs/mv-core/MythVantage-system/myth_mtc.py
+++ /dev/null
@@ -1,139 +0,0 @@
-#!/usr/bin/python
-
-
-import sys,popen2
-import optparse
-import re
-import socket
-import os
-import datetime,time
-
-
-
-try:
-    from MythTV import MythTV
-    mythtv = MythTV()
-except:
-    mythtv = None
-
-#print mythtv.db.getSetting( 'Theme', socket.gethostname())
-
-def optimize():
-    cursor = mythtv.db.cursor()
-    cursor.execute("SHOW tables")
-    result = cursor.fetchall()
-    ops=["REPAIR","OPTIMIZE","ANALYZE"]
-    for row in result:
-        ctable=row[0]
-        for op in ops:
-            print op,ctable
-            cmd= "%s  table %s" %(op,ctable)
-            cursor.execute(cmd)
-
-
-def upcoming_check():
-    upcoming = mythtv.getUpcomingRecordings()
-    try:
-        show=str(upcoming[0])
-        show=show.strip()
-        showtime=show.partition("(")[2].strip(")")
-        now=time.time()
-        rec_time=time.strptime( showtime ,"%Y-%m-%d %H:%M:%S" )
-        r=time.mktime(rec_time)
-        time_diff= ( r - now ) / 60
-    except:
-        time_diff=100
-        show="No show"
-    if ( time_diff  >  30) :
-        return True
-    else:
-        print show , "is upcoming in " , time_diff
-        return False
-
-
-def schemalock_check():
-    c = mythtv.db.cursor()
-    c.execute("select count(*) from schemalock")
-    results=c.fetchone()
-    schemalock=results[0]
-    if schemalock == 0:
-        return True
-    else:
-        print "schema is locked"
-        return False
-
-def job_check():
-    c = mythtv.db.cursor()
-    c.execute("select count(*) from jobqueue where status = 4")
-    results=c.fetchone()
-    jobs= results[0]
-    if jobs == 0 :
-        return True
-    else:
-        print " jobs are running"
-        return False
-
-
-def in_use():
-    c = mythtv.db.cursor()
-    c.execute("select count(*) from inuseprograms")
-    results=c.fetchone()
-    prginuse=results[0]
-    if prginuse == 0 :
-        return True
-    else:
-        print "programs in use"
-        return False
-
-def mfd_check():
-    ismfd=popen2.Popen3('/bin/ps cax|/bin/grep -v grep |/bin/grep mythfilldatabase')
-    ismfd.wait()
-    mfdIdle=ismfd.poll()
-    if mfdIdle == 0:
-        print "mythfilldatabase is running"
-        return False
-    else:
-        return True
-
-
-
-def idle_check():
-    if  (   upcoming_check() and schemalock_check() and job_check()  and in_use() and  mfd_check()  ):
-        idle=True
-        print "Myth is idle"
-    else:
-        idle=False
-        print "Myth is NOT idle"
-    return idle
-
-def run_stuff():
-    if idle_check():
-	print "Running optimize"
-        optimize()
-
-	print "Running backup"
-        os.system('/usr/MythVantage/bin/backup_job')
-
-	print "Running system_update"
-        os.system('/usr/MythVantage/bin/update_system')
-        continue_loop=False
-    else:
-        continue_loop=True
-    return continue_loop
-
-#---------------------------------
-starttime=time.time()
-ctin=True
-while ctin:
-    ctin=run_stuff()
-    if  ctin:
-        time.sleep(600)
-    current_time=time.time()
-    if (current_time - starttime) > 10800 :
-        ctin = False
-        print "time exceeded (3 hours)"
-        exit(1)
-
-
-
-
diff --git a/abs/mv-core/MythVantage-system/myth_mtc.sh b/abs/mv-core/MythVantage-system/myth_mtc.sh
deleted file mode 100755
index fc81254..0000000
--- a/abs/mv-core/MythVantage-system/myth_mtc.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-. /etc/profile
-date=`date +%Y-%m-%d`
-myth_mtc.py > /var/log/$date/myth_mtc.log
-if [ $? = 0 ]
-then
-    echo "Finished" >> /var/log/$date/myth_mtc.log
-else
-    echo "Time Exceede" >> /var/log/$date/myth_mtc.log
-fi
-
-
diff --git a/abs/mv-core/MythVantage-system/notify.py b/abs/mv-core/MythVantage-system/notify.py
deleted file mode 100755
index 2e520c5..0000000
--- a/abs/mv-core/MythVantage-system/notify.py
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/python
-# import MySQL module
-
-import MySQLdb
-import sys
-import getopt
-import socket
-import os
-
-def main(argv):
-    db = MySQLdb.connect(host="localhost", user="mythtv", passwd="mythtv", db="mythconverg")
-    # create a cursor
-    cursor = db.cursor()
-    # execute SQL statement
-    cursor.execute("SELECT DISTINCT(hostname) from settings where not hostname is NULL")
-    result = cursor.fetchall()
-    message = sys.argv[2]
-    messagetype = sys.argv[1]
-    port=str(5000)
-    if messagetype == "PH2":
-	    port=str(5001)
-	    
-    
-    message = message + " :::" + messagetype
-    for row in result:
-    	os.system("/usr/bin/osdClient.pl  " + row[0] + "  " +  port   + "   "+  "\"" +  message + "\""  + "&" )
-
-if __name__ == "__main__":
-    main(sys.argv[1:])
diff --git a/abs/mv-core/MythVantage-system/optimize_mythdb.py b/abs/mv-core/MythVantage-system/optimize_mythdb.py
deleted file mode 100755
index e7b35ed..0000000
--- a/abs/mv-core/MythVantage-system/optimize_mythdb.py
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/python
-# import MySQL module
-import MySQLdb
-import socket
-import sys
-db = MySQLdb.connect(host="localhost", user="mythtv", passwd="mythtv", db="mythconverg")
-cursor = db.cursor()
-cursor.execute("SHOW tables")
-result = cursor.fetchall()
-ops=["REPAIR","OPTIMIZE","ANALYZE"]
-for row in result:
-    ctable=row[0]
-    for op in ops:
-        print op,ctable
-        cmd= "%s  table %s" %(op,ctable)
-        cursor.execute(cmd)
diff --git a/abs/mv-core/MythVantage-system/playmedia.sh b/abs/mv-core/MythVantage-system/playmedia.sh
deleted file mode 100755
index 0b62655..0000000
--- a/abs/mv-core/MythVantage-system/playmedia.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-DVD="xine --no-logo -B --no-splash --auto-play=pfhqd --post tvtime:method=Greedy2Frame,enable=1"
-#DVD="mplayer"
-#DVD="pdvd"
-
-VCD="xine"
-#VCD="mplayer"
-#VCD="pdvd"
-
-VIDEO="xine --no-logo -B --no-splash --auto-play=pfhq --post tvtime:method=Greedy2Frame,enable=1"
-#VIDEO="mplayer"
-CD="xmms /media/removeable"
-
-TYPE=$1
-shift
-
-UNMOUNT=0
-case $TYPE in
-	dvd|DVD )
-		PLAYCMD="$DVD"
-		;;
-	vcd|VCD )
-		PLAYCMD="$VCD"
-		;;
-       video|VIDEO )
-		PLAYCMD="$VIDEO"
-		 EXT=isoa
-		if [ $EXT = "iso" ]
-		 then
-		     echo "mount logic"
-                     UNMOUNT=1
-		fi
-    		;;
-	CD|cd )
-		PLAYCMD="$CD"
-	;;
-
-        * ) echo "not a valid type"
-	      exit 1
-
-		;;
-esac
-
-
-
-$PLAYCMD "$@"
-
-if [ $UNMOUNT  -eq 1 ]
-then
-	echo "umount logic here"
-fi
-
diff --git a/abs/mv-core/MythVantage-system/repo_sync.sh b/abs/mv-core/MythVantage-system/repo_sync.sh
deleted file mode 100755
index e36d055..0000000
--- a/abs/mv-core/MythVantage-system/repo_sync.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-echo "##################################################################################"
-echo "Starting sync"
-. /etc/profile
-. /etc/systemconfig
-if [ x$PKG_MIRROR = x"1" ]
-then
-$RSYNC jmeyer.us::current-STB /data/var/mirror/current-STB
-
-fi	
-echo "##################################################################################"
diff --git a/abs/mv-core/MythVantage-system/restartfrontend.sh b/abs/mv-core/MythVantage-system/restartfrontend.sh
deleted file mode 100755
index 5919974..0000000
--- a/abs/mv-core/MythVantage-system/restartfrontend.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-echo "Restarting Frontend" | osd_cat -f  -*-*-*-*-*-*-25-*-*-*-*-*-*-* -A center - p bottom  &
-killall -9 mythfrontend
-killall -9 mythfrontend
diff --git a/abs/mv-core/MythVantage-system/restore_job.sh b/abs/mv-core/MythVantage-system/restore_job.sh
deleted file mode 100755
index 0d0bec7..0000000
--- a/abs/mv-core/MythVantage-system/restore_job.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-backupfile=$1
-. /etc/profile
-BACKUPDIR=/data/database_backup
-RESTOREDIR=$BACKUPDIR/restore
-DIR=`echo $backupfile |cut -d. -f2`
-CSQL="create database mythconverg;"
-DSQL="drop database mythconverg; "
-MYSQL="mysql  -u mythtv -pmythtv"
-
-
-
-mkdir $RESTOREDIR
-cp $BACKUPDIR/$backupfile $RESTOREDIR
-cd $RESTOREDIR && tar -xvf  $backupfile && cd $DIR
-
-if [ -f mythconverg ]
-then
-    #drop the db
-    $MYSQL -e "$DSQL"
-    #create the db
-    $MYSQL  -e "$CSQL"
-    #restore the database_backup
-    echo "Restoring the database  $DIR"
-    $MYSQL  mythconverg < mythconverg
-    if [ $? = 0 ]
-    then
-        echo "Done"
-    else
-        echo "An error occured"
-    fi
- else
-    echo "couldn't file a file to restore"
-fi
-
-
-#cleanup
-rm -rf $RESTOREDIR/$DIR
-rm -f $RESTOREDIR/$backupfile
\ No newline at end of file
diff --git a/abs/mv-core/MythVantage-system/saytime.sh b/abs/mv-core/MythVantage-system/saytime.sh
deleted file mode 100755
index 39e3599..0000000
--- a/abs/mv-core/MythVantage-system/saytime.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-cd /opt/saytime
-if  [ ! -e /tmp/timelock ]
-then
-        touch /tmp/timelock
-        ps -ef | grep osd_clock
-        if [ $? = 0 ]
-        then
-                killall -9 osd_clock
-        fi
-
-        date +%r |osd_cat -c green  -f -adobe-courier-*-*-*-*-*-*-*-*-*-150-*-*  &
-        rm /tmp/timelock
-fi
diff --git a/abs/mv-core/MythVantage-system/smolt.cron b/abs/mv-core/MythVantage-system/smolt.cron
deleted file mode 100644
index e0ba37c..0000000
--- a/abs/mv-core/MythVantage-system/smolt.cron
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-. /etc/profile
-if  [ -f  /data/home/mythtv/.mythtv/hw-uuid ] 
-then
-	cd /usr/local/share/mythtv/mythsmolt/scripts
-	touch /var/log/smolt.update
-	chown mythtv /var/log/smolt.update
-	random=$((RANDOM%2000))
-	sleep $random
-	su mythtv -c "./sendProfile.py -a" > /var/log/smolt.update
-fi
diff --git a/abs/mv-core/MythVantage-system/startfrontend b/abs/mv-core/MythVantage-system/startfrontend
deleted file mode 100755
index 3e994aa..0000000
--- a/abs/mv-core/MythVantage-system/startfrontend
+++ /dev/null
@@ -1,147 +0,0 @@
-#!/bin/sh
-. /etc/profile
-. /etc/systemconfig
-. /etc/X11/STBWINDOWMANAGER
-
-xhost +local:
-xhost +127.0.0.1
-xset -dpms s off
-export MALLOC_CHECK_=0
-#killall -q -9 xsay &
-#rm -rf /tmp/xsay* &
-
-function lirc_check {
-    lcmd=`irsend LIST   ""    ""   2>&1 `
-    status=$?
-    if [ $status = 0 ]
-    then
-        rc=0
-    else
-        echo $lcmd |grep -q  "Connection refused"
-        status=$?
-        if [ $status = 0 ]
-        then
-            echo "lirc_check: lircd is not running"
-        else
-            echo " lirc_check: lircd is running but no receiver found"
-        fi
-        rc=1
-    fi
-    return $rc
-}
-
-
-
-
-$STBWINDOWMANAGER &
-keylaunch &
-/usr/bin/tilda &
-/usr/X11R6/bin/unclutter -root -idle 0 -jitter 400 -noevents  &
-/usr/bin/xvattr -a XV_COLORKEY -v 0
-/usr/bin/mtd &
-/usr/bin/nvidia-settings -l
-/usr/bin/nvidia-settings -a InitialPixmapPlacement=2
-
-
-#if [ x$ncidclient = "x1" ]
-#then
-#	ncid --no-gui &
-#fi
-
-if [ -f /opt/vmware/bin32/vmware-user-wrapper ]
-then
-	/opt/vmware/bin32/vmware-user-wrapper &
-fi
-
-if [ x$ShowTips = "x1" ]
-then
-#   xsay -t 10 "Alt+h list shortcuts"
-bash -c "sleep 6;osdClient.pl localhost 5000 'ALT+h for shortcuts:::SYS' "&
-
-fi
-
-
-#wait for lirc
-if [ x$HostLircWait  = x1 ]
-then
-    lcheck=5
-    lirc_check
-    status=$?
-
-    while [[ ! $status  =  0  && !  $lcheck = 0 ]]
-    do
-        bash -c "osdClient.pl localhost 5000 'Waiting on remote - $lcheck:::SYS' "&
-        sudo sv restart lircd ; echo "restart lircd"
-        sleep .5
-        lirc_check
-        status=$?
-        lcheck=$((lcheck -  1))
-    done
-
-
-fi
-
-
-
-
-
-if [ !  $SystemType = "Frontend_only" ]
-then
-  if [ ! -f ~/.configured ]
-	then
- 	autocard.py -g &
-	MythVantage -b
-	#0 yes
-	#1 yes/autodetech
-	#2  no
-	STATUS=$?
-	if [ ! $STATUS = 2 ]
-	then
-		/usr/bin/backend_control.sh stop BE 127.0.0.1
-		/usr/bin/mythtv-setup
-		/usr/bin/backend_control.sh start BE 127.0.0.1
-	fi
-        touch  ~/.configured
-	fi
-else
-	#touch file for FE only(mythsmolt)
-	touch  ~/.configured
-fi
-
-
-if [ x"$UseMythWelcome" = "x1" ]
-then
-	STARTCMD="/usr/bin/mythwelcome"
-else
-	STARTCMD="/usr/bin/mythfrontend -d"
-fi
-
-echo "====================================================================="
-echo "Starting $STARTCMD"
-#spawn fb to start mythsmolt
-firstboot.sh &
-
-while [ x = x ]
-do
-	if [ -f /tmp/nomfe ]
-	then
-		sleep 120
-	else
-		if [ -f /tmp/debug ]
-		then
-
-			echo "using gbd/debug"
-			gdb /usr/bin/mythfrontend -x $MV_ROOT/mfegdbcommands.txt
-			bash -c "osdClient.pl localhost 5000 'Restart: mdb.txt.mythfrontend:::SYS' "&
-			mv gdb.txt gdb.txt.mythfrontend
-			sleep 10
-
-		else
-			killall -9 irexec
-			/usr/bin/irexec &
-			$STARTCMD 2>&1
-		fi
-	fi
-echo "_______________________________________________________"
-done
-
diff --git a/abs/mv-core/MythVantage-system/update_system b/abs/mv-core/MythVantage-system/update_system
deleted file mode 100755
index ab79d7c..0000000
--- a/abs/mv-core/MythVantage-system/update_system
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-
-echo "##################################################################################"
-echo "Starting update"
-. /etc/profile
-
-if  [ x$1 = x ]
-then
-    . /etc/systemconfig
-else
-Hostupdateplan=$1
-fi
-
-
-case $Hostupdateplan in
-	"Myth_only")
-		echo "updating myth packages"
-		postfix=`cat $INSTALL_DIR/usr/local/share/mythtv/.releasetype`
-		for mythl in mythphone mytharchive mythbrowser mythnews mythgame mythflix mythweather mythcontrols mythgallery mythmovietime mythmusic mythsmolt mythvideo mythweb mythtv
-		do
-			mythlist="$mythlist $mythl$postfix"
-		done
-
-		pacman -Sy
-        	list=`pacman -Qu $pkg |grep Targets`
-        	for pkg in MythVantage-system MythVantage-config $mythlist
-        	do
-	            echo $list|grep -q  $pkg
-            		if  [ $? = 0 ]
-            		then
-                		echo "Updating  $pkg"
-                		pacman --noconfirm -S $pkg
-            		else
-                		echo  "$pkg is up to date"
-                	fi
-	        done
-	;;
-	"All")
-		echo "updating ALL packages"
-		pacman -Sy
-		pacman --noconfirm -Sfu
-	;;
-	"None")
-		echo "updating NO packages"
-		;;
-    *)
-        echo "unkown plan $Hostupdateplan"
-        ;;
-esac
-
-
-echo "##################################################################################"
diff --git a/abs/mv-core/MythVantage-system/update_system_all b/abs/mv-core/MythVantage-system/update_system_all
deleted file mode 100755
index 26205bd..0000000
--- a/abs/mv-core/MythVantage-system/update_system_all
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-results=`cat /data/srv/hobbit/server/etc/bb-hosts|grep -v ^#|awk '{print $2}' `
-#echo $results
-for i in $results
-do		
-		echo "$i"
-		echo "-------------------------------------------"
-		sudo /usr/bin/func $i call pacman update_system $1		
-	        ssh -o StrictHostKeyChecking=no -i /data/srv/.nobody_ssh/id_dsa mythtv@$i "sudo /usr/bin/update_system $1"
-done
diff --git a/abs/mv-core/MythVantage-system/wmaker b/abs/mv-core/MythVantage-system/wmaker
deleted file mode 100644
index c66f5b6..0000000
--- a/abs/mv-core/MythVantage-system/wmaker
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/local/bin/onscreend &
-/usr/bin/wmaker
diff --git a/abs/mv-core/certmaster/PKGBUILD b/abs/mv-core/certmaster/PKGBUILD
deleted file mode 100644
index 4b4bf69..0000000
--- a/abs/mv-core/certmaster/PKGBUILD
+++ /dev/null
@@ -1,29 +0,0 @@
-pkgname=certmaster
-pkgver=0.25
-pkgrel=2
-pkgdesc="certmaster"
-url=""
-license="gpl"
-depends=(pyopenssl)
-makedepends=()
-conflicts=()
-replaces=()
-moddir="pkg/usr/lib/python2.5/site-packages/func/minion/modules/"
-backup=('etc/certmaster/certmaster.conf' 'etc/certmaster/minion.conf')
-
-install=certmaster.install
-source=($pkgname-$pkgver.tar.gz certmaster.conf minion.conf)
-md5sums=()
-arch=('i686')
-
-build() {
-	cd $startdir/src/$pkgname-${pkgver}
-	python setup.py build
-	python setup.py install --prefix=$startdir/pkg/usr
-	cd $startdir/src
-	install -m755 -D minion.conf $startdir/pkg/etc/certmaster/minion.conf
-	install -m755 -D certmaster.conf $startdir/pkg/etc/certmaster/certmaster.conf
-	mkdir -p  $startdir/pkg/var/log/certmaster
-    cd $startdir/pkg
-   find ./ -name "*.pyc" -print | xargs rm -f
-}
diff --git a/abs/mv-core/certmaster/certmaster-0.24.tar.gz b/abs/mv-core/certmaster/certmaster-0.24.tar.gz
deleted file mode 100644
index 3cd0667..0000000
--- a/abs/mv-core/certmaster/certmaster-0.24.tar.gz
+++ /dev/null
diff --git a/abs/mv-core/certmaster/certmaster-0.25.tar.gz b/abs/mv-core/certmaster/certmaster-0.25.tar.gz
deleted file mode 100644
index 7db585b..0000000
--- a/abs/mv-core/certmaster/certmaster-0.25.tar.gz
+++ /dev/null
diff --git a/abs/mv-core/certmaster/certmaster.conf b/abs/mv-core/certmaster/certmaster.conf
deleted file mode 100644
index 186e1b8..0000000
--- a/abs/mv-core/certmaster/certmaster.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# configuration for certmasterd and certmaster-ca
-
-[main]
-autosign = yes
-listen_addr = 
-listen_port = 51235
-cadir = /etc/pki/certmaster/ca
-cert_dir = /etc/pki/certmaster
-certroot = /var/lib/certmaster/certmaster/certs
-csrroot = /var/lib/certmaster/certmaster/csrs
-cert_extension = cert
-sync_certs = False
-
diff --git a/abs/mv-core/certmaster/certmaster.install b/abs/mv-core/certmaster/certmaster.install
deleted file mode 100755
index 98c9215..0000000
--- a/abs/mv-core/certmaster/certmaster.install
+++ /dev/null
@@ -1,46 +0,0 @@
-# This is a default template for a post-install scriptlet.  You can
-# remove any functions you don't need (and this header).
-
-# arg 1:  the new package version
-pre_install() {
-/bin/true
-mkdir -p /var/log/certmaster
-}
-
-# arg 1:  the new package version
-post_install() {
-	if [ ! -e /var/log/certmaster ]
-	then
-		mkdir -p /var/log/certmaster
-	fi
-
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-pre_upgrade() {
-  /bin/true
-
-
-
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-	post_install
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  /bin/true
-}
-
-# arg 1:  the old package version
-post_remove() {
-  /bin/true
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/mv-core/certmaster/minion.conf b/abs/mv-core/certmaster/minion.conf
deleted file mode 100644
index 47c6540..0000000
--- a/abs/mv-core/certmaster/minion.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# configuration for minions
-
-[main]
-certmaster = certmaster
-certmaster_port = 51235
-log_level = DEBUG
-cert_dir = /etc/pki/certmaster
-
diff --git a/abs/mv-core/confuse/PKGBUILD b/abs/mv-core/confuse/PKGBUILD
deleted file mode 100755
index ca0c15d..0000000
--- a/abs/mv-core/confuse/PKGBUILD
+++ /dev/null
@@ -1,19 +0,0 @@
-# Contributor: Alexander Mieland (dma147) <dma147@linux-stats.org>
-
-pkgname=confuse
-pkgver=2.5
-pkgrel=1
-pkgdesc="C-library for parsing configuration files."
-makedepends=('gcc' 'make')
-arch=i686
-source=(http://savannah.nongnu.org/download/$pkgname/$pkgname-$pkgver.tar.gz)
-url="http://www.nongnu.org/confuse/"
-md5sums=('4bc9b73d77ebd571ac834619ce0b3582')
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$startdir/pkg PREFIX=$startdir/pkg install
-}
diff --git a/abs/mv-core/dnsmasq/PKGBUILD b/abs/mv-core/dnsmasq/PKGBUILD
deleted file mode 100644
index 339b95a..0000000
--- a/abs/mv-core/dnsmasq/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-pkgname=dnsmasq
-pkgver=2.42
-pkgrel=15
-pkgdesc="A lightweight DNS/DHCP server ideal for small/home networks using NAT"
-arch=(i686 x86_64)
-source=(http://www.thekelleys.org.uk/$pkgname/$pkgname-$pkgver.tar.gz \
-    dnsmasq.rc.d $pkgname-capability-config.patch dnsmasq.conf pxelinux.0 pxelinux.default )
-license=('GPL2')
-url="http://www.thekelleys.org.uk/dnsmasq/doc.html"
-depends=('glibc' 'bash')
-backup=(etc/dnsmasq.conf)
-install=$pkgname.install
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver || return 1
-  # patch to add a note about capability module in the config file
-  patch -Np0 -i ../$pkgname-capability-config.patch || return 1
-
-  # build
-  cd $startdir/src/$pkgname-$pkgver || return 1
-  make || return 1
-
-  # install
-  mkdir -p $startdir/pkg/etc/rc.d || return 1
-  make PREFIX=/usr DESTDIR=$startdir/pkg install || return 1
-  install -D -m 0755 \
-    $startdir/src/dnsmasq.rc.d $startdir/pkg/etc/rc.d/dnsmasq || return 1
-  install -D -m 0644 \
-    dnsmasq.conf.example $startdir/pkg/etc/dnsmasq.conf.example || return 1
-   install -D -m 0644 $startdir/src/dnsmasq.conf $startdir/pkg/etc/dnsmasq.conf
-
-  mkdir -p $startdir/pkg/data/srv/tftp/pxelinux.cfg
-  install -m 755 $startdir/src/pxelinux.default  $startdir/pkg/data/srv/tftp/pxelinux.cfg/default
-  install -m 755 $startdir/src/pxelinux.0 $startdir/pkg/data/srv/tftp/pxelinux.0
-
-
-  # make the required directories for DHCP server default directories
-  mkdir -p $startdir/pkg/var/db || return 1
-  mkdir -p $startdir/pkg/var/lib/misc || return 1
-}
-# vim: ts=2 sw=2 et ft=sh
diff --git a/abs/mv-core/dnsmasq/dnsmasq-capability-config.patch b/abs/mv-core/dnsmasq/dnsmasq-capability-config.patch
deleted file mode 100644
index d8dbb82..0000000
--- a/abs/mv-core/dnsmasq/dnsmasq-capability-config.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -urN dnsmasq.conf.example dnsmasq.conf.example.fixed
---- dnsmasq.conf.example	2006-10-18 16:24:50.000000000 -0400
-+++ dnsmasq.conf.example.fixed	2006-11-20 22:07:12.000000000 -0500
-@@ -58,7 +58,9 @@
- #address=/doubleclick.net/127.0.0.1
- 
- # If you want dnsmasq to change uid and gid to something other
--# than the default, edit the following lines.
-+# than root, you will need to have CONFIG_SECURITY_CAPABILITIES 
-+# enabled in your kernel. The default uid and gid of nobody will 
-+# be used if capability is available and this is not set.
- #user=
- #group=
- 
diff --git a/abs/mv-core/dnsmasq/dnsmasq.conf b/abs/mv-core/dnsmasq/dnsmasq.conf
deleted file mode 100644
index 96e338e..0000000
--- a/abs/mv-core/dnsmasq/dnsmasq.conf
+++ /dev/null
@@ -1,38 +0,0 @@
-#logging
-log-async=5
-log-facility=DAEMON
-log-queries
-
-# filter what we send upstream
-domain-needed
-bogus-priv
-filterwin2k
-localise-queries
-
-# allow /etc/hosts and dhcp lookups via *.lan
-local=/lan/
-domain=lan
-expand-hosts
-
-# enable dhcp (start,end,netmask,leasetime)
-dhcp-authoritative
-dhcp-range=192.168.1.101,192.168.1.250,255.255.255.0,12h
-dhcp-leasefile=/tmp/dhcp.leases
-
-# use /etc/ethers for static hosts; same format as --dhcp-host
-# <hwaddr> <ipaddr>
-read-ethers
-
-# other useful options:
-# default route(s): dhcp-option=3,192.168.1.1,192.168.1.2
-#    dns server(s): dhcp-option=6,192.168.1.1,192.168.1.2
-
-dhcp-option=3,192.168.1.1
-dhcp-option=6,192.168.1.1
-
-enable-tftp
-tftp-root=/data/srv/tftp/
-conf-file=/etc/dnsmasq.mvpmc.conf
-
-dhcp-boot=pxelinux.0
-
diff --git a/abs/mv-core/dnsmasq/dnsmasq.install b/abs/mv-core/dnsmasq/dnsmasq.install
deleted file mode 100644
index 25501a4..0000000
--- a/abs/mv-core/dnsmasq/dnsmasq.install
+++ /dev/null
@@ -1,21 +0,0 @@
-# arg 1: the new package version
-post_install() {
-	post_upgrade
-}
-
-# arg 1: the new package version
-# arg 2: the old package version
-post_upgrade() {
-  	touch /etc/dnsmasq.mvpmc.conf
-	chown nobody:nobody /etc/dnsmasq.mvpmc.conf
-}
-
-# arg 1: the old package version
-pre_remove() {
-	/bin/true
-}
-
-op=$1
-shift
-
-$op $*
diff --git a/abs/mv-core/dnsmasq/dnsmasq.rc.d b/abs/mv-core/dnsmasq/dnsmasq.rc.d
deleted file mode 100755
index 1676072..0000000
--- a/abs/mv-core/dnsmasq/dnsmasq.rc.d
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/dnsmasq`
-case "$1" in
-  start)
-    stat_busy "Starting DNS/DHCP daemon"
-    [ -z "$PID" ] && /usr/sbin/dnsmasq
-    if [ $? -gt 0 ] ; then
-      stat_fail
-    else
-      add_daemon dnsmasq                     # create the 'state' dir
-      stat_done 
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping DNS/DHCP daemon"
-    [ "$PID" ] && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon dnsmasq                      # remove the 'state' dir
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 5
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/abs/mv-core/dnsmasq/pxelinux.0 b/abs/mv-core/dnsmasq/pxelinux.0
deleted file mode 100644
index cfe4420..0000000
--- a/abs/mv-core/dnsmasq/pxelinux.0
+++ /dev/null
diff --git a/abs/mv-core/dnsmasq/pxelinux.default b/abs/mv-core/dnsmasq/pxelinux.default
deleted file mode 100644
index 6294d3c..0000000
--- a/abs/mv-core/dnsmasq/pxelinux.default
+++ /dev/null
@@ -1,10 +0,0 @@
-DISPLAY boot.txt
-
-DEFAULT install_image
-
-LABEL install_image
-        kernel masterbuild/boot/vmlinuz26
-	append vga=normal root=/dev/nfs rw netboot netinstall nfsroot=$REPLACEME:/data/srv/tftp/masterbuild,rsize=16384,wsize=16384,rw ip=dhcp  initrd=masterbuild/boot/kernel26.img
-
-TIMEOUT 4
-prompt 20
diff --git a/abs/mv-core/e16-myth-settings/PKGBUILD b/abs/mv-core/e16-myth-settings/PKGBUILD
deleted file mode 100755
index 0c79bc9..0000000
--- a/abs/mv-core/e16-myth-settings/PKGBUILD
+++ /dev/null
@@ -1,32 +0,0 @@
-pkgname=e16-myth-settings
-pkgver=1.0
-pkgrel=38
-pkgdesc="Default settings for e16 + tilda"
-depends=()
-source=()
-arch=('i686')
-install=e16.install
-build() {
-	mkdir -p $startdir/pkg/data/home/mythtv/
-	mkdir -p $startdir/pkg/root
-        rsync -a --exclude=.svn $startdir/e16 $startdir/pkg/data/home/mythtv
-	#cp -rp  $startdir/e16 $startdir/pkg/data/home/mythtv
-
-        rsync -a --exclude=.svn $startdir/e16 $startdir/pkg/root
-
-        mkdir -p $startdir/pkg/data/home/mythtv/.tilda
-        rsync -a --exclude=.svn $startdir/tilda/*	$startdir/pkg/data/home/mythtv/.tilda/
-        cp -rp $startdir/pkg/data/home/mythtv/.tilda $startdir/pkg/root/
-
-
-        chown -R mythtv:mythtv $startdir/pkg/data/home/mythtv
-	chmod 755 -R  $startdir/pkg/data/home/mythtv
-	cd $startdir/pkg/data/home/mythtv
-	mv e16 .e16
-	cd $startdir/pkg/root
-	mv e16 .e16
-  	echo "all done"
-
-
-}
-
diff --git a/abs/mv-core/e16-myth-settings/e16.install b/abs/mv-core/e16-myth-settings/e16.install
deleted file mode 100755
index e14b44e..0000000
--- a/abs/mv-core/e16-myth-settings/e16.install
+++ /dev/null
@@ -1,43 +0,0 @@
-# This is a default template for a post-install scriptlet.  You can
-# remove any functions you don't need (and this header).
-
-# arg 1:  the new package version
-pre_install() {
-  rm -rf /data/home/mythtv/.e16/cached
-  rm -rf /data/home/mythtv/.e16/e_config*.backgrounds
-  rm -rf /data/home/mythtv/.e16/e_config*.snapshots
-}
-
-# arg 1:  the new package version
-post_install() {
-  /bin/true
-   
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-pre_upgrade() {
-   pre_install
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  /bin/true
-
-  
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  /bin/true
-}
-
-# arg 1:  the old package version
-post_remove() {
-  /bin/true
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/mv-core/e16-myth-settings/e16/cached/cfg/.data.home.mythtv..e16.themes.mine.actionclasses.cfg.preparsed b/abs/mv-core/e16-myth-settings/e16/cached/cfg/.data.home.mythtv..e16.themes.mine.actionclasses.cfg.preparsed
deleted file mode 100644
index 7a86df2..0000000
--- a/abs/mv-core/e16-myth-settings/e16/cached/cfg/.data.home.mythtv..e16.themes.mine.actionclasses.cfg.preparsed
+++ /dev/null
@@ -1,206 +0,0 @@
-11 999
-  100 ACTION_MOVE
-  17 "TITLE BAR"
-  102 5
-  107 "Drag to move this Window. Double click to collapse window."
-  428 0
-  103 1
-  4 1
-  104 wop * mo ptr
-  105
-  107 "Click to lower this window."
-  428 0
-  4 3
-  104 wop * lo
-  105
-  107 "Click to shade this window."
-  428 6
-  930 1
-  104 wop * sh
-1000
-11 999
-  100 ACTION_MOVE2
-  17 "MOVE2"
-  103 1
-  930 1
-  102 5
-  107 "Drag to move this window."
-  428 0
-  104 wop * mo ptr
-  105
-1000
-11 999
-  100 ACTION_RESIZE
-  17 "HANDLE"
-  103 1
-  102 5
-  107 "Drag to scale window."
-  428 0
-  4 1
-  104 wop * sz ptr
-  105
-  107 "Drag to move window."
-  4 3
-  104 wop * mo ptr
-1000
-11 999
-  100 ACTION_KILL
-  17 "RED BUTTON"
-  102 5
-  107 "Click to close window."
-  428 1
-  103 1
-  4 1
-  104 wop * close
-  105
-  107 "Click to forcibly close window."
-  4 3
-  104 wop * kill
-1000
-11 999
-  100 ACTION_YELLOW  
-  17 "YELLOW BUTTON"
-  102 5
-  107 "Click to collapse window."
-  428 1
-  4 1
-  104 wop * sh
-  105
-  107 "Click to iconify window."
-  4 3
-  104 wop * ic
-1000
-11 999
-  100 ACTION_GREEN
-  17 "GREEN BUTTON"
-  102 5
-  428 1
-    103 1
-  107 "Click to maximize/restore window."
-  4 1
-  104 wop * ts
-  105
-  107 "Click to maximize height of window."
-  4 2
-  104 wop * th
-  105
-  107 "Click to maximize width of window."
-  4 3
-  104 wop * tw
-1000
-11 999
-  100 ACTION_CLEAR
-  17 "CLEAR BUTTON"
-  102 5
-  428 0
-  103 1
-  107 "Drag to scale window."
-  4 1
-  104 wop * sz ptr
-  105
-  107 "Toggle the Omnipresent (visible on all desktop) state of this window."
-  4 3
-  104 wop * st
-1000
-11 999
-        100 ACTION_AQUA_PREFERENCES
-        17 "ENLIGHTENMENT"
-        102 5
-        107 "Open Configuration Menu"
-        4 1
-        428 1
-        104 menus show "named CONFIG_SUBMENU"
-1000
-11 999
-  100 ACTION_AQUA_SPECIAL
-  102 5
-  103 1
-  930 1
-  428 1
-  104 menus show "named AQUA_SPECIAL"
-1000
-11 999
-  100 ACTION_AQUA_HELP
-  102 5
-  103 1
-  930 1
-  428 1
-  104 menus show "named AQUA_HELP_MENU"
-1000
-1001 0
-11 999
-  100 ACTION_RESIZE_H
-  17 "Hold down left mouse button and drag to resize this window"
-  17 "horizontally. Clicking right mouse button and dragging the mouse"
-  17 "around will move the window about instead."
-  102 5
-  428 0
-  103 1
-  4 1
-  104 wop * sz ptr-h
-  105
-  4 3
-  104 wop * mo ptr
-1000
-11 999
-  100 ACTION_RESIZE_V
-  17 "Hold down left mouse button and drag to resize this window"
-  17 "vertically. Clicking right mouse button and dragging the mouse"
-  17 "around will move the window about instead."
-  102 5
-  428 0
-  103 1
-  4 1
-  104 wop * sz ptr-v
-  105
-  4 3
-  104 wop * mo ptr
-1000
-11 999
-  100 ACTION_RESIZE_H
-  17 "BORDER"
-  102 5
-  428 0
-  103 1
-  107 "Drag to scale window horizontaly."
-  4 1
-  104 wop * sz ptr-h
-  105
-  107 "Drag to move window."
-  4 3
-  104 wop * mo ptr
-1000
-11 999
-  100 ACTION_RESIZE_V
-  17 "BORDER"
-  103 1
-  102 5
-  428 0
-  107 "Drag to scale window vertically."
-  4 1
-  104 wop * sz ptr-v
-  105
-  107 "Drag to move window."
-  4 3
-  104 wop * mo ptr
-1000
-11 999
-	100 ACTION_SHADE
-	17 "BORDER"
-	102 5
-	103 1
-	107 "Shade window."
-	4 1
-	428 1
-	104 wop * sh
-	105
-	107 "Make window sticky."
-	4 2
-	428 1
-	104 wop * st
-	105
-	107 "Iconify window."
-	4 3
-	428 1
-	104 wop * ic
-1000
diff --git a/abs/mv-core/e16-myth-settings/e16/cached/cfg/.data.home.mythtv..e16.themes.mine.borders.cfg.preparsed b/abs/mv-core/e16-myth-settings/e16/cached/cfg/.data.home.mythtv..e16.themes.mine.borders.cfg.preparsed
deleted file mode 100644
index a312616..0000000
--- a/abs/mv-core/e16-myth-settings/e16/cached/cfg/.data.home.mythtv..e16.themes.mine.borders.cfg.preparsed
+++ /dev/null
@@ -1,1636 +0,0 @@
-1001 0
-12 999
-  100 COMMON_DEFAULT_LEFT_RESIZE
-  5 "borders/common/images/leftresize_bg.png"
-  357 0 0 0 0
-  353 "borders/common/images/leftresize_bg.png"
-  357 0 0 0 0
-  352 "borders/common/images/leftresize_bg.png"
-  357 0 0 0 0
-  354 "borders/common/images/leftresize_fg.png"
-  357 0 0 0 0
-  356 "borders/common/images/leftresize_fg.png"
-  357 0 0 0 0
-  355 "borders/common/images/leftresize_fg.png"
-  357 0 0 0 0
-  359 "borders/common/images/leftresize_bg.png"
-  357 0 0 0 0
-  361 "borders/common/images/leftresize_bg.png"
-  357 0 0 0 0
-  360 "borders/common/images/leftresize_bg.png"
-  357 0 0 0 0
-  362 "borders/common/images/leftresize_fg.png"
-  357 0 0 0 0
-  364 "borders/common/images/leftresize_fg.png"
-  357 0 0 0 0
-  363 "borders/common/images/leftresize_fg.png"
-  357 0 0 0 0
-1000
-12 999
-  100 COMMON_DEFAULT_RIGHT_TRIM
-  5 "borders/common/images/righttrim_bg.png"
-  357 0 0 0 0
-  353 "borders/common/images/righttrim_bg.png"
-  357 0 0 0 0
-  352 "borders/common/images/righttrim_bg.png"
-  357 0 0 0 0
-  354 "borders/common/images/righttrim_fg.png"
-  357 0 0 0 0
-  356 "borders/common/images/righttrim_fg.png"
-  357 0 0 0 0
-  355 "borders/common/images/righttrim_fg.png"
-  357 0 0 0 0
-  359 "borders/common/images/righttrim_bg.png"
-  357 0 0 0 0
-  361 "borders/common/images/righttrim_bg.png"
-  357 0 0 0 0
-  360 "borders/common/images/righttrim_bg.png"
-  357 0 0 0 0
-  362 "borders/common/images/righttrim_fg.png"
-  357 0 0 0 0
-  364 "borders/common/images/righttrim_fg.png"
-  357 0 0 0 0
-  363 "borders/common/images/righttrim_fg.png"
-  357 0 0 0 0
-1000
-12 999
-  100 COMMON_DEFAULT_BOTTOM_RESIZE
-  5 "borders/common/images/bottomresize_bg.png"
-  357 0 0 0 0
-  353 "borders/common/images/bottomresize_bg.png"
-  357 0 0 0 0
-  352 "borders/common/images/bottomresize_bg.png"
-  357 0 0 0 0
-  354 "borders/common/images/bottomresize_fg.png"
-  357 0 0 0 0
-  356 "borders/common/images/bottomresize_fg.png"
-  357 0 0 0 0
-  355 "borders/common/images/bottomresize_fg.png"
-  357 0 0 0 0
-  359 "borders/common/images/bottomresize_bg.png"
-  357 0 0 0 0
-  361 "borders/common/images/bottomresize_bg.png"
-  357 0 0 0 0
-  360 "borders/common/images/bottomresize_bg.png"
-  357 0 0 0 0
-  362 "borders/common/images/bottomresize_fg.png"
-  357 0 0 0 0
-  364 "borders/common/images/bottomresize_fg.png"
-  357 0 0 0 0
-  363 "borders/common/images/bottomresize_fg.png"
-  357 0 0 0 0
-1000
-12 999
-  100 COMMON_DEFAULT_BOTTOM
-  5 "borders/common/images/default_bottom_bg.png"
-  357 0 0 0 0
-  353 "borders/common/images/default_bottom_bg.png"
-  357 0 0 0 0
-  352 "borders/common/images/default_bottom_bg.png"
-  357 0 0 0 0
-  354 "borders/common/images/default_bottom_fg.png"
-  357 0 0 0 0
-  356 "borders/common/images/default_bottom_fg.png"
-  357 0 0 0 0
-  355 "borders/common/images/default_bottom_fg.png"
-  357 0 0 0 0
-  359 "borders/common/images/default_bottom_bg.png"
-  357 0 0 0 0
-  361 "borders/common/images/default_bottom_bg.png"
-  357 0 0 0 0
-  360 "borders/common/images/default_bottom_bg.png"
-  357 0 0 0 0
-  362 "borders/common/images/default_bottom_fg.png"
-  357 0 0 0 0
-  364 "borders/common/images/default_bottom_fg.png"
-  357 0 0 0 0
-  363 "borders/common/images/default_bottom_fg.png"
-  357 0 0 0 0
-1000
-12 999
-  100 COMMON_DEFAULT_BOTTOM_TRIM
-  5 "borders/common/images/default_bottomtrim_bg.png"
-  357 0 0 0 0
-  353 "borders/common/images/default_bottomtrim_bg.png"
-  357 0 0 0 0
-  352 "borders/common/images/default_bottomtrim_bg.png"
-  357 0 0 0 0
-  354 "borders/common/images/default_bottomtrim_fg.png"
-  357 0 0 0 0
-  356 "borders/common/images/default_bottomtrim_fg.png"
-  357 0 0 0 0
-  355 "borders/common/images/default_bottomtrim_fg.png"
-  357 0 0 0 0
-  359 "borders/common/images/default_bottomtrim_bg.png"
-  357 0 0 0 0
-  361 "borders/common/images/default_bottomtrim_bg.png"
-  357 0 0 0 0
-  360 "borders/common/images/default_bottomtrim_bg.png"
-  357 0 0 0 0
-  362 "borders/common/images/default_bottomtrim_fg.png"
-  357 0 0 0 0
-  364 "borders/common/images/default_bottomtrim_fg.png"
-  357 0 0 0 0
-  363 "borders/common/images/default_bottomtrim_fg.png"
-  357 0 0 0 0
-1000
-12 999
-  100 COMMON_DEFAULT_CLOSE
-  5 "borders/common/images/close_bg.png"
-  357 0 0 0 0
-  353 "borders/common/images/close_bg.png"
-  357 0 0 0 0
-  352 "borders/common/images/close_bg.png"
-  357 0 0 0 0
-  354 "borders/common/images/close_fg.png"
-  357 0 0 0 0
-  356 "borders/common/images/close_fg.png"
-  357 0 0 0 0
-  355 "borders/common/images/close_cl.png"
-  357 0 0 0 0
-  359 "borders/common/images/close_bg.png"
-  357 0 0 0 0
-  361 "borders/common/images/close_bg.png"
-  357 0 0 0 0
-  360 "borders/common/images/close_bg.png"
-  357 0 0 0 0
-  362 "borders/common/images/close_fg.png"
-  357 0 0 0 0
-  364 "borders/common/images/close_fg.png"
-  357 0 0 0 0
-  363 "borders/common/images/close_cl.png"
-  357 0 0 0 0
-1000
-12 999
-  100 COMMON_DEFAULT_MINIMIZE
-  5 "borders/common/images/minimize_bg.png"
-  357 0 0 0 0
-  353 "borders/common/images/minimize_bg.png"
-  357 0 0 0 0
-  352 "borders/common/images/minimize_bg.png"
-  357 0 0 0 0
-  354 "borders/common/images/minimize_fg.png"
-  357 0 0 0 0
-  356 "borders/common/images/minimize_fg.png"
-  357 0 0 0 0
-  355 "borders/common/images/minimize_cl.png"
-  357 0 0 0 0
-  359 "borders/common/images/minimize_bg.png"
-  357 0 0 0 0
-  361 "borders/common/images/minimize_bg.png"
-  357 0 0 0 0
-  360 "borders/common/images/minimize_bg.png"
-  357 0 0 0 0
-  362 "borders/common/images/minimize_fg.png"
-  357 0 0 0 0
-  364 "borders/common/images/minimize_fg.png"
-  357 0 0 0 0
-  363 "borders/common/images/minimize_cl.png"
-  357 0 0 0 0
-1000
-12 999
-  100 COMMON_DEFAULT_TITLEBAR
-  5 "borders/common/images/default_title_bg.png"
-  357 0 0 0 0
-  353 "borders/common/images/default_title_bg.png"
-  357 0 0 0 0
-  352 "borders/common/images/default_title_bg.png"
-  357 0 0 0 0
-  354 "borders/common/images/default_title_fg.png"
-  357 0 0 0 0
-  356 "borders/common/images/default_title_fg.png"
-  357 0 0 0 0
-  355 "borders/common/images/default_title_fg.png"
-  357 0 0 0 0
-  359 "borders/common/images/default_title_bg.png"
-  357 0 0 0 0
-  361 "borders/common/images/default_title_bg.png"
-  357 0 0 0 0
-  360 "borders/common/images/default_title_bg.png"
-  357 0 0 0 0
-  362 "borders/common/images/default_title_fg.png"
-  357 0 0 0 0
-  364 "borders/common/images/default_title_fg.png"
-  357 0 0 0 0
-  363 "borders/common/images/default_title_fg.png"
-  357 0 0 0 0
-  358 2 2 1 2
-1000
-12 999
-  100 COMMON_DEFAULT_TOP_RIGHT_TRIM
-  5 "borders/common/images/toprighttrim_bg.png"
-  357 0 0 0 0
-  353 "borders/common/images/toprighttrim_bg.png"
-  357 0 0 0 0
-  352 "borders/common/images/toprighttrim_bg.png"
-  357 0 0 0 0
-  354 "borders/common/images/toprighttrim_fg.png"
-  357 0 0 0 0
-  356 "borders/common/images/toprighttrim_fg.png"
-  357 0 0 0 0
-  355 "borders/common/images/toprighttrim_fg.png"
-  357 0 0 0 0
-  359 "borders/common/images/toprighttrim_bg.png"
-  357 0 0 0 0
-  361 "borders/common/images/toprighttrim_bg.png"
-  357 0 0 0 0
-  360 "borders/common/images/toprighttrim_bg.png"
-  357 0 0 0 0
-  362 "borders/common/images/toprighttrim_fg.png"
-  357 0 0 0 0
-  364 "borders/common/images/toprighttrim_fg.png"
-  357 0 0 0 0
-  363 "borders/common/images/toprighttrim_fg.png"
-  357 0 0 0 0
-1000
-12 999
-  100 COMMON_DEFAULT_TOP
-  5 "borders/common/images/default_top_bg.png"
-  357 0 0 0 0
-  353 "borders/common/images/default_top_bg.png"
-  357 0 0 0 0
-  352 "borders/common/images/default_top_bg.png"
-  357 0 0 0 0
-  354 "borders/common/images/default_top_fg.png"
-  357 0 0 0 0
-  356 "borders/common/images/default_top_fg.png"
-  357 0 0 0 0
-  355 "borders/common/images/default_top_fg.png"
-  357 0 0 0 0
-  359 "borders/common/images/default_top_bg.png"
-  357 0 0 0 0
-  361 "borders/common/images/default_top_bg.png"
-  357 0 0 0 0
-  360 "borders/common/images/default_top_bg.png"
-  357 0 0 0 0
-  362 "borders/common/images/default_top_fg.png"
-  357 0 0 0 0
-  364 "borders/common/images/default_top_fg.png"
-  357 0 0 0 0
-  363 "borders/common/images/default_top_fg.png"
-  357 0 0 0 0
-1000
-12 999
-  100 COMMON_DEFAULT_STICK
-  5 "borders/common/images/stick_bg.png"
-  357 0 0 0 0
-  353 "borders/common/images/stick_bg.png"
-  357 0 0 0 0
-  352 "borders/common/images/stick_bg.png"
-  357 0 0 0 0
-  354 "borders/common/images/stick_fg.png"
-  357 0 0 0 0
-  356 "borders/common/images/stick_fg.png"
-  357 0 0 0 0
-  355 "borders/common/images/stick_cl.png"
-  357 0 0 0 0
-  359 "borders/common/images/stick_bg_st.png"
-  357 0 0 0 0
-  361 "borders/common/images/stick_bg_st.png"
-  357 0 0 0 0
-  360 "borders/common/images/stick_bg_st.png"
-  357 0 0 0 0
-  362 "borders/common/images/stick_fg_st.png"
-  357 0 0 0 0
-  364 "borders/common/images/stick_fg_st.png"
-  357 0 0 0 0
-  363 "borders/common/images/stick_cl.png"
-  357 0 0 0 0
-1000
-12 999
-  100 COMMON_DEFAULT_LEFT_TRIM
-  5 "borders/common/images/lefttrim_bg.png"
-  357 0 0 0 0
-  353 "borders/common/images/lefttrim_bg.png"
-  357 0 0 0 0
-  352 "borders/common/images/lefttrim_bg.png"
-  357 0 0 0 0
-  354 "borders/common/images/lefttrim_fg.png"
-  357 0 0 0 0
-  356 "borders/common/images/lefttrim_fg.png"
-  357 0 0 0 0
-  355 "borders/common/images/lefttrim_fg.png"
-  357 0 0 0 0
-  359 "borders/common/images/lefttrim_bg.png"
-  357 0 0 0 0
-  361 "borders/common/images/lefttrim_bg.png"
-  357 0 0 0 0
-  360 "borders/common/images/lefttrim_bg.png"
-  357 0 0 0 0
-  362 "borders/common/images/lefttrim_fg.png"
-  357 0 0 0 0
-  364 "borders/common/images/lefttrim_fg.png"
-  357 0 0 0 0
-  363 "borders/common/images/lefttrim_fg.png"
-  357 0 0 0 0
-1000
-12 999
-  100 COMMON_DEFAULT_LEFT
-  5 "borders/common/images/left_bg.png"
-  357 0 0 0 0
-  353 "borders/common/images/left_bg.png"
-  357 0 0 0 0
-  352 "borders/common/images/left_bg.png"
-  357 0 0 0 0
-  354 "borders/common/images/left_fg.png"
-  357 0 0 0 0
-  356 "borders/common/images/left_fg.png"
-  357 0 0 0 0
-  355 "borders/common/images/left_fg.png"
-  357 0 0 0 0
-  359 "borders/common/images/left_bg.png"
-  357 0 0 0 0
-  361 "borders/common/images/left_bg.png"
-  357 0 0 0 0
-  360 "borders/common/images/left_bg.png"
-  357 0 0 0 0
-  362 "borders/common/images/left_fg.png"
-  357 0 0 0 0
-  364 "borders/common/images/left_fg.png"
-  357 0 0 0 0
-  363 "borders/common/images/left_fg.png"
-  357 0 0 0 0
-1000
-12 999
-  100 COMMON_DEFAULT_RIGHT
-  5 "borders/common/images/right_bg.png"
-  357 0 0 3 3
-  353 "borders/common/images/right_bg.png"
-  357 0 0 3 3
-  352 "borders/common/images/right_bg.png"
-  357 0 0 3 3
-  354 "borders/common/images/right_fg.png"
-  357 0 0 3 3
-  356 "borders/common/images/right_fg.png"
-  357 0 0 3 3
-  355 "borders/common/images/right_fg.png"
-  357 0 0 3 3
-  359 "borders/common/images/right_bg.png"
-  357 0 0 3 3
-  361 "borders/common/images/right_bg.png"
-  357 0 0 3 3
-  360 "borders/common/images/right_bg.png"
-  357 0 0 3 3
-  362 "borders/common/images/right_fg.png"
-  357 0 0 3 3
-  364 "borders/common/images/right_fg.png"
-  357 0 0 3 3
-  363 "borders/common/images/right_fg.png"
-  357 0 0 3 3
-1000
-12 999
-  100 COMMON_DEFAULT_CLOSE_SHADED
-  5 "borders/common/images/close_sh_bg.png"
-  357 0 0 0 0
-  353 "borders/common/images/close_sh_bg.png"
-  357 0 0 0 0
-  352 "borders/common/images/close_sh_bg.png"
-  357 0 0 0 0
-  354 "borders/common/images/close_sh_fg.png"
-  357 0 0 0 0
-  356 "borders/common/images/close_sh_fg.png"
-  357 0 0 0 0
-  355 "borders/common/images/close_sh_cl.png"
-  357 0 0 0 0
-  359 "borders/common/images/close_sh_bg.png"
-  357 0 0 0 0
-  361 "borders/common/images/close_sh_bg.png"
-  357 0 0 0 0
-  360 "borders/common/images/close_sh_bg.png"
-  357 0 0 0 0
-  362 "borders/common/images/close_sh_fg.png"
-  357 0 0 0 0
-  364 "borders/common/images/close_sh_fg.png"
-  357 0 0 0 0
-  363 "borders/common/images/close_sh_cl.png"
-  357 0 0 0 0
-1000
-12 999
-  100 COMMON_DEFAULT_STICK_SHADED
-  5 "borders/common/images/stick_sh_bg.png"
-  357 0 0 0 0
-  353 "borders/common/images/stick_sh_bg.png"
-  357 0 0 0 0
-  352 "borders/common/images/stick_sh_bg.png"
-  357 0 0 0 0
-  354 "borders/common/images/stick_sh_fg.png"
-  357 0 0 0 0
-  356 "borders/common/images/stick_sh_fg.png"
-  357 0 0 0 0
-  355 "borders/common/images/stick_sh_cl.png"
-  357 0 0 0 0
-  359 "borders/common/images/stick_sh_bg_st.png"
-  357 0 0 0 0
-  361 "borders/common/images/stick_sh_bg_st.png"
-  357 0 0 0 0
-  360 "borders/common/images/stick_sh_bg_st.png"
-  357 0 0 0 0
-  362 "borders/common/images/stick_sh_fg_st.png"
-  357 0 0 0 0
-  364 "borders/common/images/stick_sh_fg_st.png"
-  357 0 0 0 0
-  363 "borders/common/images/stick_sh_cl.png"
-  357 0 0 0 0
-1000
-12 999
-  100 COMMON_FIXED_BOTTOM
-  5 "borders/common/images/fixed_bottom_bg.png"
-  357 4 4 0 0
-  353 "borders/common/images/fixed_bottom_bg.png"
-  357 4 4 0 0
-  352 "borders/common/images/fixed_bottom_bg.png"
-  357 4 4 0 0
-  354 "borders/common/images/fixed_bottom_fg.png"
-  357 4 4 0 0
-  356 "borders/common/images/fixed_bottom_fg.png"
-  357 4 4 0 0
-  355 "borders/common/images/fixed_bottom_fg.png"
-  357 4 4 0 0
-  359 "borders/common/images/fixed_bottom_bg.png"
-  357 4 4 0 0
-  361 "borders/common/images/fixed_bottom_bg.png"
-  357 4 4 0 0
-  360 "borders/common/images/fixed_bottom_bg.png"
-  357 4 4 0 0
-  362 "borders/common/images/fixed_bottom_fg.png"
-  357 4 4 0 0
-  364 "borders/common/images/fixed_bottom_fg.png"
-  357 4 4 0 0
-  363 "borders/common/images/fixed_bottom_fg.png"
-  357 4 4 0 0
-1000
-12 999
-  100 COMMON_VERYSMALL_TOP
-  5 "borders/common/images/transient_title_fg.png"
-  357 6 6 0 0
-  353 "borders/common/images/transient_title_fg.png"
-  357 6 6 0 0
-  352 "borders/common/images/transient_title_fg.png"
-  357 6 6 0 0
-  354 "borders/common/images/transient_title_fg.png"
-  357 6 6 0 0
-  356 "borders/common/images/transient_title_fg.png"
-  357 6 6 0 0
-  355 "borders/common/images/transient_title_fg.png"
-  357 6 6 0 0
-  359 "borders/common/images/transient_title_fg.png"
-  357 6 6 0 0
-  361 "borders/common/images/transient_title_fg.png"
-  357 6 6 0 0
-  360 "borders/common/images/transient_title_fg.png"
-  357 6 6 0 0
-  362 "borders/common/images/transient_title_fg.png"
-  357 6 6 0 0
-  364 "borders/common/images/transient_title_fg.png"
-  357 6 6 0 0
-  363 "borders/common/images/transient_title_fg.png"
-  357 6 6 0 0
-1000
-12 999
-  100 COMMON_VERYSMALL_TOP_SHADED
-  5 "borders/common/images/verysmall_top_sh_bg.png"
-  357 6 6 0 0
-  353 "borders/common/images/verysmall_top_sh_bg.png"
-  357 6 6 0 0
-  352 "borders/common/images/verysmall_top_sh_bg.png"
-  357 6 6 0 0
-  354 "borders/common/images/verysmall_top_sh_fg.png"
-  357 6 6 0 0
-  356 "borders/common/images/verysmall_top_sh_fg.png"
-  357 6 6 0 0
-  355 "borders/common/images/verysmall_top_sh_fg.png"
-  357 6 6 0 0
-  359 "borders/common/images/verysmall_top_sh_bg.png"
-  357 6 6 0 0
-  361 "borders/common/images/verysmall_top_sh_bg.png"
-  357 6 6 0 0
-  360 "borders/common/images/verysmall_top_sh_bg.png"
-  357 6 6 0 0
-  362 "borders/common/images/verysmall_top_sh_fg.png"
-  357 6 6 0 0
-  364 "borders/common/images/verysmall_top_sh_fg.png"
-  357 6 6 0 0
-  363 "borders/common/images/verysmall_top_sh_fg.png"
-  357 6 6 0 0
-1000
-12 999
-  100 COMMON_TRANSIENT_TITLEBAR
-  5 "borders/common/images/transient_title_bg.png"
-  357 0 8 0 0
-  353 "borders/common/images/transient_title_bg.png"
-  357 0 8 0 0
-  352 "borders/common/images/transient_title_bg.png"
-  357 0 8 0 0
-  354 "borders/common/images/transient_title_fg.png"
-  357 0 8 0 0
-  356 "borders/common/images/transient_title_fg.png"
-  357 0 8 0 0
-  355 "borders/common/images/transient_title_fg.png"
-  357 0 8 0 0
-  359 "borders/common/images/transient_title_bg.png"
-  357 0 8 0 0
-  361 "borders/common/images/transient_title_bg.png"
-  357 0 8 0 0
-  360 "borders/common/images/transient_title_bg.png"
-  357 0 8 0 0
-  362 "borders/common/images/transient_title_fg.png"
-  357 0 8 0 0
-  364 "borders/common/images/transient_title_fg.png"
-  357 0 8 0 0
-  363 "borders/common/images/transient_title_fg.png"
-  357 0 8 0 0
-  358 2 10 1 2
-1000
-12 999
-  100 COMMON_LEFTSIDE_LEFT_TOP_TRIM
-  5 "borders/common/images/lefttoptrim_bg.png"
-  357 0 0 0 0
-  353 "borders/common/images/lefttoptrim_bg.png"
-  357 0 0 0 0
-  352 "borders/common/images/lefttoptrim_bg.png"
-  357 0 0 0 0
-  354 "borders/common/images/lefttoptrim_fg.png"
-  357 0 0 0 0
-  356 "borders/common/images/lefttoptrim_fg.png"
-  357 0 0 0 0
-  355 "borders/common/images/lefttoptrim_fg.png"
-  357 0 0 0 0
-  359 "borders/common/images/lefttoptrim_bg.png"
-  357 0 0 0 0
-  361 "borders/common/images/lefttoptrim_bg.png"
-  357 0 0 0 0
-  360 "borders/common/images/lefttoptrim_bg.png"
-  357 0 0 0 0
-  362 "borders/common/images/lefttoptrim_fg.png"
-  357 0 0 0 0
-  364 "borders/common/images/lefttoptrim_fg.png"
-  357 0 0 0 0
-  363 "borders/common/images/lefttoptrim_fg.png"
-  357 0 0 0 0
-1000
-12 999
-  100 COMMON_LEFTSIDE_TITLEBAR
-  5 "borders/common/images/leftside_title_bg.png"
-  357 0 0 0 0
-  353 "borders/common/images/leftside_title_bg.png"
-  357 0 0 0 0
-  352 "borders/common/images/leftside_title_bg.png"
-  357 0 0 0 0
-  354 "borders/common/images/leftside_title_fg.png"
-  357 0 0 0 0
-  356 "borders/common/images/leftside_title_fg.png"
-  357 0 0 0 0
-  355 "borders/common/images/leftside_title_fg.png"
-  357 0 0 0 0
-  359 "borders/common/images/leftside_title_bg.png"
-  357 0 0 0 0
-  361 "borders/common/images/leftside_title_bg.png"
-  357 0 0 0 0
-  360 "borders/common/images/leftside_title_bg.png"
-  357 0 0 0 0
-  362 "borders/common/images/leftside_title_fg.png"
-  357 0 0 0 0
-  364 "borders/common/images/leftside_title_fg.png"
-  357 0 0 0 0
-  363 "borders/common/images/leftside_title_fg.png"
-  357 0 0 0 0
-  358 2 2 1 2
-1000
-12 999
-  100 COMMON_LEFTSIDE_BOTTOM_TRIM
-  5 "borders/common/images/leftside_bottomtrim_bg.png"
-  357 0 0 0 0
-  353 "borders/common/images/leftside_bottomtrim_bg.png"
-  357 0 0 0 0
-  352 "borders/common/images/leftside_bottomtrim_bg.png"
-  357 0 0 0 0
-  354 "borders/common/images/leftside_bottomtrim_fg.png"
-  357 0 0 0 0
-  356 "borders/common/images/leftside_bottomtrim_fg.png"
-  357 0 0 0 0
-  355 "borders/common/images/leftside_bottomtrim_fg.png"
-  357 0 0 0 0
-  359 "borders/common/images/leftside_bottomtrim_bg.png"
-  357 0 0 0 0
-  361 "borders/common/images/leftside_bottomtrim_bg.png"
-  357 0 0 0 0
-  360 "borders/common/images/leftside_bottomtrim_bg.png"
-  357 0 0 0 0
-  362 "borders/common/images/leftside_bottomtrim_fg.png"
-  357 0 0 0 0
-  364 "borders/common/images/leftside_bottomtrim_fg.png"
-  357 0 0 0 0
-  363 "borders/common/images/leftside_bottomtrim_fg.png"
-  357 0 0 0 0
-1000
-1 999
-  100 "TITLE_TEXT"
-  5 "vixar/12"
-    204 1
-    205 192 192 192
-    206 0 0 0
-    201 512
-  354 "vixar/12"
-    204 1
-    205 255 255 255
-    206 0 0 0
-    201 512
-  362 "vixar/12"
-    204 1
-    205 255 255 255
-    206 0 0 0
-    201 512
-1000
-1 999
-  100 "LEFTSIDE_TITLE_TEXT"
-  5 "vixar/12"
-    204 1
-    205 192 192 192
-    206 0 0 0
-    201 512
-	200 2
-  354 "vixar/12"
-    204 1
-    205 255 255 255
-    206 0 0 0
-    201 512
-	200 2
-  362 "vixar/12"
-    204 1
-    205 255 255 255
-    206 0 0 0
-    201 512
-	200 2
-1000
-3 999
-  100 BORDERLESS
-  501 0
-  502 0
-  503 0
-  504 0
-1000
-3 999
-  100 DEFAULT
-  501 0
-  502 0
-  503 38
-  504 0
-  506 2
-  507 0
-  505 999
-    12 TITLE_BAR_MASK
-    11 ACTION_MOVE
-    454 1
-    456 4
-    468 22
-    469 22
-    457 9999
-    467 -1
-    458  0
-    459  0
-    460  0
-    461  16
-    462 -1
-    463  1024
-    464  0
-    465  0
-    466  38
-    470 0
-  1000
-  505 999
-    12 TITLE_BAR
-    11 ACTION_MOVE
-    456 4
-    468 22
-    469 22
-    457 9999
-    467 -1
-    458  0
-    459  0
-    460  0
-    461  16
-    462 -1
-    463  1024
-    464  0
-    465  0
-    466  38
-    470 1
-  1000
-  505 999
-    12 TITLE
-    11 ACTION_MOVE
-    1 TEXT1
-    454 1
-    456 4
-    468 22
-    469 22
-    457 9999
-    467 -1
-    458  0
-    459  71
-    460  0
-    461  16
-    462 -1
-    463  1024
-    464  -27
-    465  0
-    466  38
-    470 1
-  1000
-  505 999
-    12 BUTTON_RED
-    11 ACTION_KILL
-    800 KILL
-    456 15
-    457 15
-    468 22
-    469 22
-    467 -1
-    458  0
-    459  8
-    460  0
-    461  16
-    470 1
-  1000
-  505 999
-    12 BUTTON_YELLOW
-    11 ACTION_YELLOW
-    800 ICONIFY
-    456 15
-    457 15
-    468 22
-    469 22
-    467 -1
-    458  0
-    459  30
-    460  0
-    461  16
-    470 1
-  1000
-  505 999
-    12 BUTTON_GREEN
-    11 ACTION_GREEN
-    800 MAX
-    456 15
-    457 15
-    468 22
-    469 22
-    467 -1
-    458  0
-    459  52
-    460  0
-    461  16
-    470 1
-  1000
-  505 999
-    12 BUTTON_CLEAR
-    11 ACTION_CLEAR
-    800 RESIZE_BL
-    456 15
-    457 15
-    468 22
-    469 22
-    467 -1
-    458  1024
-    459  -23
-    460  0
-    461  16
-    470 1
-  1000
-  505 999
-    12 RESIZE_HANDLE
-    11 ACTION_RESIZE
-    800 RESIZE_BR
-    456 14
-    457 14
-    468 14
-    469 14
-    467 -1
-    458  1024
-    459  -14
-    460  1024
-    461  -14
-    462 -1
-   463  1024
-    464  -1
-    465  1024
-    466  -1
-    470 0
-  1000
-1000
-3 999
-  100 ICONBOX
-  501 0
-  502 0
-  503 0
-  504 0
-1000
-12 999
-  100 PB1
-  5 "borders/PAGER/images/pb1.png"
-1000
-12 999
-  100 PB2
-  5 "borders/PAGER/images/pb2.png"
-  357 2 2 0 0
-1000
-12 999
-  100 PB3
-  5 "borders/PAGER/images/pb3.png"
-1000
-12 999
-  100 PB4
-  5 "borders/PAGER/images/pb4.png"
-  357 3 4 6 7
-1000
-12 999
-  100 PB5
-  5 "borders/PAGER/images/pb5.png"
-  357 2 2 0 0
-1000
-12 999
-  100 PB6
-  5 "borders/PAGER/images/pb6.png"
-1000
-12 999
-  100 PB7
-  5 "borders/PAGER/images/pb8.png"
-  357 0 0 2 2
-1000
-3 999
-  100 PAGER
-  508 PAGER_GROUP
-  501 3
-  502 12
-  503 19
-  504 3
-  506 0
-  507 0
-  505 999
-    12 PB1
-    11 ACTION_RESIZE
-    800 RESIZE_BR
-    456 3
-    457 3
-    468 3
-    469 3
-    467 -1
-    458  0
-    459  0
-    460  0
-    461  16
-    462 -1
-    463  0
-    464  2
-    465  0
-    466  2
-    470 1
-    453 0
-  1000
-  505 999
-    12 PB2
-    11 ACTION_MOVE
-    456 0
-    457 99999
-    468 3
-    469 3
-    467 -1
-    458  0
-    459  3
-    460  0
-    461  16
-    462 -1
-    463  1024
-    464  -13
-    465  0
-    466  2
-    470 0
-    453 0
-  1000
-  505 999
-    12 PB3
-    11 ACTION_SHADE
-    800 ICONIFY
-    456 12
-    457 12
-    468 21
-    469 21
-    467 -1
-    458  1024
-    459  -12
-    460  0
-    461  16
-    462 -1
-    463  1024
-    464  -1
-    465  0
-    466  20
-    470 1
-    453 0
-  1000
-  505 999
-    12 PB4
-    11 ACTION_SHADE
-    800 ICONIFY
-    456 12
-    457 12
-    468 13
-    469 99999
-    467 -1
-    458  1024
-    459  -12
-    460  0
-    461  37
-    462 -1
-    463  1024
-    464  -1
-    465  1024
-    466  -1
-    470 1
-    453 0
-  1000
-  505 999
-    12 PB5
-    11 ACTION_RESIZE_V
-    800 RESIZE_V
-    456 0
-    457 99999
-    468 3
-    469 3
-    467 -1
-    458  0
-    459  3
-    460  1024
-    461  -3
-    462 -1
-    463  1024
-    464  -13
-    465  1024
-    466  -1
-    470 0
-    453 0
-  1000
-  505 999
-    12 PB6
-    11 ACTION_RESIZE
-    800 RESIZE_TR
-    456 3
-    457 3
-    468 3
-    469 3
-    467 -1
-    458  0
-    459  0
-    460  1024
-    461  -3
-    462 -1
-    463  0
-    464  2
-    465  1024
-    466  -1
-    470 1
-    453 0
-  1000
-  505 999
-    12 PB7
-    11 ACTION_RESIZE_H
-    800 RESIZE_H
-    456 3
-    457 3
-    468 0
-    469 99999
-    467 -1
-    458  0
-    459  0
-    460  0
-    461  19
-    462 -1
-    463  0
-    464  2
-    465  1024
-    466  -3
-    470 1
-    453 0
-  1000
-1000
-12 999
-  100 RPB1
-  5 "borders/RIGHT_PAGER/images/pb1.png"
-1000
-12 999
-  100 RPB2
-  5 "borders/RIGHT_PAGER/images/pb2.png"
-  357 2 2 0 0
-1000
-12 999
-  100 RPB3
-  5 "borders/RIGHT_PAGER/images/pb3.png"
-1000
-12 999
-  100 RPB4
-  5 "borders/RIGHT_PAGER/images/pb4.png"
-  357 3 4 6 7
-1000
-12 999
-  100 RPB5
-  5 "borders/RIGHT_PAGER/images/pb5.png"
-  357 2 2 0 0
-1000
-12 999
-  100 RPB6
-  5 "borders/RIGHT_PAGER/images/pb6.png"
-1000
-12 999
-  100 RPB7
-  5 "borders/RIGHT_PAGER/images/pb8.png"
-  357 0 0 2 2
-1000
-3 999
-  100 RIGHT_PAGER
-  508 RIGHT_PAGER_GROUP
-  501 12
-  502 3
-  503 19
-  504 3
-  506 1
-  507 0
-  505 999
-    12 RPB1
-    11 ACTION_RESIZE
-    800 RESIZE_TR
-    456 3
-    457 3
-    468 3
-    469 3
-    467 -1
-    458  1024
-    459  -3
-    460  0
-    461  16
-    462 -1
-    463  1024
-    464  0
-    465  0
-    466  3
-    470 1
-    453 0
-  1000
-  505 999
-    12 RPB2
-    11 ACTION_MOVE
-    456 0
-    457 99999
-    468 3
-    469 3
-    467 -1
-    458  0
-    459  12
-    460  0
-    461  16
-    462 -1
-    463  1024
-    464  -3
-    465  0
-    466  2
-    470 0
-    453 0
-  1000
-  505 999
-    12 RPB3
-    11 ACTION_SHADE
-    800 ICONIFY
-    456 12
-    457 12
-    468 21
-    469 21
-    467 -1
-    458  0
-    459  0
-    460  0
-    461  16
-    462 -1
-    463  0
-    464  11
-    465  0
-    466  20
-    470 1
-    453 0
-  1000
-  505 999
-    12 RPB4
-    11 ACTION_SHADE
-    800 ICONIFY
-    456 12
-    457 12
-    468 13
-    469 99999
-    467 -1
-    458  0
-    459  0
-    460  0
-    461  37
-    462 -1
-    463  0
-    464  13
-    465  1024
-    466  -1
-    470 1
-    453 0
-  1000
-  505 999
-    12 RPB5
-    11 ACTION_RESIZE_V
-    800 RESIZE_V
-    456 0
-    457 99999
-    468 3
-    469 3
-    467 -1
-    458  0
-    459  12
-    460  1024
-    461  -3
-    462 -1
-    463  1024
-    464  -3
-    465  1024
-    466  0
-    470 0
-    453 0
-  1000
-  505 999
-    12 RPB6
-    11 ACTION_RESIZE
-    800 RESIZE_BR
-    456 3
-    457 3
-    468 3
-    469 3
-    467 -1
-    458  1024
-    459  -3
-    460  1024
-    461  -3
-    462 -1
-    463  1024
-    464  0
-    465  1024
-    466 0 
-    470 1
-    453 0
-  1000
-  505 999
-    12 RPB7
-    11 ACTION_RESIZE_H
-    800 RESIZE_H
-    456 3
-    457 3
-    468 0
-    469 99999
-    467 -1
-    458  1024
-    459  -3
-    460  0
-    461  19
-    462 -1
-    463  1024
-    464  0
-    465  1024
-    466  -3
-    470 1
-    453 0
-  1000
-1000
-3 999
-  100 TRANSIENT
-  501 1
-  502 1
-  503 18
-  504 1
-  506 2
-  507 0
-  505 999
-    12 COMMON_TRANSIENT_TITLEBAR
-    11 ACTION_MOVE
-    456 5
-    457 99999
-    468 2
-    469 2
-    467 -1
-    458 0
-    459 0
-    460 0
-    461 16
-    462 -1
-    463 1024
-    464 0
-    465 0
-    466 18
-    470 1
-  1000
-  505 999
-    12 COMMON_DEFAULT_LEFT
-    11 ACTION_MOVE
-    456 1
-    457 1
-    468 -1
-    469 99999
-    467 0
-    458 0
-    459 0
-    460 0
-    461 1
-    462 -1
-    463 0
-    464 0
-    465 1024
-    466 0
-    470 0
-  1000
-  505 999
-    12 COMMON_DEFAULT_RIGHT
-    11 ACTION_MOVE
-    456 1
-    457 1
-    468 -1
-    469 99999
-    467 -1
-    458 1024
-    459 -1
-    460 0
-    461 18
-    462 -1
-    463 1024
-    464 -1
-    465 1024
-    466 0
-    470 0
-  1000
-  505 999
-    12 COMMON_FIXED_BOTTOM
-    11 ACTION_MOVE
-    456 0
-    457 99999
-    468 1
-    469 1
-    467 -1
-    458 0
-    459 0
-    460 1024
-    461 -1
-    462 -1
-    463 1024
-    464 0
-    465 1024
-    466 -1
-    470 0
-  1000
-1000
-3 999
-  100 STEEL
-  501 0
-  502 0
-  503 38
-  504 0
-  506 2
-  507 0
-  505 999
-    12 TITLE_BAR_MASK_STEEL
-    11 ACTION_MOVE
-    454 1
-    456 4
-    468 22
-    469 22
-    457 9999
-    467 -1
-    458  0
-    459  0
-    460  0
-    461  16
-    462 -1
-    463  1024
-    464  0
-    465  0
-    466  38
-    470 0
-  1000
-  505 999
-    12 TITLE_BAR_STEEL
-    11 ACTION_MOVE
-    456 4
-    468 22
-    469 22
-    457 9999
-    467 -1
-    458  0
-    459  0
-    460  0
-    461  16
-    462 -1
-    463  1024
-    464  0
-    465  0
-    466  38
-    470 1
-  1000
-  505 999
-    12 TITLE_STEEL
-    11 ACTION_MOVE
-    1 TEXT1
-    454 1
-    456 4
-    468 22
-    469 22
-    457 9999
-    467 -1
-    458  0
-    459  71
-    460  0
-    461  16
-    462 -1
-    463  1024
-    464  -27
-    465  0
-    466  38
-    470 1
-  1000
-  505 999
-    12 BUTTON_RED_STEEL
-    11 ACTION_KILL
-    800 KILL
-    456 15
-    457 15
-    468 22
-    469 22
-    467 -1
-    458  0
-    459  8
-    460  0
-    461  16
-    470 1
-  1000
-  505 999
-    12 BUTTON_YELLOW_STEEL
-    11 ACTION_YELLOW
-    800 ICONIFY
-    456 15
-    457 15
-    468 22
-    469 22
-    467 -1
-    458  0
-    459  30
-    460  0
-    461  16
-    470 1
-  1000
-  505 999
-    12 BUTTON_GREEN_STEEL
-    11 ACTION_GREEN
-    800 MAX
-    456 15
-    457 15
-    468 22
-    469 22
-    467 -1
-    458  0
-    459  52
-    460  0
-    461  16
-    470 1
-  1000
-  505 999
-    12 BUTTON_CLEAR_STEEL
-    11 ACTION_CLEAR
-    800 RESIZE_BL
-    456 15
-    457 15
-    468 22
-    469 22
-    467 -1
-    458  1024
-    459  -23
-    460  0
-    461  16
-    470 1
-  1000
-  505 999
-    12 RESIZE_HANDLE_STEEL
-    11 ACTION_RESIZE
-    800 RESIZE_BR
-    456 14
-    457 14
-    468 14
-    469 14
-    467 -1
-    458  1024
-    459  -14
-    460  1024
-    461  -14
-    462 -1
-   463  1024
-    464  -1
-    465  1024
-    466  -1
-    470 0
-  1000
-1000
-3 999
-  100 VERYSMALLFIXED
-  501 1
-  502 1
-  503 18
-  504 1
-  506 2
-  507 0
-  505 999
-    12 COMMON_TRANSIENT_TITLEBAR
-    11 ACTION_MOVE
-    456 5
-    457 99999
-    468 2
-    469 2
-    467 -1
-    458 0
-    459 0
-    460 0
-    461 16
-    462 -1
-    463 1024
-    464 0
-    465 0
-    466 18
-    470 1
-  1000
-  505 999
-    12 COMMON_DEFAULT_LEFT
-    11 ACTION_MOVE
-    456 1
-    457 1
-    468 -1
-    469 99999
-    467 0
-    458 0
-    459 0
-    460 0
-    461 1
-    462 -1
-    463 0
-    464 0
-    465 1024
-    466 0
-    470 0
-  1000
-  505 999
-    12 COMMON_DEFAULT_RIGHT
-    11 ACTION_MOVE
-    456 1
-    457 1
-    468 -1
-    469 99999
-    467 -1
-    458 1024
-    459 -1
-    460 0
-    461 18
-    462 -1
-    463 1024
-    464 -1
-    465 1024
-    466 0
-    470 0
-  1000
-  505 999
-    12 COMMON_FIXED_BOTTOM
-    11 ACTION_MOVE
-    456 0
-    457 99999
-    468 1
-    469 1
-    467 -1
-    458 0
-    459 0
-    460 1024
-    461 -1
-    462 -1
-    463 1024
-    464 0
-    465 1024
-    466 -1
-    470 0
-  1000
-1000
-3 999
-  100 SMALL
-  501 0
-  502 0
-  503 32
-  504 0
-  506 2
-  507 0
-  505 999
-    12 SMALL_TITLE
-    11 ACTION_MOVE
-    456 50
-    468 16
-    469 16
-    457 9999
-    467 -1
-    458  0
-    459  0
-    460  0
-    461  16
-    462 -1
-    463  1024
-    464  0
-    465  0
-    466  32
-    470 1
-  1000
-  505 999
-    12 SMALL_TITLE
-    11 ACTION_MOVE
-    1 TEXT1
-    454 1
-    456 50
-    468 16
-    469 16
-    457 9999
-    467 -1
-    458  0
-    459  42
-    460  0
-    461  16
-    462 -1
-    463  1024
-    464  -34
-    465  0
-    466  32
-    470 1
-  1000
-  505 999
-    12 SMALL_BUTTON_RED
-    11 ACTION_KILL
-    800 KILL
-    456 11
-    457 11
-    468 15
-    469 15
-    467 -1
-    458  0
-    459  8
-    460  0
-    461  16
-    470 1
-  1000
-  505 999
-    12 SMALL_BUTTON_YELLOW
-    11 ACTION_YELLOW
-    800 ICONIFY
-    456 11
-    457 11
-    468 15
-    469 15
-    467 -1
-    458  0
-    459  26
-    460  0
-    461  16
-    470 1
-  1000
-  505 999
-    12 SMALL_BUTTON_CLEAR
-    11 ACTION_CLEAR
-    800 RESIZE_BL
-    456 11
-    457 11
-    468 15
-    469 15
-    467 -1
-    458  1024
-    459  -26
-    460  0
-    461  16
-    470 1
-  1000
-  505 999
-    12 SMALL_RESIZE_HANDLE
-    11 ACTION_RESIZE
-    800 RESIZE_BR
-    456 14
-    457 14
-    468 14
-    469 14
-    467 -1
-    458  1024
-    459  -14
-    460  1024
-    461  -14
-    462 -1
-   463  1024
-    464  -1
-    465  1024
-    466  -1
-    470 0
-  1000
-1000
diff --git a/abs/mv-core/e16-myth-settings/e16/cached/cfg/.data.home.mythtv..e16.themes.mine.cursors.cfg.preparsed b/abs/mv-core/e16-myth-settings/e16/cached/cfg/.data.home.mythtv..e16.themes.mine.cursors.cfg.preparsed
deleted file mode 100644
index 0cdb945..0000000
--- a/abs/mv-core/e16-myth-settings/e16/cached/cfg/.data.home.mythtv..e16.themes.mine.cursors.cfg.preparsed
+++ /dev/null
@@ -1 +0,0 @@
-1001 0
diff --git a/abs/mv-core/e16-myth-settings/e16/cached/cfg/.data.home.mythtv..e16.themes.mine.desktops.cfg.preparsed b/abs/mv-core/e16-myth-settings/e16/cached/cfg/.data.home.mythtv..e16.themes.mine.desktops.cfg.preparsed
deleted file mode 100644
index 9068752..0000000
--- a/abs/mv-core/e16-myth-settings/e16/cached/cfg/.data.home.mythtv..e16.themes.mine.desktops.cfg.preparsed
+++ /dev/null
@@ -1,13 +0,0 @@
-1001 0
-5 999;  100 "FIRST"
-  560 "255 255 255"
-  561 "backgrounds/blue.gif" 0 0 0 0 1024 1024
-  //562 "init/images/header.jpg" 1 512 512 0 0
-  564 "0"
-1000
-5 999;  100 "SECOND"
-  560 "255 255 255"
-  561 "backgrounds/yellow.gif" 0 0 0 0 1024 1024
-  562 "init/images/header.png" 1 512 512 0 0
-  564 "1"
-1000
diff --git a/abs/mv-core/e16-myth-settings/e16/cached/cfg/.data.home.mythtv..e16.themes.mine.imageclasses.cfg.preparsed b/abs/mv-core/e16-myth-settings/e16/cached/cfg/.data.home.mythtv..e16.themes.mine.imageclasses.cfg.preparsed
deleted file mode 100644
index 93f72a0..0000000
--- a/abs/mv-core/e16-myth-settings/e16/cached/cfg/.data.home.mythtv..e16.themes.mine.imageclasses.cfg.preparsed
+++ /dev/null
@@ -1,593 +0,0 @@
-1001 0
-12 999
-  100 COORDS
-  5 "common/images/bg.png"
-  371 3
-1000
-12 999
-  100 "DIALOG"
-  5 "common/images/bg.png"
-    371 3
-1000
-12 999
-  100 "DIALOG_BUTTON"
-  5 "dialogs/images/button_up.png"
-    357 14 14 4 7
-  353 "dialogs/images/button_down.png"
-  357 14 14 4 7
-  358 14 14 3 6
-  352 "dialogs/images/button_down.png"
-  357 14 14 4 7
-  358 14 14 4 7
-1000
-12 999
-  100 DIALOG_WIDGET_BUTTON
-  5 "dialogs/images/button_up.png"
-    357 14 14 4 7
-  353 "dialogs/images/button_down.png"
-  357 14 14 4 7
-  358 14 14 4 7
-  352 "dialogs/images/button_down.png"
-  357 14 14 4 7
-  358 14 14 4 7
-1000
-12 999
-  100 DIALOG_WIDGET_SEPARATOR
-  5 "dialogs/images/separator.png"
-    357 1 1 1 1
-  358 1 1 1 1
-1000
-12 999
-  100 DIALOG_WIDGET_CHECK_BUTTON
-  5 "dialogs/images/check_off.png"
-    357 0 0 0 0
-  354 "dialogs/images/check_on.png"
-    357 0 0 0 0
-  358 4 5 4 5
-1000
-12 999
-  100 DIALOG_WIDGET_RADIO_BUTTON
-  5 "dialogs/images/radio_off.png"
-    357 0 0 0 0
-  354 "dialogs/images/radio_on.png"
-    357 0 0 0 0
-  358 4 5 4 5
-1000
-12 999
-  100 DIALOG_WIDGET_SLIDER_BASE_HORIZONTAL
-  5 "dialogs/images/slider_horiz.png"
-    357 3 3 0 0
-  358 4 4 8 8
-1000
-12 999
-  100 DIALOG_WIDGET_SLIDER_KNOB_HORIZONTAL
-  5 "dialogs/images/slider_knob_horiz.png"
-    357 0 0 0 0
-  358 4 5 4 5
-1000
-12 999
-  100 DIALOG_WIDGET_SLIDER_BASE_VERTICAL
-  5 "dialogs/images/slider_vert.png"
-    357 0 0 3 3
-  358 8 8 4 4
-1000
-12 999
-  100 DIALOG_WIDGET_SLIDER_KNOB_VERTICAL
-  5 "dialogs/images/slider_knob_vert.png"
-    357 0 0 0 0
-  358 4 5 4 5
-1000
-12 999
-  100 "DIALOG_WIDGET_AREA"
-  5 "common/images/bg.png"
-  371 3
-1000
-12 999
-  100 "SETTINGS_AREADESK_AREA"
-  5 "dialogs/images/window.png"
-    357 2 2 2 2
-  358 4 4 4 4
-1000
-12 999
-  100 "SETTINGS_DESKTOP_AREA"
-  5 "common/images/bg.png"
-  371 3
-1000
-12 999
-  100 "DIALOG_WIDGET_TABLE"
-  5 "common/images/bg.png"
-  371 3
-1000
-12 999
-  100 "SETTINGS_AREA_AREA"
-  5 "common/images/bg.png"
-  371 3
-1000
-1 999
-  100 "DIALOG"
-  5 "-*-helvetica-medium-r-normal-*-*-120-*-*-*-*-*-*"
-    205 0 0 0
-    206 192 192 192
-    201 0
-1000
-1 999
-  100 "DIALOG_BUTTON"
-  5 "-*-helvetica-medium-r-normal-*-*-120-*-*-*-*-*-*"
-    204 __EFFECT_NONE
-    205 0 0 0
-    206 255 255 255
-    201 512
-1000
-1 999
-  100 "DIALOG_WIDGET_TEXT"
-  5 "-*-helvetica-medium-r-normal-*-*-120-*-*-*-*-*-*"
-  205 0 0 0
-  206 192 192 192
-  201 0
-1000
-1 999
-  100 "DIALOG_WIDGET_CHECK_BUTTON"
-  5 "-*-helvetica-medium-r-normal-*-*-120-*-*-*-*-*-*"
-  205 0 0 0
-  206 192 192 192
-  201 0
-1000
-1 999
-  100 "DIALOG_WIDGET_RADIO_BUTTON"
-  5 "-*-helvetica-medium-r-normal-*-*-120-*-*-*-*-*-*"
-  205 0 0 0
-  206 192 192 192
-  201 0
-1000
-1 999
-  100 "DIALOG_WIDGET_BUTTON"
-  5 "-*-helvetica-medium-r-normal-*-*-120-*-*-*-*-*-*"
-  205 0 0 0
-  206 255 255 255
-  201 512
-1000
-12 999
-  100 DESKTOP_DRAGBUTTON_HORIZ
-  5 "dragbar/images/dragbar_horiz.png"
-  371 3
-  352 "dragbar/images/dragbar_horiz.png"
-  371 3
-1000
-12 999
-  100 DESKTOP_RAISEBUTTON_HORIZ
-  5 "dragbar/images/uparrow.png"
-  352 "dragbar/images/uparrow_cl.png"
-1000
-12 999
-  100 DESKTOP_LOWERBUTTON_HORIZ
-  5 "dragbar/images/downarrow.png"
-  352 "dragbar/images/downarrow_cl.png"
-1000
-12 999
-  100 DESKTOP_DESKRAY_HORIZ
-  5 "dragbar/images/dragbar_horiz.png"
-  371 3
-  352 "dragbar/images/dragbar_horiz.png"
-  371 3
-1000
-12 999
-  100 DESKTOP_DRAGBUTTON_VERT
-  5 "dragbar/images/dragbar_vert.png"
-  371 3
-  352 "dragbar/images/dragbar_vert.png"
-  371 3
-1000
-12 999
-  100 DESKTOP_RAISEBUTTON_VERT
-  5 "dragbar/images/leftarrow.png"
-  352 "dragbar/images/leftarrow_cl.png"
-1000
-12 999
-  100 DESKTOP_LOWERBUTTON_VERT
-  5 "dragbar/images/rightarrow.png"
-  352 "dragbar/images/rightarrow_cl.png"
-1000
-12 999
-  100 DESKTOP_DESKRAY_VERT
-  5 "dragbar/images/dragbar_vert.png"
-  371 3
-  352 "dragbar/images/dragbar_vert.png"
-  371 3
-1000
-12 999
-  100 WARPFOCUS
-  5 "common/images/bg.png"
-  371 3
-  352 "common/images/selected.png"
-  371 3
-1000
-1 999
-  100 "WARPFOCUS"
-  5 "-*-helvetica-medium-r-normal-*-*-120-*-*-*-*-*-*"
-    205 0 0 0 0
-    206 255 255 255
-    201 0
-  352 "-*-helvetica-medium-r-normal-*-*-120-*-*-*-*-*-*"
-    205 0 0 0
-    206 255 255 255
-    201 0
-1000
-12 999
-  100 ICONBOX_HORIZONTAL
-  5 "iconbox/images/background.png"
-  371 3
-1000
-12 999
-  100 ICONBOX_VERTICAL
-  5 "iconbox/images/background.png"
-  371 3
-1000
-12 999
-  100 ICONBOX_COVER_VERTICAL
-  5 "iconbox/images/ib_cover_v.png"
-  357   6 6 6 6
-  358        4 4 4 4
-1000
-12 999
-  100 ICONBOX_COVER_HORIZONTAL
-  5 "iconbox/images/ib_cover_h.png"
-  357   6 6 6 6
-  358        4 4 4 4
-1000
-12 999
-  100 ICONBOX_ARROW_LEFT
-  5 "iconbox/images/ar_l.png"
-  357   4 4 4 4
-  352 "iconbox/images/ar_l.png"
-  357   4 4 4 4
-  358        4 4 4 4
-1000
-12 999
-  100 ICONBOX_ARROW_RIGHT
-  5 "iconbox/images/ar_r.png"
-  357   4 4 4 4
-  352 "iconbox/images/ar_r.png"
-  357   4 4 4 4
-  358        4 4 4 4
-1000
-12 999
-  100 ICONBOX_ARROW_UP
-  5 "iconbox/images/ar_u.png"
-  357   4 4 4 4
-  352 "iconbox/images/ar_u.png"
-  357   4 4 4 4
-  358        4 4 4 4
-1000
-12 999
-  100 ICONBOX_ARROW_DOWN
-  5 "iconbox/images/ar_d.png"
-  357   4 4 4 4
-  352 "iconbox/images/ar_d.png"
-  357   4 4 4 4
-  358        4 4 4 4
-1000
-12 999
-  100 ICONBOX_SCROLLBAR_BASE_HORIZONTAL
-  5 "iconbox/images/htrough.png"
-  357   5 5 0 0
-1000
-12 999
-  100 ICONBOX_SCROLLBAR_KNOB_HORIZONTAL
-  5 "iconbox/images/slh.png"
-  357   4 4 4 4
-  358        4 4 4 4
-1000
-12 999
-  100 ICONBOX_SCROLLBAR_BASE_VERTICAL
-  5 "iconbox/images/vtrough.png"
-  357   1 1 4 4
-  358        1 1 4 4
-1000
-12 999
-  100 ICONBOX_SCROLLBAR_KNOB_VERTICAL
-  5 "iconbox/images/slv.png"
-  357   4 4 4 4
-  358        4 4 4 4
-1000
-12 999
-  100 ICONBOX_TITLE_BLANK
-  5 "common/images/blank.png"
-1000
-12 999
-  100 ICONBOX_TITLE_MAIN
-  5 "tooltips/images/ttip.png"
-  357 2 3 2 3
-  358 3 4 4 4
-1000
-12 999
-  100 DEFAULT_ICON_BUTTON
-  5 "iconbox/images/bt1.png"
-  357   4 4 4 4
-  358        4 4 4 4
-1000
-1 999
-  100 "ICONBOX_WINDOW_TITLE"
-  5 "-*-helvetica-bold-r-normal-*-*-120-*-*-*-*-*-*"
-  205 0 0 0
-  206 255 255 255
-  201 0
-1000
-17 999;  100 "ICONBOX";  12  "ICONBOX_TITLE_MAIN";  641  "ICONBOX_TITLE_BLANK";  642  "ICONBOX_TITLE_BLANK";  643  "ICONBOX_TITLE_BLANK";  644  "ICONBOX_TITLE_BLANK";  646 "DO_HELP_BUTTON";  1  "ICONBOX_WINDOW_TITLE";  645  16;1000
-12 999
-  100 PAGER_SEL
-  5 "pager/images/selected.png"
-  357 2 2 2 2
-  358 2 2 2 2
-1000
-12 999
-  100 PAGER_BACKGROUND
-  5 "tooltips/images/ttip.png"
-  357 2 3 2 3
-  358 3 4 4 4
-1000
-12 999
-  100 PAGER_WIN
-  5 "pager/images/window.png"
-    357 1 1 1 1
-1000
-12 999
-  100 PAGER_TITLE_BLANK
-  5 "common/images/blank.png"
-1000
-12 999
-  100 PAGER_TITLE_MAIN
-  5 "tooltips/images/ttip.png"
-  357 2 3 2 3
-  358 3 4 4 4
-1000
-1 999
-  100 "PAGER_WINDOW_TITLE"
-  5 "-*-helvetica-bold-r-normal-*-*-120-*-*-*-*-*-*"
-  205 0 0 0
-  206 255 255 255
-  201 0
-1000
-17 999;  100 "PAGER";  12  "PAGER_TITLE_MAIN";  641  "PAGER_TITLE_BLANK";  642  "PAGER_TITLE_BLANK";  643  "PAGER_TITLE_BLANK";  644  "PAGER_TITLE_BLANK";  646 "DO_HELP_BUTTON";  1  "PAGER_WINDOW_TITLE";  645  16;1000
-12 999
-  100 RESIZE_HANDLE
-  5 "borders/DEFAULT/images/resize_handle.png"
-  354 "borders/DEFAULT/images/resize_handle.png"
-  356 "borders/DEFAULT/images/resize_handle.png"
-  355 "borders/DEFAULT/images/resize_handle.png"
-  359 "borders/DEFAULT/images/resize_handle_stick.png"
-  362 "borders/DEFAULT/images/resize_handle_stick.png"
-  364 "borders/DEFAULT/images/resize_handle_stick.png"
-  363 "borders/DEFAULT/images/resize_handle_stick.png"
-1000
-12 999
-  100 RESIZE_HANDLE_STEEL
-  5 "borders/DEFAULT/images/resize_handle_stick.png"
-  354 "borders/DEFAULT/images/resize_handle_stick.png"
-  356 "borders/DEFAULT/images/resize_handle_stick.png"
-  355 "borders/DEFAULT/images/resize_handle_stick.png"
-  359 "borders/DEFAULT/images/resize_handle_stick.png"
-  362 "borders/DEFAULT/images/resize_handle_stick.png"
-  364 "borders/DEFAULT/images/resize_handle_stick.png"
-  363 "borders/DEFAULT/images/resize_handle_stick.png"
-1000
-12 999
-  100 BUTTON_RED
-  5  "borders/DEFAULT/images/button_inactive.png"
-  354 "borders/DEFAULT/images/button_red.png"
-  356 "borders/DEFAULT/images/button_red_hi.png"
-  355 "borders/DEFAULT/images/button_red_down.png"
-  359 "borders/DEFAULT/images/button_clear2_stick.png"
-  362 "borders/DEFAULT/images/button_red_stick.png"
-  364 "borders/DEFAULT/images/button_red_stick_hi.png"
-  363 "borders/DEFAULT/images/button_red_stick_down.png"
-1000
-12 999
-  100 BUTTON_YELLOW
-  5  "borders/DEFAULT/images/button_inactive.png"
-  354 "borders/DEFAULT/images/button_yellow.png"
-  356 "borders/DEFAULT/images/button_yellow_hi.png"
-  355 "borders/DEFAULT/images/button_yellow_down.png"
-  359 "borders/DEFAULT/images/button_clear2_stick.png"
-  362 "borders/DEFAULT/images/button_yellow_stick.png"
-  364 "borders/DEFAULT/images/button_yellow_stick_hi.png"
-  363 "borders/DEFAULT/images/button_yellow_stick_down.png"
-1000
-12 999
-  100 BUTTON_GREEN
-  5  "borders/DEFAULT/images/button_inactive.png"
-  354 "borders/DEFAULT/images/button_green.png"
-  356 "borders/DEFAULT/images/button_green_hi.png"
-  355 "borders/DEFAULT/images/button_green_down.png"
-  359 "borders/DEFAULT/images/button_clear2_stick.png"
-  362 "borders/DEFAULT/images/button_green_stick.png"
-  364 "borders/DEFAULT/images/button_green_stick_hi.png"
-  363 "borders/DEFAULT/images/button_green_stick_down.png"
-1000
-12 999
-  100 BUTTON_CLEAR
-  5  "borders/DEFAULT/images/button_inactive.png"
-  354 "borders/DEFAULT/images/button_clear.png"
-  356 "borders/DEFAULT/images/button_clear_hi.png"
-  355 "borders/DEFAULT/images/button_clear_down.png"
-  359 "borders/DEFAULT/images/button_clear_stick.png"
-  362 "borders/DEFAULT/images/button_clear_stick.png"
-  364 "borders/DEFAULT/images/button_clear_stick_hi.png"
-  363 "borders/DEFAULT/images/button_clear_stick_down.png"
-1000
-12 999
-  100 TITLE_BAR
-  5  "borders/DEFAULT/images/titlebar.png"
-  357 6 6 1 1
-  354  "borders/DEFAULT/images/titlebar_active.png"
-  357 6 6 1 1
-  359 "borders/DEFAULT/images/titlebar_stick.png"
-  357 6 6 1 1
-  362 "borders/DEFAULT/images/titlebar_stick_active.png"
-  357 6 6 1 1
-1000
-12 999
-  100 TITLE
-  5  "borders/DEFAULT/images/title.png"
-  354  "borders/DEFAULT/images/title_active.png"
-  358 0 0 5 0
-  359 "borders/DEFAULT/images/title_stick.png"
-  362 "borders/DEFAULT/images/title_stick_active.png"
-1000
-12 999
-  100 TITLE_BAR_MASK
-  5  "borders/DEFAULT/images/titlebar_mask.png"
-  357 6 6 1 1
-  354  "borders/DEFAULT/images/titlebar_mask_active.png"
-  357 6 6 1 1
-  359 "borders/DEFAULT/images/titlebar_stick_mask.png"
-  357 6 6 1 1
-  362 "borders/DEFAULT/images/titlebar_stick_mask_active.png"
-  357 6 6 1 1
-1000
-12 999
-  100 BUTTON_RED_STEEL
-  5  "borders/DEFAULT/images/button_clear2_stick.png"
-  354 "borders/DEFAULT/images/button_red_stick.png"
-  356 "borders/DEFAULT/images/button_red_stick_hi.png"
-  355 "borders/DEFAULT/images/button_red_stick_down.png"
-  359 "borders/DEFAULT/images/button_clear2_stick.png"
-  362 "borders/DEFAULT/images/button_red_stick.png"
-  364 "borders/DEFAULT/images/button_red_stick_hi.png"
-  363 "borders/DEFAULT/images/button_red_stick_down.png"
-1000
-12 999
-  100 BUTTON_YELLOW_STEEL
-  5  "borders/DEFAULT/images/button_clear2_stick.png"
-  354 "borders/DEFAULT/images/button_yellow_stick.png"
-  356 "borders/DEFAULT/images/button_yellow_stick_hi.png"
-  355 "borders/DEFAULT/images/button_yellow_stick_down.png"
-  359 "borders/DEFAULT/images/button_clear2_stick.png"
-  362 "borders/DEFAULT/images/button_yellow_stick.png"
-  364 "borders/DEFAULT/images/button_yellow_stick_hi.png"
-  363 "borders/DEFAULT/images/button_yellow_stick_down.png"
-1000
-12 999
-  100 BUTTON_GREEN_STEEL
-  5  "borders/DEFAULT/images/button_clear2_stick.png"
-  354 "borders/DEFAULT/images/button_green_stick.png"
-  356 "borders/DEFAULT/images/button_green_stick_hi.png"
-  355 "borders/DEFAULT/images/button_green_stick_down.png"
-  359 "borders/DEFAULT/images/button_clear2_stick.png"
-  362 "borders/DEFAULT/images/button_green_stick.png"
-  364 "borders/DEFAULT/images/button_green_stick_hi.png"
-  363 "borders/DEFAULT/images/button_green_stick_down.png"
-1000
-12 999
-  100 BUTTON_CLEAR_STEEL
-  5  "borders/DEFAULT/images/button_clear_stick.png"
-  354 "borders/DEFAULT/images/button_clear_stick.png"
-  356 "borders/DEFAULT/images/button_clear_stick_hi.png"
-  355 "borders/DEFAULT/images/button_clear_stick_down.png"
-  359 "borders/DEFAULT/images/button_clear_stick.png"
-  362 "borders/DEFAULT/images/button_clear_stick.png"
-  364 "borders/DEFAULT/images/button_clear_stick_hi.png"
-  363 "borders/DEFAULT/images/button_clear_stick_down.png"
-1000
-12 999
-  100 TITLE_BAR_STEEL
-  5  "borders/DEFAULT/images/titlebar_stick.png"
-  357 6 6 1 1
-  354  "borders/DEFAULT/images/titlebar_stick_active.png"
-  357 6 6 1 1
-  359 "borders/DEFAULT/images/titlebar_stick.png"
-  357 6 6 1 1
-  362 "borders/DEFAULT/images/titlebar_stick_active.png"
-  357 6 6 1 1
-1000
-12 999
-  100 TITLE_STEEL
-  5  "borders/DEFAULT/images/title_stick.png"
-  354  "borders/DEFAULT/images/title_stick_active.png"
-  358 0 0 5 0
-  359 "borders/DEFAULT/images/title_stick.png"
-  362 "borders/DEFAULT/images/title_stick_active.png"
-1000
-12 999
-  100 TITLE_BAR_MASK_STEEL
-  5  "borders/DEFAULT/images/titlebar_stick_mask.png"
-  357 6 6 1 1
-  354  "borders/DEFAULT/images/titlebar_stick_mask_active.png"
-  357 6 6 1 1
-  359 "borders/DEFAULT/images/titlebar_stick_mask.png"
-  357 6 6 1 1
-  362 "borders/DEFAULT/images/titlebar_stick_mask_active.png"
-  357 6 6 1 1
-1000
-12 999
-  100 SMALL_BUTTON_RED
-  5  "borders/SMALL/images/button_inactive.png"
-  354 "borders/SMALL/images/button_red.png"
-  356 "borders/SMALL/images/button_red_hi.png"
-  355 "borders/SMALL/images/button_red_down.png"
-  359 "borders/SMALL/images/button_clear.png"
-  362 "borders/SMALL/images/button_red.png"
-  364 "borders/SMALL/images/button_red_hi.png"
-  363 "borders/SMALL/images/button_red_down.png"
-1000
-12 999
-  100 SMALL_BUTTON_YELLOW
-  5  "borders/SMALL/images/button_inactive.png"
-  354 "borders/SMALL/images/button_yellow.png"
-  356 "borders/SMALL/images/button_yellow_hi.png"
-  355 "borders/SMALL/images/button_yellow_down.png"
-  359 "borders/SMALL/images/button_clear.png"
-  362 "borders/SMALL/images/button_yellow.png"
-  364 "borders/SMALL/images/button_yellow_hi.png"
-  363 "borders/SMALL/images/button_yellow_down.png"
-1000
-12 999
-  100 SMALL_BUTTON_CLEAR
-  5  "borders/SMALL/images/button_inactive.png"
-  354 "borders/SMALL/images/button_clear.png"
-  356 "borders/SMALL/images/button_clear_hi.png"
-  355 "borders/SMALL/images/button_clear_down.png"
-  359 "borders/SMALL/images/button_clear.png"
-  362 "borders/SMALL/images/button_clear.png"
-  364 "borders/SMALL/images/button_clear_hi.png"
-  363 "borders/SMALL/images/button_clear_down.png"
-1000
-12 999
-  100 SMALL_TITLE
-  5  "borders/SMALL/images/title.png"
-  357 1 1 1 1
-  354  "borders/SMALL/images/title.png"
-  357 1 1 1 1
-  359 "borders/SMALL/images/title.png"
-  357 1 1 1 1
-  362 "borders/SMALL/images/title.png"
-  357 1 1 1 1
-1000
-12 999
-  100 SMALL_RESIZE_HANDLE
-  5 "borders/DEFAULT/images/resize_handle.png"
-  354 "borders/DEFAULT/images/resize_handle.png"
-  356 "borders/DEFAULT/images/resize_handle.png"
-  355 "borders/DEFAULT/images/resize_handle.png"
-  359 "borders/DEFAULT/images/resize_handle.png"
-  362 "borders/DEFAULT/images/resize_handle.png"
-  364 "borders/DEFAULT/images/resize_handle.png"
-  363 "borders/DEFAULT/images/resize_handle.png"
-1000
-12 999
-	100 BAR_PREFERENCES
-	5 "menus/images/preferences.png"
-	353 "menus/images/preferences_hi.png"
-	352 "menus/images/preferences_hi.png"
-1000
-12 999
-        100 BAR_SPECIAL
-        5 "menus/images/special.png"
-	353 "menus/images/special_hi.png"
-	352 "menus/images/special_hi.png"
-1000
-12 999
-        100 BAR_HELP
-        5 "menus/images/help.png"
-	353 "menus/images/help_hi.png"
-	352 "menus/images/help_hi.png"
-1000
diff --git a/abs/mv-core/e16-myth-settings/e16/cached/cfg/.data.home.mythtv..e16.themes.mine.init.cfg.preparsed b/abs/mv-core/e16-myth-settings/e16/cached/cfg/.data.home.mythtv..e16.themes.mine.init.cfg.preparsed
deleted file mode 100644
index 467da6c..0000000
--- a/abs/mv-core/e16-myth-settings/e16/cached/cfg/.data.home.mythtv..e16.themes.mine.init.cfg.preparsed
+++ /dev/null
@@ -1,38 +0,0 @@
-1001 0
-5 999;  100 "STARTUP_BACKGROUND"
-  560 "255 255 255"
-  561 "backgrounds/blue.gif" 0 0 0 0 1024 1024
-//   562 "init/images/logo.png" 1 512 1024 0 0
-  562 "init/images/header.png" 1 512 512 0 0
-1000
-12 999
-  100 STARTUP_BAR
-  5 "backgrounds/blue.gif"
-  357 0 0 0 0
-1000
-12 999
-  100 PROGRESS_BAR
-  5  "init/images/bar.png"
-  357 0 0 0 0
-  352 "init/images/bar.png"
-  357 0 0 0 0
-  354  "init/images/bar.png"
-  357 0 0 0 0
-  358 0 0 0 0 
-1000
-1 999
-  100 "PROGRESS_TEXT"
-  5 "-*-helvetica-bold-r-normal-*-*-120-*-*-*-*-*-*"
-    204 __EFFECT_NONE
-    205 0 0 0
-    206 0 0 0
-    201 0
-1000
-1 999
-  100 "PROGRESS_TEXT_NUMBER"
-  5 "-*-helvetica-bold-r-normal-*-*-120-*-*-*-*-*-*"
-    204 __EFFECT_NONE
-    205 0 0 0
-    206 0 0 0
-    201 1024
-1000
diff --git a/abs/mv-core/e16-myth-settings/e16/cached/cfg/.data.home.mythtv..e16.themes.mine.menustyles.cfg.preparsed b/abs/mv-core/e16-myth-settings/e16/cached/cfg/.data.home.mythtv..e16.themes.mine.menustyles.cfg.preparsed
deleted file mode 100644
index eb5e7f8..0000000
--- a/abs/mv-core/e16-myth-settings/e16/cached/cfg/.data.home.mythtv..e16.themes.mine.menustyles.cfg.preparsed
+++ /dev/null
@@ -1,59 +0,0 @@
-1001 0
-12 999
-  100 MENU_BG
-  5 "common/images/bg.png"
-  371 3
-1000
-12 999
-  100 MENU_SUBMENU
-  5 "menustyles/images/submenu.png"
-  357 3 8 3 3
-  358 15 15 2 2
-  353 "menustyles/images/submenu_selected.png"
-  357 3 8 3 3
-  358 15 15 2 2
-  352 "menustyles/images/submenu_selected.png"
-  357 3 8 3 3
-  358 15 15 2 2
-1000
-12 999
-  100 MENU_SELECTED
-  5 "common/images/selected.png"
-  371 3
-  358 5 5 2 2
-1000
-1 999
-  100 "MENU_TEXT"
-  5 "-*-helvetica-medium-r-normal-*-*-120-*-*-*-*-*-*"
-    205 0 0 0
-    206 192 192 192
-    201 0
-1000
-699 999;  100 "DEFAULT";  3  "VERYSMALLFIXED";  1  "MENU_TEXT";  700  "MENU_BG";  701  "MENU_SELECTED";  702  "MENU_SUBMENU";  703 0;  705  40;1000
-699 999;  100 "ROOT";  3  "TRANSIENT";  1  "MENU_TEXT";  700  "MENU_BG";  701  "MENU_SELECTED";  702  "MENU_SUBMENU";  703 0;  705  40;1000
-699 999;  100 "ROOT_IMAGE";  3  "TRANSIENT";  1  "MENU_TEXT";  700  "MENU_BG";  701  "MENU_SELECTED";  702  "MENU_SUBMENU";  703 0;  705  20;1000
-699 999;  100 "EMPTY";  3  "VERYSMALLFIXED";  1  "MENU_TEXT";  700  "MENU_BG";  701  "MENU_SELECTED";  702  "MENU_SUBMENU";  703 0;  705  40;1000
-699 999;  100 "TASK_MENU";  3  "VERYSMALLFIXED";  1  "MENU_TEXT";  700  "MENU_BG";  701  "MENU_SELECTED";  702  "MENU_SUBMENU";  703 0;  705  40;1000
-699 999;  100 "DESK_MENU";  3  "VERYSMALLFIXED";  1  "MENU_TEXT";  700  "MENU_BG";  701  "MENU_SELECTED";  702  "MENU_SUBMENU";  703 0;  705  40;1000
-2 999;  100 "MAIN_MENU";  706  "EMPTY"
-711 "Main Menu"
-707 "NULL" "Regenerate Menus";  709  exec   /usr/bin"/e_gen_menu"
-1000
-2 999;  100 "SETTINGS_MENU";  706  "EMPTY"
-711 "Settings Menu"
-707 "NULL" "Regenerate Menus";  709  exec   /usr/bin"/e_gen_menu"
-1000
-2 999;  100 "AQUA_SPECIAL";  706  "EMPTY"
-711 "Special Menu"
-707 "NULL" "Query all cache usage";  709  exec   /usr/bin"/e_cache_query all"
-707 "NULL" "Purge all caches";  709  exec   /usr/bin"/e_cache_clean all"
-707 "NULL" "Regenerate Menus";  709  exec   /usr/bin"/e_gen_menu"
-707 "NULL" "Restart Enlightenment";  709  exit        "restart"
-707 "NULL" "Log Out";  709  exit        "logout"
-1000
-2 999;  100 "AQUA_HELP_MENU";  706  "EMPTY"
-711 "Help Menu"
-707 "NULL" "Enlightenment Help";  709  exec   /usr/bin"/dox"  /usr/share/e16"/E-docs"
-707 "NULL" "About Enlightenment";  709  about  ""
-707 "NULL" "About This Theme";  709   exec   /usr/bin"/dox"  /data/home/mythtv/.e16/themes/mine"/ABOUT"
-1000
diff --git a/abs/mv-core/e16-myth-settings/e16/cached/cfg/.data.home.mythtv..e16.themes.mine.textclasses.cfg.preparsed b/abs/mv-core/e16-myth-settings/e16/cached/cfg/.data.home.mythtv..e16.themes.mine.textclasses.cfg.preparsed
deleted file mode 100644
index 22e6edc..0000000
--- a/abs/mv-core/e16-myth-settings/e16/cached/cfg/.data.home.mythtv..e16.themes.mine.textclasses.cfg.preparsed
+++ /dev/null
@@ -1,59 +0,0 @@
-1001 0
-1 999
-	100 "TEXT1"
-        5 "-*-helvetica-bold-r-normal-*-*-120-*-*-*-*-*-*"
-	204 __EFFECT_NONE
-	205 73 80 96
-	206 174 174 174
-        354 "-*-helvetica-bold-r-normal-*-*-120-*-*-*-*-*-*"
-	204 1
-	205 0 0 0
-	206 174 174 174
- 	201 512
-        362 "-*-helvetica-bold-r-normal-*-*-120-*-*-*-*-*-*"
-	204 __EFFECT_NONE
-	205 70 48 80
-  	206 255 255 255
-	201 512
-1000
-1 999
-	100 "TEXT2"
-        5 "-*-helvetica-medium-r-normal-*-*-120-*-*-*-*-*-*"
-	204 __EFFECT_NONE
-	205 0 0 0
-	206 0 0 0
-	201 1024
-        354 "-*-helvetica-medium-r-normal-*-*-120-*-*-*-*-*-*"
-	205 255 255 255
-	206 0 0 0
-	201 1024
-1000
-1 999
-	100 "TOOLTIP_TEXT"
-        5 "-*-helvetica-medium-r-normal-*-*-120-*-*-*-*-*-*"
-	204 __EFFECT_NONE
-	205 0 0 0
-	206 0 0 0
-	201 1024
-1000
-1 999
-	100 "COORDS"
-        5 "-*-helvetica-medium-r-normal-*-*-120-*-*-*-*-*-*"
-	204 __EFFECT_NONE
-	205 0 0 0
-	206 255 255 255
-	201 0
-1000
-1 999
-	100 "MENU"
-        5 "-*-helvetica-medium-r-normal-*-*-120-*-*-*-*-*-*"
-	204 __EFFECT_NONE
-	205 0 0 0
-	206 255 255 255
-	201 0
-        353 "-*-helvetica-medium-r-normal-*-*-120-*-*-*-*-*-*"
-	204 __EFFECT_NONE
-	205 255 255 255
-	206 0 0 0
-	201 0
-1000
diff --git a/abs/mv-core/e16-myth-settings/e16/cached/cfg/.data.home.mythtv..e16.themes.mine.tooltips.cfg.preparsed b/abs/mv-core/e16-myth-settings/e16/cached/cfg/.data.home.mythtv..e16.themes.mine.tooltips.cfg.preparsed
deleted file mode 100644
index 9993de6..0000000
--- a/abs/mv-core/e16-myth-settings/e16/cached/cfg/.data.home.mythtv..e16.themes.mine.tooltips.cfg.preparsed
+++ /dev/null
@@ -1,19 +0,0 @@
-1001 0
-1001 0
-12 999
-        100 TOOLTIP
-        5 "tooltips/images/ttip.png"
-        357 2 3 2 3
-        358 3 4 4 4
-1000
-12 999
-        100 TRANS
-        5 "common/images/blank.png"
-1000
-12 999
-        100 COORDS
-        5 "tooltips/images/ttip.png"
-        357 2 3 2 3
-        358 3 4 4 4
-1000
-17 999;  100 "DEFAULT";  12  "TOOLTIP";  641  "TRANS";  642  "TRANS";  643  "TRANS";  644  "TRANS";  646 "DO_HELP_BUTTON";  1  "COORDS";  645  5;1000
diff --git a/abs/mv-core/e16-myth-settings/e16/cached/cfg/.data.home.mythtv..e16.themes.mine.windowmatches.cfg.preparsed b/abs/mv-core/e16-myth-settings/e16/cached/cfg/.data.home.mythtv..e16.themes.mine.windowmatches.cfg.preparsed
deleted file mode 100644
index 9f98154..0000000
--- a/abs/mv-core/e16-myth-settings/e16/cached/cfg/.data.home.mythtv..e16.themes.mine.windowmatches.cfg.preparsed
+++ /dev/null
@@ -1,3 +0,0 @@
-1001 0
-14 999;  100  "BORDERLESS""_MATCH";  480  "BORDERLESS";  483 "Iconbox";1000
-14 999;  100  "STEEL""_MATCH";  480  "STEEL";  483 "*etscape*";1000
diff --git a/abs/mv-core/e16-myth-settings/e16/cached/cfg/.usr.share.e16.config.menus.cfg.preparsed b/abs/mv-core/e16-myth-settings/e16/cached/cfg/.usr.share.e16.config.menus.cfg.preparsed
deleted file mode 100644
index 79cad90..0000000
--- a/abs/mv-core/e16-myth-settings/e16/cached/cfg/.usr.share.e16.config.menus.cfg.preparsed
+++ /dev/null
@@ -1,4 +0,0 @@
-1001 0
-2 999;  710 "BACKGROUNDS_MENU"  "ROOT_IMAGE" "dirscan"   /data/home/mythtv/.e16"/backgrounds"
-711 "Backgrounds"
-1000
diff --git a/abs/mv-core/e16-myth-settings/e16/e_config--0.0.backgrounds b/abs/mv-core/e16-myth-settings/e16/e_config--0.0.backgrounds
deleted file mode 100644
index 0a9deb9..0000000
--- a/abs/mv-core/e16-myth-settings/e16/e_config--0.0.backgrounds
+++ /dev/null
@@ -1,17 +0,0 @@
-5 999
-100 NONE
-560 160 160 160
-1000
-5 999
-100 FIRST
-560 255 255 255
-561 /data/home/mythtv/.e16/themes/mine/backgrounds/blue.gif 0 0 0 0 1024 1024
-564 0
-1000
-5 999
-100 SECOND
-560 255 255 255
-561 /data/home/mythtv/.e16/themes/mine/backgrounds/yellow.gif 0 0 0 0 1024 1024
-562 /data/home/mythtv/.e16/themes/mine/init/images/header.png 1 512 512 0 0
-564 1
-1000
diff --git a/abs/mv-core/e16-myth-settings/e16/e_config--0.0.buttons b/abs/mv-core/e16-myth-settings/e16/e_config--0.0.buttons
deleted file mode 100755
index e69de29..0000000
--- a/abs/mv-core/e16-myth-settings/e16/e_config--0.0.buttons
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/e_config--0.0.cfg b/abs/mv-core/e16-myth-settings/e16/e_config--0.0.cfg
deleted file mode 100755
index 4994ebb..0000000
--- a/abs/mv-core/e16-myth-settings/e16/e_config--0.0.cfg
+++ /dev/null
@@ -1,159 +0,0 @@
-backgrounds.hiquality = 1
-backgrounds.user = 0
-backgrounds.timeout = 240
-compmgr.enable = 0
-compmgr.mode = 0
-compmgr.shadows.mode = 0
-compmgr.shadows.offset_x = 3
-compmgr.shadows.offset_y = 5
-compmgr.shadows.blur.radius = 5
-compmgr.shadows.blur.opacity = 75
-compmgr.shadows.sharp.opacity = 30
-compmgr.resize_fix_enable = 0
-compmgr.use_name_pixmap = 0
-compmgr.use_cow = 1
-compmgr.fading.enable = 1
-compmgr.fading.time = 200
-compmgr.override_redirect.mode = 1
-compmgr.override_redirect.opacity = 90
-desktops.num = 2
-desktops.dragdir = 2
-desktops.dragbar_width = 0
-desktops.dragbar_length = 0
-desktops.dragbar_ordering = 1
-desktops.desks_wraparound = 0
-desktops.slidein = 1
-desktops.slidespeed = 1000
-desktops.areas_nx = 1
-desktops.areas_ny = 1
-desktops.areas_wraparound = 0
-desktops.edge_flip_mode = 1
-desktops.edge_flip_resistance = 81
-effects.ripples.enabled = 0
-effects.waves.enabled = 0
-focus.mode = 1
-focus.clickraises = 1
-focus.transientsfollowleader = 1
-focus.switchfortransientmap = 1
-focus.all_new_windows_get_focus = 1
-focus.new_transients_get_focus = 0
-focus.new_transients_get_focus_if_group_focused = 0
-focus.raise_on_next = 1
-focus.warp_on_next = 0
-focus.warp_always = 0
-focus.autoraise.enable = 0
-focus.autoraise.delay = 500
-groups.dflt.iconify = 1
-groups.dflt.kill = 0
-groups.dflt.mirror = 1
-groups.dflt.move = 1
-groups.dflt.raise = 0
-groups.dflt.set_border = 1
-groups.dflt.stick = 1
-groups.dflt.shade = 1
-groups.swapmove = 1
-iconboxes.anim_time = 250
-locale.internal = 
-locale.exported = 
-menus.animate = 0
-menus.onscreen = 1
-menus.warp = 0
-menus.show_icons = 1
-menus.icon_size = 16
-menus.key.left = 0xff51
-menus.key.right = 0xff53
-menus.key.up = 0xff52
-menus.key.down = 0xff54
-menus.key.escape = 0xff1b
-menus.key.ret = 0xff0d
-misc.animation.step = 10
-misc.buttons.move_resistance = 10
-misc.dialogs.headers = 0
-misc.dialogs.button_image = 0
-misc.dock.enable = 1
-misc.dock.sticky = 1
-misc.dock.dirmode = 3
-misc.dock.startx = 0
-misc.dock.starty = 0
-misc.hints.set_xroot_info_on_root_window = 0
-misc.movres.mode_move = 0
-misc.movres.mode_resize = 2
-misc.movres.mode_info = 1
-misc.movres.color = 0xff0000
-misc.movres.avoid_server_grab = 1
-misc.movres.update_while_moving = 0
-misc.movres.enable_sync_request = 0
-misc.opacity.menus = 85
-misc.opacity.movres = 60
-misc.opacity.tooltips = 80
-misc.place.manual = 0
-misc.place.manual_mouse_pointer = 0
-misc.place.slidein = 1
-misc.place.cleanupslide = 1
-misc.place.slidemode = 0
-misc.place.slidespeedmap = 1500
-misc.place.slidespeedcleanup = 2500
-misc.place.ignore_struts = 0
-misc.place.raise_fullscreen = 0
-misc.session.enable_script = 0
-misc.session.script = $EROOT/scripts/session.sh
-misc.session.enable_logout_dialog = 0
-misc.session.enable_reboot_halt = 0
-misc.session.cmd_reboot = reboot
-misc.session.cmd_halt = poweroff
-misc.shading.animate = 0
-misc.shading.speed = 8000
-misc.snap.enable = 1
-misc.snap.edge_snap_dist = 8
-misc.snap.screen_snap_dist = 32
-misc.startup.firsttime = 0
-misc.startup.animate = 1
-misc.testing.argb_internal_objects = 0
-misc.testing.argb_internal_clients = 0
-misc.testing.argb_clients = 0
-misc.testing.argb_clients_inherit_attr = 0
-misc.testing.image_cache_size = -1
-misc.testing.mask_alpha_threshold = 8
-misc.autosave = 1
-misc.memory_paranoia = 1
-misc.save_under = 1
-pagers.enable = 0
-pagers.zoom = 1
-pagers.title = 1
-pagers.hiq = 1
-pagers.mode = 2
-pagers.scanspeed = 10
-pagers.sel_button = 2
-pagers.win_button = 1
-pagers.menu_button = 3
-sound.enable = 0
-sound.theme = 
-theme.localise = 0
-theme.name = mine
-theme.extra_path = 
-theme.ttfont_path = 
-theme.use_alt_font_cfg = 1
-theme.font_cfg = fonts.cfg.xft
-tooltips.enable = 0
-tooltips.showroottooltip = 0
-tooltips.delay = 1500
-transparency.alpha = 0
-transparency.menu = 1
-transparency.menu_item = 1
-transparency.tooltip = 1
-transparency.widget = 1
-transparency.hilight = 1
-transparency.border = 1
-transparency.iconbox = 1
-transparency.dialog = 1
-transparency.pager = 1
-transparency.warplist = 1
-warplist.enable = 1
-warplist.showsticky = 1
-warplist.showshaded = 1
-warplist.showiconified = 0
-warplist.showalldesks = 0
-warplist.warpfocused = 1
-warplist.raise_on_select = 1
-warplist.warp_on_select = 0
-warplist.icon_mode = 3
diff --git a/abs/mv-core/e16-myth-settings/e16/e_config--0.0.ibox b/abs/mv-core/e16-myth-settings/e16/e_config--0.0.ibox
deleted file mode 100755
index e69de29..0000000
--- a/abs/mv-core/e16-myth-settings/e16/e_config--0.0.ibox
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/e_config--0.0.snapshots b/abs/mv-core/e16-myth-settings/e16/e_config--0.0.snapshots
deleted file mode 100644
index afa544f..0000000
--- a/abs/mv-core/e16-myth-settings/e16/e_config--0.0.snapshots
+++ /dev/null
@@ -1,6 +0,0 @@
-NEW: rxvt.XTerm
-NAME: rxvt
-CLASS: XTerm
-RES: 800 600
-XY: 135 86 0 0
-
diff --git a/abs/mv-core/e16-myth-settings/e16/menus/epplets.menu b/abs/mv-core/e16-myth-settings/e16/menus/epplets.menu
deleted file mode 100755
index 0b3875c..0000000
--- a/abs/mv-core/e16-myth-settings/e16/menus/epplets.menu
+++ /dev/null
@@ -1 +0,0 @@
-"Enlightenment Epplets"
diff --git a/abs/mv-core/e16-myth-settings/e16/menus/file.menu b/abs/mv-core/e16-myth-settings/e16/menus/file.menu
deleted file mode 100755
index 5cd85c5..0000000
--- a/abs/mv-core/e16-myth-settings/e16/menus/file.menu
+++ /dev/null
@@ -1,4 +0,0 @@
-"Menus"
-"Application List" NULL menu "menus/user_apps.menu"
-"Restart_wm" NULL "exit restart"
-"Log Out" NULL "exit logout"
diff --git a/abs/mv-core/e16-myth-settings/e16/menus/menus_GNOME/index.menu b/abs/mv-core/e16-myth-settings/e16/menus/menus_GNOME/index.menu
deleted file mode 100755
index 612947a..0000000
--- a/abs/mv-core/e16-myth-settings/e16/menus/menus_GNOME/index.menu
+++ /dev/null
@@ -1 +0,0 @@
-"GNOME Menu"
diff --git a/abs/mv-core/e16-myth-settings/e16/menus/menus_KDE/index.menu b/abs/mv-core/e16-myth-settings/e16/menus/menus_KDE/index.menu
deleted file mode 100755
index aabbd5e..0000000
--- a/abs/mv-core/e16-myth-settings/e16/menus/menus_KDE/index.menu
+++ /dev/null
@@ -1 +0,0 @@
-"KDE Menu"
diff --git a/abs/mv-core/e16-myth-settings/e16/menus/menus_Other/AudioVideo.menu b/abs/mv-core/e16-myth-settings/e16/menus/menus_Other/AudioVideo.menu
deleted file mode 100755
index b045b08..0000000
--- a/abs/mv-core/e16-myth-settings/e16/menus/menus_Other/AudioVideo.menu
+++ /dev/null
@@ -1,3 +0,0 @@
-"AudioVideo"
-"MPlayer" "/usr/share/pixmaps/mplayer.xpm" exec "gmplayer"
-"xine" "/usr/share/pixmaps/xine.xpm" exec "xine"
diff --git a/abs/mv-core/e16-myth-settings/e16/menus/menus_Other/Network.menu b/abs/mv-core/e16-myth-settings/e16/menus/menus_Other/Network.menu
deleted file mode 100755
index a80c8e2..0000000
--- a/abs/mv-core/e16-myth-settings/e16/menus/menus_Other/Network.menu
+++ /dev/null
@@ -1,2 +0,0 @@
-"Network"
-"Opera" "/usr/share/opera/images/opera_48x48.png" exec "opera"
diff --git a/abs/mv-core/e16-myth-settings/e16/menus/menus_Other/Settings.menu b/abs/mv-core/e16-myth-settings/e16/menus/menus_Other/Settings.menu
deleted file mode 100755
index 8be174e..0000000
--- a/abs/mv-core/e16-myth-settings/e16/menus/menus_Other/Settings.menu
+++ /dev/null
@@ -1,2 +0,0 @@
-"Settings"
-"Cursor Selection" "" exec "gcursor"
diff --git a/abs/mv-core/e16-myth-settings/e16/menus/menus_Other/System.menu b/abs/mv-core/e16-myth-settings/e16/menus/menus_Other/System.menu
deleted file mode 100755
index 16c095d..0000000
--- a/abs/mv-core/e16-myth-settings/e16/menus/menus_Other/System.menu
+++ /dev/null
@@ -1,3 +0,0 @@
-"System"
-"Avahi Zeroconf Browser" "gnome-nettool" exec "/usr/bin/avahi-discover"
-"NVIDIA X Server Settings" "/usr/share/pixmaps/nvidia-settings.png" exec "/usr/bin/nvidia-settings"
diff --git a/abs/mv-core/e16-myth-settings/e16/menus/menus_Other/Utility.menu b/abs/mv-core/e16-myth-settings/e16/menus/menus_Other/Utility.menu
deleted file mode 100755
index 3d91548..0000000
--- a/abs/mv-core/e16-myth-settings/e16/menus/menus_Other/Utility.menu
+++ /dev/null
@@ -1,2 +0,0 @@
-"Utility"
-"Tilda" "/usr/share/pixmaps/tilda.png" exec "tilda"
diff --git a/abs/mv-core/e16-myth-settings/e16/menus/menus_Other/index.menu b/abs/mv-core/e16-myth-settings/e16/menus/menus_Other/index.menu
deleted file mode 100755
index 7086367..0000000
--- a/abs/mv-core/e16-myth-settings/e16/menus/menus_Other/index.menu
+++ /dev/null
@@ -1,5 +0,0 @@
-"Other Menu"
-"AudioVideo" "" menu "menus_Other/AudioVideo.menu"
-"Network" "" menu "menus_Other/Network.menu"
-"System" "" menu "menus_Other/System.menu"
-"Utility" "" menu "menus_Other/Utility.menu"
diff --git a/abs/mv-core/e16-myth-settings/e16/menus/user_apps.menu b/abs/mv-core/e16-myth-settings/e16/menus/user_apps.menu
deleted file mode 100755
index 5924142..0000000
--- a/abs/mv-core/e16-myth-settings/e16/menus/user_apps.menu
+++ /dev/null
@@ -1,21 +0,0 @@
-"User Application List"
-"Eterm" NULL exec "Eterm"
-"XTerm" NULL exec "xterm"
-"RXVT" NULL exec "rxvt"
-"Mozilla" NULL exec "mozilla"
-"Firefox" NULL exec "firefox"
-"Galeon" NULL exec "galeon"
-"Opera" NULL exec "opera"
-"Electric Eyes" NULL exec "ee"
-"Gmplayer" NULL exec "gmplayer"
-"Xine" NULL exec "xine"
-"The GIMP" NULL exec "gimp"
-"XV" NULL exec "xv"
-"GQView" NULL exec "gqview"
-"Gaim" NULL exec "gaim"
-"Grip" NULL exec "grip"
-"Xchat" NULL exec "xchat"
-"Xchat2" NULL exec "xchat2"
-"Xchat2" NULL exec "xchat-2"
-"XMag" NULL exec "xmag"
-"XMMS" NULL exec "xmms"
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/MAIN b/abs/mv-core/e16-myth-settings/e16/themes/mine/MAIN
deleted file mode 100755
index b373cfc..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/MAIN
+++ /dev/null
@@ -1,30 +0,0 @@
-<page columns=1 padding=16 name=front background=bg.png linkcolor=#88dddd>
-<img src=aqua.jpg x=170 y=99>
-<font face=vixar/14 color=#000000>
-
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br>
-<br><br><br><br>
-<p align=50%>
-This is the X-aqua-X theme for Enlightenment DR-0.16.
-<br>
-It was created based on Aqua theme  and is maintained, by Maicon Radeschi.<br>
-Aqua theme by aada a.k.a. Eric Yang eric@simweb.com<br>
-Icons of Dock by Rodolfo Gouveia - Portugal - w0lfshade@mac.com
-<br>
-email: myzz@uol.com.br
-homepage: http://www.metalozzy.hpg.com.br
-<p align=50%>
-More information is available through the README file in this theme's main
-directory.
-
-<p align=50%>
-irc.brasnet.org @ #nosmoke #web_pirates
- --> icq#53314410
\ No newline at end of file
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/actionclasses.cfg b/abs/mv-core/e16-myth-settings/e16/themes/mine/actionclasses.cfg
deleted file mode 100755
index b286318..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/actionclasses.cfg
+++ /dev/null
@@ -1,172 +0,0 @@
-#include <definitions>
-#include <borders/actions.cfg>
-#include <buttons/actions.cfg>
-#include <menus/actions.cfg>
-#include <slideouts/actions.cfg>
-__E_CFG_VERSION 0
-
-/*
-
-__ACLASS __BGN
-	__NAME MOVE_WINDOW
-	__TOOLTIP_TEXT "Button 1: Click and drag to raise and move window.  Doubleclick to shade window."
-	__TOOLTIP_TEXT "Button 2: Click to show Enlightenment Root Menu."
-	__TOOLTIP_TEXT "Button 3: Click to show Window Ops menu."
-	__TYPE __TYPE_NORMAL
-	__BUTTON 1
-	__EVENT __MOUSE_PRESS  
-	__ACTION __A_RAISE  
-	__ACTION __A_MOVE
-	__NEXT_ACTION
-	__MODIFIER_KEY __CTRL
-	__ACTION __A_SHADE
-	__NEXT_ACTION
-	__MODIFIER_KEY __NONE
-	__EVENT __DOUBLE_CLICK
-	__ACTION __A_SHADE
-	__NEXT_ACTION
-	__BUTTON 2
-	__EVENT __MOUSE_PRESS
-	__ACTION __A_SHOW_MENU "named ROOT_2"
-	__NEXT_ACTION
-	__EVENT __MOUSE_PRESS
-	__BUTTON 3   
-	__ACTION __A_SHOW_MENU "named WINOPS_MENU"
-__END
-
-__ACLASS __BGN
-        __NAME ACTION_MOVE_ONLY
-        __TOOLTIP_TEXT "Click and move mouse to move window"
-        __TYPE __TYPE_NORMAL
-        __ALLOW_ANY_MODIFIER_KEYS __ON
-	__ALLOW_ANY_BUTTON __ON
-        __EVENT __MOUSE_PRESS
-        __ACTION __A_RAISE
-        __ACTION __A_MOVE
-__END
-
-__ACLASS __BGN
-	__NAME ACTION_CLOSE
-	__TOOLTIP_TEXT "Button 1: Close window."
-	__TOOLTIP_TEXT "Button 3: Destroy window."
-	__TYPE __TYPE_NORMAL
-	__ALLOW_ANY_MODIFIER_KEYS __ON
-	__BUTTON 1
-	__EVENT __MOUSE_RELEASE
-	__ACTION __A_RAISE
-	__ACTION __A_KILL
-	__NEXT_ACTION
-	__BUTTON 3
-	__EVENT __MOUSE_RELEASE
-	__ACTION __A_RAISE
-	__ACTION __A_KILL_NASTY
-__END
-*/
-__ACLASS __BGN
-  __NAME ACTION_RESIZE_H
-  __TOOLTIP_TEXT "Hold down left mouse button and drag to resize this window"
-  __TOOLTIP_TEXT "horizontally. Clicking right mouse button and dragging the mouse"
-  __TOOLTIP_TEXT "around will move the window about instead."
-  __TYPE __TYPE_NORMAL
-  __EVENT __MOUSE_PRESS
-  __ALLOW_ANY_MODIFIER_KEYS __ON
-  __BUTTON 1
-  __ACTION __A_RESIZE_H
-  __NEXT_ACTION
-  __BUTTON 3
-  __ACTION __A_MOVE
-__END
-
-__ACLASS __BGN
-  __NAME ACTION_RESIZE_V
-  __TOOLTIP_TEXT "Hold down left mouse button and drag to resize this window"
-  __TOOLTIP_TEXT "vertically. Clicking right mouse button and dragging the mouse"
-  __TOOLTIP_TEXT "around will move the window about instead."
-  __TYPE __TYPE_NORMAL
-  __EVENT __MOUSE_PRESS
-  __ALLOW_ANY_MODIFIER_KEYS __ON
-  __BUTTON 1
-  __ACTION __A_RESIZE_V
-  __NEXT_ACTION
-  __BUTTON 3
-  __ACTION __A_MOVE
-__END
-
-/* ************ TASK STUFF ****************** */
-/*
-__ACLASS __BGN
-      __NAME TASK_CONFIG
-      __TOOLTIP_TEXT "i dont really care"
-      __TYPE __TYPE_NORMAL
-      __ALLOW_ANY_MODIFIER_KEYS __ON
-      __EVENT __MOUSE_RELEASE
-      __BUTTON 1
-      __ACTION __A_EXEC e-conf
-      __NEXT_ACTION
- __END
-
-__ACLASS __BGN
-  __NAME ACTION_MOVE2
-
-  __TOOLTIP_TEXT "Left Button: Drag to move this Window."
-
-  __ALLOW_ANY_MODIFIER_KEYS __ON
-  __ALLOW_ANY_BUTTON __ON
-  __TYPE __TYPE_NORMAL
-
-  __EVENT __MOUSE_PRESS
-    __ACTION __A_MOVE
-    __NEXT_ACTION
-__END
-*/
-__ACLASS __BGN
-  __NAME ACTION_RESIZE_H
-  __TOOLTIP_TEXT "BORDER"
-  __TYPE __TYPE_NORMAL
-  __EVENT __MOUSE_PRESS
-  __ALLOW_ANY_MODIFIER_KEYS __ON
-  __TOOLTIP_ACTION_TEXT "Drag to scale window horizontaly."
-  __BUTTON 1
-  __ACTION __A_RESIZE_H
-  __NEXT_ACTION
-  __TOOLTIP_ACTION_TEXT "Drag to move window."
-  __BUTTON 3
-  __ACTION __A_MOVE
-__END
-
-__ACLASS __BGN
-  __NAME ACTION_RESIZE_V
-  __TOOLTIP_TEXT "BORDER"
-  __ALLOW_ANY_MODIFIER_KEYS __ON
-  __TYPE __TYPE_NORMAL
-  __EVENT __MOUSE_PRESS
-  __TOOLTIP_ACTION_TEXT "Drag to scale window vertically."
-  __BUTTON 1
-  __ACTION __A_RESIZE_V
-  __NEXT_ACTION
-  __TOOLTIP_ACTION_TEXT "Drag to move window."
-  __BUTTON 3
-  __ACTION __A_MOVE
-__END
-
-__ACLASS __BGN
-	__NAME ACTION_SHADE
-	__TOOLTIP_TEXT "BORDER"
-	__TYPE __TYPE_NORMAL
-	__ALLOW_ANY_MODIFIER_KEYS __ON
-	__TOOLTIP_ACTION_TEXT "Shade window."
-	__BUTTON 1
-	__EVENT __MOUSE_RELEASE
-	__ACTION __A_SHADE
-	__NEXT_ACTION
-	__TOOLTIP_ACTION_TEXT "Make window sticky."
-	__BUTTON 2
-	__EVENT __MOUSE_RELEASE
-	__ACTION __A_STICK
-	__NEXT_ACTION
-	__TOOLTIP_ACTION_TEXT "Iconify window."
-	__BUTTON 3
-	__EVENT __MOUSE_RELEASE
-	__ACTION __A_ICONIFY
-__END
-
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/backgrounds/backgrounds.cfg b/abs/mv-core/e16-myth-settings/e16/themes/mine/backgrounds/backgrounds.cfg
deleted file mode 100755
index 289b78f..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/backgrounds/backgrounds.cfg
+++ /dev/null
@@ -1,18 +0,0 @@
-
-BEGIN_BACKGROUND ("FIRST")
-  SET_SOLID ("255 255 255")
-  ADD_BACKGROUND_SCALED ("backgrounds/blue.gif")
-  //ADD_OVERLAY_IMAGE_CENTERED("init/images/header.jpg")
-  ON_DESKTOP ("0")
-
-END_BACKGROUND
-
-
-BEGIN_BACKGROUND ("SECOND")
-  SET_SOLID ("255 255 255")
-  ADD_BACKGROUND_SCALED ("backgrounds/yellow.gif")
-  ADD_OVERLAY_IMAGE_CENTERED("init/images/header.png")
-  ON_DESKTOP ("1")
-
-END_BACKGROUND
-
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/backgrounds/blue.gif b/abs/mv-core/e16-myth-settings/e16/themes/mine/backgrounds/blue.gif
deleted file mode 100755
index e7fd10d..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/backgrounds/blue.gif
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/backgrounds/yellow.gif b/abs/mv-core/e16-myth-settings/e16/themes/mine/backgrounds/yellow.gif
deleted file mode 100755
index 6756abb..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/backgrounds/yellow.gif
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders.cfg b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders.cfg
deleted file mode 100755
index dcb0af9..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <definitions>
-__E_CFG_VERSION 0
-#include <borders/borders.cfg>
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/BORDERLESS/border.cfg b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/BORDERLESS/border.cfg
deleted file mode 100755
index 4f06093..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/BORDERLESS/border.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-__BORDER __BGN
-  __NAME BORDERLESS
-  __BORDER_SIZE_LEFT 0
-  __BORDER_SIZE_RIGHT 0
-  __BORDER_SIZE_TOP 0
-  __BORDER_SIZE_BOTTOM 0
-__END
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/border.cfg b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/border.cfg
deleted file mode 100755
index 7062ba5..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/border.cfg
+++ /dev/null
@@ -1,158 +0,0 @@
-__BORDER __BGN
-  __NAME DEFAULT
-  __BORDER_SIZE_LEFT 0
-  __BORDER_SIZE_RIGHT 0
-  __BORDER_SIZE_TOP 38
-  __BORDER_SIZE_BOTTOM 0
-  __SHADE_DIRECTION __UP
-  __CHANGES_SHAPE __OFF
-
-  __BORDER_PART __BGN
-    __ICLASS TITLE_BAR_MASK
-    __ACLASS ACTION_MOVE
-    __FLAGS __FLAG_TITLE
-    __MIN_WIDTH 4
-    __MIN_HEIGHT 22
-    __MAX_HEIGHT 22
-    __MAX_WIDTH 9999
-    __TOPLEFT_ORIGIN -1
-    __TOPLEFT_X_PERCENTAGE  0
-    __TOPLEFT_X_ABSOLUTE  0
-    __TOPLEFT_Y_PERCENTAGE  0
-    __TOPLEFT_Y_ABSOLUTE  16
-    __BOTTOMRIGHT_ORIGIN -1
-    __BOTTOMRIGHT_X_PERCENTAGE  1024
-    __BOTTOMRIGHT_X_ABSOLUTE  0
-    __BOTTOMRIGHT_Y_PERCENTAGE  0
-    __BOTTOMRIGHT_Y_ABSOLUTE  38
-    __KEEP_WHEN_SHADED __OFF
-  __END
-
-  __BORDER_PART __BGN
-    __ICLASS TITLE_BAR
-    __ACLASS ACTION_MOVE
-    __MIN_WIDTH 4
-    __MIN_HEIGHT 22
-    __MAX_HEIGHT 22
-    __MAX_WIDTH 9999
-    __TOPLEFT_ORIGIN -1
-    __TOPLEFT_X_PERCENTAGE  0
-    __TOPLEFT_X_ABSOLUTE  0
-    __TOPLEFT_Y_PERCENTAGE  0
-    __TOPLEFT_Y_ABSOLUTE  16
-    __BOTTOMRIGHT_ORIGIN -1
-    __BOTTOMRIGHT_X_PERCENTAGE  1024
-    __BOTTOMRIGHT_X_ABSOLUTE  0
-    __BOTTOMRIGHT_Y_PERCENTAGE  0
-    __BOTTOMRIGHT_Y_ABSOLUTE  38
-    __KEEP_WHEN_SHADED __ON
-  __END
-
-  __BORDER_PART __BGN
-    __ICLASS TITLE
-    __ACLASS ACTION_MOVE
-    __TCLASS TEXT1
-    __FLAGS __FLAG_TITLE
-    __MIN_WIDTH 4
-    __MIN_HEIGHT 22
-    __MAX_HEIGHT 22
-    __MAX_WIDTH 9999
-    __TOPLEFT_ORIGIN -1
-    __TOPLEFT_X_PERCENTAGE  0
-    __TOPLEFT_X_ABSOLUTE  71
-    __TOPLEFT_Y_PERCENTAGE  0
-    __TOPLEFT_Y_ABSOLUTE  16
-    __BOTTOMRIGHT_ORIGIN -1
-    __BOTTOMRIGHT_X_PERCENTAGE  1024
-    __BOTTOMRIGHT_X_ABSOLUTE  -27
-    __BOTTOMRIGHT_Y_PERCENTAGE  0
-    __BOTTOMRIGHT_Y_ABSOLUTE  38
-    __KEEP_WHEN_SHADED __ON
-  __END
-
-  __BORDER_PART __BGN
-    __ICLASS BUTTON_RED
-    __ACLASS ACTION_KILL
-    __CURSOR KILL
-    __MIN_WIDTH 15
-    __MAX_WIDTH 15
-    __MIN_HEIGHT 22
-    __MAX_HEIGHT 22
-    __TOPLEFT_ORIGIN -1
-    __TOPLEFT_X_PERCENTAGE  0
-    __TOPLEFT_X_ABSOLUTE  8
-    __TOPLEFT_Y_PERCENTAGE  0
-    __TOPLEFT_Y_ABSOLUTE  16
-    __KEEP_WHEN_SHADED __ON
-  __END
-
-  __BORDER_PART __BGN
-    __ICLASS BUTTON_YELLOW
-    __ACLASS ACTION_YELLOW
-    __CURSOR ICONIFY
-    __MIN_WIDTH 15
-    __MAX_WIDTH 15
-    __MIN_HEIGHT 22
-    __MAX_HEIGHT 22
-    __TOPLEFT_ORIGIN -1
-    __TOPLEFT_X_PERCENTAGE  0
-    __TOPLEFT_X_ABSOLUTE  30
-    __TOPLEFT_Y_PERCENTAGE  0
-    __TOPLEFT_Y_ABSOLUTE  16
-    __KEEP_WHEN_SHADED __ON
-  __END
-
-  __BORDER_PART __BGN
-    __ICLASS BUTTON_GREEN
-    __ACLASS ACTION_GREEN
-    __CURSOR MAX
-    __MIN_WIDTH 15
-    __MAX_WIDTH 15
-    __MIN_HEIGHT 22
-    __MAX_HEIGHT 22
-    __TOPLEFT_ORIGIN -1
-    __TOPLEFT_X_PERCENTAGE  0
-    __TOPLEFT_X_ABSOLUTE  52
-    __TOPLEFT_Y_PERCENTAGE  0
-    __TOPLEFT_Y_ABSOLUTE  16
-    __KEEP_WHEN_SHADED __ON
-  __END
-
-  __BORDER_PART __BGN
-    __ICLASS BUTTON_CLEAR
-    __ACLASS ACTION_CLEAR
-    __CURSOR RESIZE_BL
-    __MIN_WIDTH 15
-    __MAX_WIDTH 15
-    __MIN_HEIGHT 22
-    __MAX_HEIGHT 22
-    __TOPLEFT_ORIGIN -1
-    __TOPLEFT_X_PERCENTAGE  1024
-    __TOPLEFT_X_ABSOLUTE  -23
-    __TOPLEFT_Y_PERCENTAGE  0
-    __TOPLEFT_Y_ABSOLUTE  16
-    __KEEP_WHEN_SHADED __ON
-  __END
-
-
-  __BORDER_PART __BGN
-    __ICLASS RESIZE_HANDLE
-    __ACLASS ACTION_RESIZE
-    __CURSOR RESIZE_BR
-    __MIN_WIDTH 14
-    __MAX_WIDTH 14
-    __MIN_HEIGHT 14
-    __MAX_HEIGHT 14
-    __TOPLEFT_ORIGIN -1
-    __TOPLEFT_X_PERCENTAGE  1024
-    __TOPLEFT_X_ABSOLUTE  -14
-    __TOPLEFT_Y_PERCENTAGE  1024
-    __TOPLEFT_Y_ABSOLUTE  -14
-    __BOTTOMRIGHT_ORIGIN -1
-   __BOTTOMRIGHT_X_PERCENTAGE  1024
-    __BOTTOMRIGHT_X_ABSOLUTE  -1
-    __BOTTOMRIGHT_Y_PERCENTAGE  1024
-    __BOTTOMRIGHT_Y_ABSOLUTE  -1
-    __KEEP_WHEN_SHADED __OFF
-  __END
-__END
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_clear.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_clear.png
deleted file mode 100755
index 9adc29a..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_clear.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_clear2_stick.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_clear2_stick.png
deleted file mode 100755
index 3225ab6..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_clear2_stick.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_clear_down.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_clear_down.png
deleted file mode 100755
index e2dd177..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_clear_down.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_clear_hi.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_clear_hi.png
deleted file mode 100755
index 9573e99..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_clear_hi.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_clear_stick.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_clear_stick.png
deleted file mode 100755
index e9607a0..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_clear_stick.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_clear_stick_down.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_clear_stick_down.png
deleted file mode 100755
index bc44cb9..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_clear_stick_down.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_clear_stick_hi.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_clear_stick_hi.png
deleted file mode 100755
index 93ddf5a..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_clear_stick_hi.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_green.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_green.png
deleted file mode 100755
index c21c1ca..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_green.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_green_down.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_green_down.png
deleted file mode 100755
index e08ab23..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_green_down.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_green_hi.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_green_hi.png
deleted file mode 100755
index f7f0b61..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_green_hi.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_green_stick.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_green_stick.png
deleted file mode 100755
index 545377e..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_green_stick.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_green_stick_down.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_green_stick_down.png
deleted file mode 100755
index 039ffc3..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_green_stick_down.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_green_stick_hi.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_green_stick_hi.png
deleted file mode 100755
index 9220c60..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_green_stick_hi.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_inactive.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_inactive.png
deleted file mode 100755
index f05f9ba..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_inactive.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_red.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_red.png
deleted file mode 100755
index f86a9d8..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_red.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_red_down.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_red_down.png
deleted file mode 100755
index 6f02cf1..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_red_down.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_red_hi.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_red_hi.png
deleted file mode 100755
index 3fe4c52..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_red_hi.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_red_stick.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_red_stick.png
deleted file mode 100755
index 44d1d02..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_red_stick.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_red_stick_down.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_red_stick_down.png
deleted file mode 100755
index c3f043e..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_red_stick_down.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_red_stick_hi.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_red_stick_hi.png
deleted file mode 100755
index 55b4318..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_red_stick_hi.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_yellow.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_yellow.png
deleted file mode 100755
index 665f60e..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_yellow.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_yellow_down.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_yellow_down.png
deleted file mode 100755
index c3926f5..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_yellow_down.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_yellow_hi.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_yellow_hi.png
deleted file mode 100755
index aa49484..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_yellow_hi.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_yellow_stick.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_yellow_stick.png
deleted file mode 100755
index ca97803..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_yellow_stick.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_yellow_stick_down.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_yellow_stick_down.png
deleted file mode 100755
index b1cbfd5..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_yellow_stick_down.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_yellow_stick_hi.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_yellow_stick_hi.png
deleted file mode 100755
index e8a6cfc..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/button_yellow_stick_hi.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/buttons.xcf b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/buttons.xcf
deleted file mode 100755
index 9b0b8de..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/buttons.xcf
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/frame.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/frame.png
deleted file mode 100755
index ed8d57b..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/frame.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/resize_handle.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/resize_handle.png
deleted file mode 100755
index 48e6dc2..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/resize_handle.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/resize_handle_stick.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/resize_handle_stick.png
deleted file mode 100755
index ffe0b4e..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/resize_handle_stick.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/title.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/title.png
deleted file mode 100755
index 90b8d77..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/title.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/title_active.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/title_active.png
deleted file mode 100755
index 95d590e..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/title_active.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/title_stick.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/title_stick.png
deleted file mode 100755
index c61bc13..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/title_stick.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/title_stick_active.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/title_stick_active.png
deleted file mode 100755
index c61bc13..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/title_stick_active.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/titlebar.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/titlebar.png
deleted file mode 100755
index ffbc0f8..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/titlebar.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/titlebar_active.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/titlebar_active.png
deleted file mode 100755
index ac61e4a..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/titlebar_active.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/titlebar_mask.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/titlebar_mask.png
deleted file mode 100755
index 9598126..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/titlebar_mask.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/titlebar_mask_active.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/titlebar_mask_active.png
deleted file mode 100755
index 90b7409..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/titlebar_mask_active.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/titlebar_stick.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/titlebar_stick.png
deleted file mode 100755
index 2b5c3e0..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/titlebar_stick.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/titlebar_stick_active.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/titlebar_stick_active.png
deleted file mode 100755
index 2b5c3e0..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/titlebar_stick_active.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/titlebar_stick_mask.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/titlebar_stick_mask.png
deleted file mode 100755
index 2b5c3e0..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/titlebar_stick_mask.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/titlebar_stick_mask_active.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/titlebar_stick_mask_active.png
deleted file mode 100755
index 2b5c3e0..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/DEFAULT/images/titlebar_stick_mask_active.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/ICONBOX/border.cfg b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/ICONBOX/border.cfg
deleted file mode 100755
index c991e3d..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/ICONBOX/border.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-__BORDER __BGN
-  __NAME ICONBOX
-  __BORDER_SIZE_LEFT 0
-  __BORDER_SIZE_RIGHT 0
-  __BORDER_SIZE_TOP 0
-  __BORDER_SIZE_BOTTOM 0
-__END
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/PAGER/border.cfg b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/PAGER/border.cfg
deleted file mode 100755
index 2b6cb2b..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/PAGER/border.cfg
+++ /dev/null
@@ -1,213 +0,0 @@
-/* if i use imageclasses UNIQUe to this border - define them here WITH the */
-__ICLASS __BGN
-  __NAME PB1
-  __NORMAL "borders/PAGER/images/pb1.png"
-__END
-
-__ICLASS __BGN
-  __NAME PB2
-  __NORMAL "borders/PAGER/images/pb2.png"
-  __EDGE_SCALING 2 2 0 0
-__END
-
-__ICLASS __BGN
-  __NAME PB3
-  __NORMAL "borders/PAGER/images/pb3.png"
-__END
-
-__ICLASS __BGN
-  __NAME PB4
-  __NORMAL "borders/PAGER/images/pb4.png"
-  __EDGE_SCALING 3 4 6 7
-__END
-
-__ICLASS __BGN
-  __NAME PB5
-  __NORMAL "borders/PAGER/images/pb5.png"
-  __EDGE_SCALING 2 2 0 0
-__END
-
-__ICLASS __BGN
-  __NAME PB6
-  __NORMAL "borders/PAGER/images/pb6.png"
-__END
-
-__ICLASS __BGN
-  __NAME PB7
-  __NORMAL "borders/PAGER/images/pb8.png"
-  __EDGE_SCALING 0 0 2 2
-__END
-
-/* now start the border defs */
-
-__BORDER __BGN
-  __NAME PAGER
-  __BORDER_GROUP_NAME PAGER_GROUP
-  __BORDER_SIZE_LEFT 3
-  __BORDER_SIZE_RIGHT 12
-  __BORDER_SIZE_TOP 19
-  __BORDER_SIZE_BOTTOM 3
-  __SHADE_DIRECTION __LEFT
-  __CHANGES_SHAPE __OFF
-
-/* 0 */
-  __BORDER_PART __BGN
-    __ICLASS PB1
-    __ACLASS ACTION_RESIZE
-    __CURSOR RESIZE_BR
-    __MIN_WIDTH 3
-    __MAX_WIDTH 3
-    __MIN_HEIGHT 3
-    __MAX_HEIGHT 3
-    __TOPLEFT_ORIGIN -1
-    __TOPLEFT_X_PERCENTAGE  0
-    __TOPLEFT_X_ABSOLUTE  0
-    __TOPLEFT_Y_PERCENTAGE  0
-    __TOPLEFT_Y_ABSOLUTE  16
-    __BOTTOMRIGHT_ORIGIN -1
-    __BOTTOMRIGHT_X_PERCENTAGE  0
-    __BOTTOMRIGHT_X_ABSOLUTE  2
-    __BOTTOMRIGHT_Y_PERCENTAGE  0
-    __BOTTOMRIGHT_Y_ABSOLUTE  2
-    __KEEP_WHEN_SHADED __ON
-    __KEEP_ON_TOP __OFF
-  __END
-
-/* 1 */
-  __BORDER_PART __BGN
-    __ICLASS PB2
-    __ACLASS ACTION_MOVE
-    __MIN_WIDTH 0
-    __MAX_WIDTH 99999
-    __MIN_HEIGHT 3
-    __MAX_HEIGHT 3
-    __TOPLEFT_ORIGIN -1
-    __TOPLEFT_X_PERCENTAGE  0
-    __TOPLEFT_X_ABSOLUTE  3
-    __TOPLEFT_Y_PERCENTAGE  0
-    __TOPLEFT_Y_ABSOLUTE  16
-    __BOTTOMRIGHT_ORIGIN -1
-    __BOTTOMRIGHT_X_PERCENTAGE  1024
-    __BOTTOMRIGHT_X_ABSOLUTE  -13
-    __BOTTOMRIGHT_Y_PERCENTAGE  0
-    __BOTTOMRIGHT_Y_ABSOLUTE  2
-    __KEEP_WHEN_SHADED __OFF
-    __KEEP_ON_TOP __OFF
-  __END
-
-/* 2 */
-  __BORDER_PART __BGN
-    __ICLASS PB3
-    __ACLASS ACTION_SHADE
-    __CURSOR ICONIFY
-    __MIN_WIDTH 12
-    __MAX_WIDTH 12
-    __MIN_HEIGHT 21
-    __MAX_HEIGHT 21
-    __TOPLEFT_ORIGIN -1
-    __TOPLEFT_X_PERCENTAGE  1024
-    __TOPLEFT_X_ABSOLUTE  -12
-    __TOPLEFT_Y_PERCENTAGE  0
-    __TOPLEFT_Y_ABSOLUTE  16
-    __BOTTOMRIGHT_ORIGIN -1
-    __BOTTOMRIGHT_X_PERCENTAGE  1024
-    __BOTTOMRIGHT_X_ABSOLUTE  -1
-    __BOTTOMRIGHT_Y_PERCENTAGE  0
-    __BOTTOMRIGHT_Y_ABSOLUTE  20
-    __KEEP_WHEN_SHADED __ON
-    __KEEP_ON_TOP __OFF
-  __END
-
-/* 3 */
-  __BORDER_PART __BGN
-    __ICLASS PB4
-    __ACLASS ACTION_SHADE
-    __CURSOR ICONIFY
-    __MIN_WIDTH 12
-    __MAX_WIDTH 12
-    __MIN_HEIGHT 13
-    __MAX_HEIGHT 99999
-    __TOPLEFT_ORIGIN -1
-    __TOPLEFT_X_PERCENTAGE  1024
-    __TOPLEFT_X_ABSOLUTE  -12
-    __TOPLEFT_Y_PERCENTAGE  0
-    __TOPLEFT_Y_ABSOLUTE  37
-    __BOTTOMRIGHT_ORIGIN -1
-    __BOTTOMRIGHT_X_PERCENTAGE  1024
-    __BOTTOMRIGHT_X_ABSOLUTE  -1
-    __BOTTOMRIGHT_Y_PERCENTAGE  1024
-    __BOTTOMRIGHT_Y_ABSOLUTE  -1
-    __KEEP_WHEN_SHADED __ON
-    __KEEP_ON_TOP __OFF
-  __END
-
-/* 4 */
-  __BORDER_PART __BGN
-    __ICLASS PB5
-    __ACLASS ACTION_RESIZE_V
-    __CURSOR RESIZE_V
-    __MIN_WIDTH 0
-    __MAX_WIDTH 99999
-    __MIN_HEIGHT 3
-    __MAX_HEIGHT 3
-    __TOPLEFT_ORIGIN -1
-    __TOPLEFT_X_PERCENTAGE  0
-    __TOPLEFT_X_ABSOLUTE  3
-    __TOPLEFT_Y_PERCENTAGE  1024
-    __TOPLEFT_Y_ABSOLUTE  -3
-    __BOTTOMRIGHT_ORIGIN -1
-    __BOTTOMRIGHT_X_PERCENTAGE  1024
-    __BOTTOMRIGHT_X_ABSOLUTE  -13
-    __BOTTOMRIGHT_Y_PERCENTAGE  1024
-    __BOTTOMRIGHT_Y_ABSOLUTE  -1
-    __KEEP_WHEN_SHADED __OFF
-    __KEEP_ON_TOP __OFF
-  __END
-
-/* 5 */
-  __BORDER_PART __BGN
-    __ICLASS PB6
-    __ACLASS ACTION_RESIZE
-    __CURSOR RESIZE_TR
-    __MIN_WIDTH 3
-    __MAX_WIDTH 3
-    __MIN_HEIGHT 3
-    __MAX_HEIGHT 3
-    __TOPLEFT_ORIGIN -1
-    __TOPLEFT_X_PERCENTAGE  0
-    __TOPLEFT_X_ABSOLUTE  0
-    __TOPLEFT_Y_PERCENTAGE  1024
-    __TOPLEFT_Y_ABSOLUTE  -3
-    __BOTTOMRIGHT_ORIGIN -1
-    __BOTTOMRIGHT_X_PERCENTAGE  0
-    __BOTTOMRIGHT_X_ABSOLUTE  2
-    __BOTTOMRIGHT_Y_PERCENTAGE  1024
-    __BOTTOMRIGHT_Y_ABSOLUTE  -1
-    __KEEP_WHEN_SHADED __ON
-    __KEEP_ON_TOP __OFF
-  __END
-
-/* 6 */
-  __BORDER_PART __BGN
-    __ICLASS PB7
-    __ACLASS ACTION_RESIZE_H
-    __CURSOR RESIZE_H
-    __MIN_WIDTH 3
-    __MAX_WIDTH 3
-    __MIN_HEIGHT 0
-    __MAX_HEIGHT 99999
-    __TOPLEFT_ORIGIN -1
-    __TOPLEFT_X_PERCENTAGE  0
-    __TOPLEFT_X_ABSOLUTE  0
-    __TOPLEFT_Y_PERCENTAGE  0
-    __TOPLEFT_Y_ABSOLUTE  19
-    __BOTTOMRIGHT_ORIGIN -1
-    __BOTTOMRIGHT_X_PERCENTAGE  0
-    __BOTTOMRIGHT_X_ABSOLUTE  2
-    __BOTTOMRIGHT_Y_PERCENTAGE  1024
-    __BOTTOMRIGHT_Y_ABSOLUTE  -3
-    __KEEP_WHEN_SHADED __ON
-    __KEEP_ON_TOP __OFF
-  __END
-
-__END
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/PAGER/images/pb1.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/PAGER/images/pb1.png
deleted file mode 100755
index 942d77e..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/PAGER/images/pb1.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/PAGER/images/pb2.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/PAGER/images/pb2.png
deleted file mode 100755
index b116849..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/PAGER/images/pb2.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/PAGER/images/pb3.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/PAGER/images/pb3.png
deleted file mode 100755
index ebf00ca..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/PAGER/images/pb3.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/PAGER/images/pb4.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/PAGER/images/pb4.png
deleted file mode 100755
index bd384f2..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/PAGER/images/pb4.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/PAGER/images/pb5.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/PAGER/images/pb5.png
deleted file mode 100755
index fb57603..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/PAGER/images/pb5.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/PAGER/images/pb6.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/PAGER/images/pb6.png
deleted file mode 100755
index 2585be1..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/PAGER/images/pb6.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/PAGER/images/pb8.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/PAGER/images/pb8.png
deleted file mode 100755
index 5dce7e2..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/PAGER/images/pb8.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/RIGHT_PAGER/border.cfg b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/RIGHT_PAGER/border.cfg
deleted file mode 100755
index 40bc4dd..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/RIGHT_PAGER/border.cfg
+++ /dev/null
@@ -1,212 +0,0 @@
-/* if i use imageclasses UNIQUe to this border - define them here WITH the */
-__ICLASS __BGN
-  __NAME RPB1
-  __NORMAL "borders/RIGHT_PAGER/images/pb1.png"
-__END
-
-__ICLASS __BGN
-  __NAME RPB2
-  __NORMAL "borders/RIGHT_PAGER/images/pb2.png"
-  __EDGE_SCALING 2 2 0 0
-__END
-
-__ICLASS __BGN
-  __NAME RPB3
-  __NORMAL "borders/RIGHT_PAGER/images/pb3.png"
-__END
-
-__ICLASS __BGN
-  __NAME RPB4
-  __NORMAL "borders/RIGHT_PAGER/images/pb4.png"
-  __EDGE_SCALING 3 4 6 7
-__END
-
-__ICLASS __BGN
-  __NAME RPB5
-  __NORMAL "borders/RIGHT_PAGER/images/pb5.png"
-  __EDGE_SCALING 2 2 0 0
-__END
-
-__ICLASS __BGN
-  __NAME RPB6
-  __NORMAL "borders/RIGHT_PAGER/images/pb6.png"
-__END
-
-__ICLASS __BGN
-  __NAME RPB7
-  __NORMAL "borders/RIGHT_PAGER/images/pb8.png"
-  __EDGE_SCALING 0 0 2 2
-__END
-
-/* now start the border defs */
-
-__BORDER __BGN
-  __NAME RIGHT_PAGER
-  __BORDER_GROUP_NAME RIGHT_PAGER_GROUP
-  __BORDER_SIZE_LEFT 12
-  __BORDER_SIZE_RIGHT 3
-  __BORDER_SIZE_TOP 19
-  __BORDER_SIZE_BOTTOM 3
-  __SHADE_DIRECTION __RIGHT
-  __CHANGES_SHAPE __OFF
-
-/* 0 */
-  __BORDER_PART __BGN
-    __ICLASS RPB1
-    __ACLASS ACTION_RESIZE
-    __CURSOR RESIZE_TR
-    __MIN_WIDTH 3
-    __MAX_WIDTH 3
-    __MIN_HEIGHT 3
-    __MAX_HEIGHT 3
-    __TOPLEFT_ORIGIN -1
-    __TOPLEFT_X_PERCENTAGE  1024
-    __TOPLEFT_X_ABSOLUTE  -3
-    __TOPLEFT_Y_PERCENTAGE  0
-    __TOPLEFT_Y_ABSOLUTE  16
-    __BOTTOMRIGHT_ORIGIN -1
-    __BOTTOMRIGHT_X_PERCENTAGE  1024
-    __BOTTOMRIGHT_X_ABSOLUTE  0
-    __BOTTOMRIGHT_Y_PERCENTAGE  0
-    __BOTTOMRIGHT_Y_ABSOLUTE  3
-    __KEEP_WHEN_SHADED __ON
-    __KEEP_ON_TOP __OFF
-  __END
-
-/* 1 */
-  __BORDER_PART __BGN
-    __ICLASS RPB2
-    __ACLASS ACTION_MOVE
-    __MIN_WIDTH 0
-    __MAX_WIDTH 99999
-    __MIN_HEIGHT 3
-    __MAX_HEIGHT 3
-    __TOPLEFT_ORIGIN -1
-    __TOPLEFT_X_PERCENTAGE  0
-    __TOPLEFT_X_ABSOLUTE  12
-    __TOPLEFT_Y_PERCENTAGE  0
-    __TOPLEFT_Y_ABSOLUTE  16
-    __BOTTOMRIGHT_ORIGIN -1
-    __BOTTOMRIGHT_X_PERCENTAGE  1024
-    __BOTTOMRIGHT_X_ABSOLUTE  -3
-    __BOTTOMRIGHT_Y_PERCENTAGE  0
-    __BOTTOMRIGHT_Y_ABSOLUTE  2
-    __KEEP_WHEN_SHADED __OFF
-    __KEEP_ON_TOP __OFF
-  __END
-
-/* 2 */
-  __BORDER_PART __BGN
-    __ICLASS RPB3
-    __ACLASS ACTION_SHADE
-    __CURSOR ICONIFY
-    __MIN_WIDTH 12
-    __MAX_WIDTH 12
-    __MIN_HEIGHT 21
-    __MAX_HEIGHT 21
-    __TOPLEFT_ORIGIN -1
-    __TOPLEFT_X_PERCENTAGE  0
-    __TOPLEFT_X_ABSOLUTE  0
-    __TOPLEFT_Y_PERCENTAGE  0
-    __TOPLEFT_Y_ABSOLUTE  16
-    __BOTTOMRIGHT_ORIGIN -1
-    __BOTTOMRIGHT_X_PERCENTAGE  0
-    __BOTTOMRIGHT_X_ABSOLUTE  11
-    __BOTTOMRIGHT_Y_PERCENTAGE  0
-    __BOTTOMRIGHT_Y_ABSOLUTE  20
-    __KEEP_WHEN_SHADED __ON
-    __KEEP_ON_TOP __OFF
-  __END
-
-/* 3 */
-  __BORDER_PART __BGN
-    __ICLASS RPB4
-    __ACLASS ACTION_SHADE
-    __CURSOR ICONIFY
-    __MIN_WIDTH 12
-    __MAX_WIDTH 12
-    __MIN_HEIGHT 13
-    __MAX_HEIGHT 99999
-    __TOPLEFT_ORIGIN -1
-    __TOPLEFT_X_PERCENTAGE  0
-    __TOPLEFT_X_ABSOLUTE  0
-    __TOPLEFT_Y_PERCENTAGE  0
-    __TOPLEFT_Y_ABSOLUTE  37
-    __BOTTOMRIGHT_ORIGIN -1
-    __BOTTOMRIGHT_X_PERCENTAGE  0
-    __BOTTOMRIGHT_X_ABSOLUTE  13
-    __BOTTOMRIGHT_Y_PERCENTAGE  1024
-    __BOTTOMRIGHT_Y_ABSOLUTE  -1
-    __KEEP_WHEN_SHADED __ON
-    __KEEP_ON_TOP __OFF
-  __END
-
-/* 4 */
-  __BORDER_PART __BGN
-    __ICLASS RPB5
-    __ACLASS ACTION_RESIZE_V
-    __CURSOR RESIZE_V
-    __MIN_WIDTH 0
-    __MAX_WIDTH 99999
-    __MIN_HEIGHT 3
-    __MAX_HEIGHT 3
-    __TOPLEFT_ORIGIN -1
-    __TOPLEFT_X_PERCENTAGE  0
-    __TOPLEFT_X_ABSOLUTE  12
-    __TOPLEFT_Y_PERCENTAGE  1024
-    __TOPLEFT_Y_ABSOLUTE  -3
-    __BOTTOMRIGHT_ORIGIN -1
-    __BOTTOMRIGHT_X_PERCENTAGE  1024
-    __BOTTOMRIGHT_X_ABSOLUTE  -3
-    __BOTTOMRIGHT_Y_PERCENTAGE  1024
-    __BOTTOMRIGHT_Y_ABSOLUTE  0
-    __KEEP_WHEN_SHADED __OFF
-    __KEEP_ON_TOP __OFF
-  __END
-
-/* 5 */
-  __BORDER_PART __BGN
-    __ICLASS RPB6
-    __ACLASS ACTION_RESIZE
-    __CURSOR RESIZE_BR
-    __MIN_WIDTH 3
-    __MAX_WIDTH 3
-    __MIN_HEIGHT 3
-    __MAX_HEIGHT 3
-    __TOPLEFT_ORIGIN -1
-    __TOPLEFT_X_PERCENTAGE  1024
-    __TOPLEFT_X_ABSOLUTE  -3
-    __TOPLEFT_Y_PERCENTAGE  1024
-    __TOPLEFT_Y_ABSOLUTE  -3
-    __BOTTOMRIGHT_ORIGIN -1
-    __BOTTOMRIGHT_X_PERCENTAGE  1024
-    __BOTTOMRIGHT_X_ABSOLUTE  0
-    __BOTTOMRIGHT_Y_PERCENTAGE  1024
-    __BOTTOMRIGHT_Y_ABSOLUTE 0 
-    __KEEP_WHEN_SHADED __ON
-    __KEEP_ON_TOP __OFF
-  __END
-
-/* 6 */
-  __BORDER_PART __BGN
-    __ICLASS RPB7
-    __ACLASS ACTION_RESIZE_H
-    __CURSOR RESIZE_H
-    __MIN_WIDTH 3
-    __MAX_WIDTH 3
-    __MIN_HEIGHT 0
-    __MAX_HEIGHT 99999
-    __TOPLEFT_ORIGIN -1
-    __TOPLEFT_X_PERCENTAGE  1024
-    __TOPLEFT_X_ABSOLUTE  -3
-    __TOPLEFT_Y_PERCENTAGE  0
-    __TOPLEFT_Y_ABSOLUTE  19
-    __BOTTOMRIGHT_ORIGIN -1
-    __BOTTOMRIGHT_X_PERCENTAGE  1024
-    __BOTTOMRIGHT_X_ABSOLUTE  0
-    __BOTTOMRIGHT_Y_PERCENTAGE  1024
-    __BOTTOMRIGHT_Y_ABSOLUTE  -3
-    __KEEP_WHEN_SHADED __ON
-    __KEEP_ON_TOP __OFF
-  __END
-__END
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/RIGHT_PAGER/images/pb1.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/RIGHT_PAGER/images/pb1.png
deleted file mode 100755
index 2451158..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/RIGHT_PAGER/images/pb1.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/RIGHT_PAGER/images/pb2.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/RIGHT_PAGER/images/pb2.png
deleted file mode 100755
index b116849..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/RIGHT_PAGER/images/pb2.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/RIGHT_PAGER/images/pb3.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/RIGHT_PAGER/images/pb3.png
deleted file mode 100755
index 0357ad7..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/RIGHT_PAGER/images/pb3.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/RIGHT_PAGER/images/pb4.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/RIGHT_PAGER/images/pb4.png
deleted file mode 100755
index 5abe208..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/RIGHT_PAGER/images/pb4.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/RIGHT_PAGER/images/pb5.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/RIGHT_PAGER/images/pb5.png
deleted file mode 100755
index fb57603..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/RIGHT_PAGER/images/pb5.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/RIGHT_PAGER/images/pb6.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/RIGHT_PAGER/images/pb6.png
deleted file mode 100755
index 27b172b..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/RIGHT_PAGER/images/pb6.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/RIGHT_PAGER/images/pb8.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/RIGHT_PAGER/images/pb8.png
deleted file mode 100755
index f61b00a..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/RIGHT_PAGER/images/pb8.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/border.cfg b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/border.cfg
deleted file mode 100755
index b8ead49..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/border.cfg
+++ /dev/null
@@ -1,121 +0,0 @@
-__BORDER __BGN
-  __NAME SMALL
-  __BORDER_SIZE_LEFT 0
-  __BORDER_SIZE_RIGHT 0
-  __BORDER_SIZE_TOP 32
-  __BORDER_SIZE_BOTTOM 0
-  __SHADE_DIRECTION __UP
-  __CHANGES_SHAPE __OFF
-
-  __BORDER_PART __BGN
-    __ICLASS SMALL_TITLE
-    __ACLASS ACTION_MOVE
-    __MIN_WIDTH 50
-    __MIN_HEIGHT 16
-    __MAX_HEIGHT 16
-    __MAX_WIDTH 9999
-    __TOPLEFT_ORIGIN -1
-    __TOPLEFT_X_PERCENTAGE  0
-    __TOPLEFT_X_ABSOLUTE  0
-    __TOPLEFT_Y_PERCENTAGE  0
-    __TOPLEFT_Y_ABSOLUTE  16
-    __BOTTOMRIGHT_ORIGIN -1
-    __BOTTOMRIGHT_X_PERCENTAGE  1024
-    __BOTTOMRIGHT_X_ABSOLUTE  0
-    __BOTTOMRIGHT_Y_PERCENTAGE  0
-    __BOTTOMRIGHT_Y_ABSOLUTE  32
-    __KEEP_WHEN_SHADED __ON
-  __END
-
-  __BORDER_PART __BGN
-    __ICLASS SMALL_TITLE
-    __ACLASS ACTION_MOVE
-    __TCLASS TEXT1
-    __FLAGS __FLAG_TITLE
-    __MIN_WIDTH 50
-    __MIN_HEIGHT 16
-    __MAX_HEIGHT 16
-    __MAX_WIDTH 9999
-    __TOPLEFT_ORIGIN -1
-    __TOPLEFT_X_PERCENTAGE  0
-    __TOPLEFT_X_ABSOLUTE  42
-    __TOPLEFT_Y_PERCENTAGE  0
-    __TOPLEFT_Y_ABSOLUTE  16
-    __BOTTOMRIGHT_ORIGIN -1
-    __BOTTOMRIGHT_X_PERCENTAGE  1024
-    __BOTTOMRIGHT_X_ABSOLUTE  -34
-    __BOTTOMRIGHT_Y_PERCENTAGE  0
-    __BOTTOMRIGHT_Y_ABSOLUTE  32
-    __KEEP_WHEN_SHADED __ON
-  __END
-
-  __BORDER_PART __BGN
-    __ICLASS SMALL_BUTTON_RED
-    __ACLASS ACTION_KILL
-    __CURSOR KILL
-    __MIN_WIDTH 11
-    __MAX_WIDTH 11
-    __MIN_HEIGHT 15
-    __MAX_HEIGHT 15
-    __TOPLEFT_ORIGIN -1
-    __TOPLEFT_X_PERCENTAGE  0
-    __TOPLEFT_X_ABSOLUTE  8
-    __TOPLEFT_Y_PERCENTAGE  0
-    __TOPLEFT_Y_ABSOLUTE  16
-    __KEEP_WHEN_SHADED __ON
-  __END
-
-  __BORDER_PART __BGN
-    __ICLASS SMALL_BUTTON_YELLOW
-    __ACLASS ACTION_YELLOW
-    __CURSOR ICONIFY
-    __MIN_WIDTH 11
-    __MAX_WIDTH 11
-    __MIN_HEIGHT 15
-    __MAX_HEIGHT 15
-    __TOPLEFT_ORIGIN -1
-    __TOPLEFT_X_PERCENTAGE  0
-    __TOPLEFT_X_ABSOLUTE  26
-    __TOPLEFT_Y_PERCENTAGE  0
-    __TOPLEFT_Y_ABSOLUTE  16
-    __KEEP_WHEN_SHADED __ON
-  __END
-
-  __BORDER_PART __BGN
-    __ICLASS SMALL_BUTTON_CLEAR
-    __ACLASS ACTION_CLEAR
-    __CURSOR RESIZE_BL
-    __MIN_WIDTH 11
-    __MAX_WIDTH 11
-    __MIN_HEIGHT 15
-    __MAX_HEIGHT 15
-    __TOPLEFT_ORIGIN -1
-    __TOPLEFT_X_PERCENTAGE  1024
-    __TOPLEFT_X_ABSOLUTE  -26
-    __TOPLEFT_Y_PERCENTAGE  0
-    __TOPLEFT_Y_ABSOLUTE  16
-    __KEEP_WHEN_SHADED __ON
-  __END
-
-
-  __BORDER_PART __BGN
-    __ICLASS SMALL_RESIZE_HANDLE
-    __ACLASS ACTION_RESIZE
-    __CURSOR RESIZE_BR
-    __MIN_WIDTH 14
-    __MAX_WIDTH 14
-    __MIN_HEIGHT 14
-    __MAX_HEIGHT 14
-    __TOPLEFT_ORIGIN -1
-    __TOPLEFT_X_PERCENTAGE  1024
-    __TOPLEFT_X_ABSOLUTE  -14
-    __TOPLEFT_Y_PERCENTAGE  1024
-    __TOPLEFT_Y_ABSOLUTE  -14
-    __BOTTOMRIGHT_ORIGIN -1
-   __BOTTOMRIGHT_X_PERCENTAGE  1024
-    __BOTTOMRIGHT_X_ABSOLUTE  -1
-    __BOTTOMRIGHT_Y_PERCENTAGE  1024
-    __BOTTOMRIGHT_Y_ABSOLUTE  -1
-    __KEEP_WHEN_SHADED __OFF
-  __END
-__END
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/button_clear.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/button_clear.png
deleted file mode 100755
index b67d054..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/button_clear.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/button_clear_down.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/button_clear_down.png
deleted file mode 100755
index 38748dd..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/button_clear_down.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/button_clear_hi.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/button_clear_hi.png
deleted file mode 100755
index 8ccf315..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/button_clear_hi.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/button_inactive.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/button_inactive.png
deleted file mode 100755
index b67d054..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/button_inactive.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/button_red.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/button_red.png
deleted file mode 100755
index a148c63..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/button_red.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/button_red_down.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/button_red_down.png
deleted file mode 100755
index fb978e9..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/button_red_down.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/button_red_hi.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/button_red_hi.png
deleted file mode 100755
index ca82dc2..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/button_red_hi.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/button_yellow.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/button_yellow.png
deleted file mode 100755
index 4be4903..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/button_yellow.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/button_yellow_down.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/button_yellow_down.png
deleted file mode 100755
index 06809db..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/button_yellow_down.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/button_yellow_hi.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/button_yellow_hi.png
deleted file mode 100755
index d4681df..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/button_yellow_hi.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/title.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/title.png
deleted file mode 100755
index 814f85e..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/SMALL/images/title.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/STEEL/border.cfg b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/STEEL/border.cfg
deleted file mode 100755
index 5ed5eea..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/STEEL/border.cfg
+++ /dev/null
@@ -1,158 +0,0 @@
-__BORDER __BGN
-  __NAME STEEL
-  __BORDER_SIZE_LEFT 0
-  __BORDER_SIZE_RIGHT 0
-  __BORDER_SIZE_TOP 38
-  __BORDER_SIZE_BOTTOM 0
-  __SHADE_DIRECTION __UP
-  __CHANGES_SHAPE __OFF
-
-  __BORDER_PART __BGN
-    __ICLASS TITLE_BAR_MASK_STEEL
-    __ACLASS ACTION_MOVE
-    __FLAGS __FLAG_TITLE
-    __MIN_WIDTH 4
-    __MIN_HEIGHT 22
-    __MAX_HEIGHT 22
-    __MAX_WIDTH 9999
-    __TOPLEFT_ORIGIN -1
-    __TOPLEFT_X_PERCENTAGE  0
-    __TOPLEFT_X_ABSOLUTE  0
-    __TOPLEFT_Y_PERCENTAGE  0
-    __TOPLEFT_Y_ABSOLUTE  16
-    __BOTTOMRIGHT_ORIGIN -1
-    __BOTTOMRIGHT_X_PERCENTAGE  1024
-    __BOTTOMRIGHT_X_ABSOLUTE  0
-    __BOTTOMRIGHT_Y_PERCENTAGE  0
-    __BOTTOMRIGHT_Y_ABSOLUTE  38
-    __KEEP_WHEN_SHADED __OFF
-  __END
-
-  __BORDER_PART __BGN
-    __ICLASS TITLE_BAR_STEEL
-    __ACLASS ACTION_MOVE
-    __MIN_WIDTH 4
-    __MIN_HEIGHT 22
-    __MAX_HEIGHT 22
-    __MAX_WIDTH 9999
-    __TOPLEFT_ORIGIN -1
-    __TOPLEFT_X_PERCENTAGE  0
-    __TOPLEFT_X_ABSOLUTE  0
-    __TOPLEFT_Y_PERCENTAGE  0
-    __TOPLEFT_Y_ABSOLUTE  16
-    __BOTTOMRIGHT_ORIGIN -1
-    __BOTTOMRIGHT_X_PERCENTAGE  1024
-    __BOTTOMRIGHT_X_ABSOLUTE  0
-    __BOTTOMRIGHT_Y_PERCENTAGE  0
-    __BOTTOMRIGHT_Y_ABSOLUTE  38
-    __KEEP_WHEN_SHADED __ON
-  __END
-
-  __BORDER_PART __BGN
-    __ICLASS TITLE_STEEL
-    __ACLASS ACTION_MOVE
-    __TCLASS TEXT1
-    __FLAGS __FLAG_TITLE
-    __MIN_WIDTH 4
-    __MIN_HEIGHT 22
-    __MAX_HEIGHT 22
-    __MAX_WIDTH 9999
-    __TOPLEFT_ORIGIN -1
-    __TOPLEFT_X_PERCENTAGE  0
-    __TOPLEFT_X_ABSOLUTE  71
-    __TOPLEFT_Y_PERCENTAGE  0
-    __TOPLEFT_Y_ABSOLUTE  16
-    __BOTTOMRIGHT_ORIGIN -1
-    __BOTTOMRIGHT_X_PERCENTAGE  1024
-    __BOTTOMRIGHT_X_ABSOLUTE  -27
-    __BOTTOMRIGHT_Y_PERCENTAGE  0
-    __BOTTOMRIGHT_Y_ABSOLUTE  38
-    __KEEP_WHEN_SHADED __ON
-  __END
-
-  __BORDER_PART __BGN
-    __ICLASS BUTTON_RED_STEEL
-    __ACLASS ACTION_KILL
-    __CURSOR KILL
-    __MIN_WIDTH 15
-    __MAX_WIDTH 15
-    __MIN_HEIGHT 22
-    __MAX_HEIGHT 22
-    __TOPLEFT_ORIGIN -1
-    __TOPLEFT_X_PERCENTAGE  0
-    __TOPLEFT_X_ABSOLUTE  8
-    __TOPLEFT_Y_PERCENTAGE  0
-    __TOPLEFT_Y_ABSOLUTE  16
-    __KEEP_WHEN_SHADED __ON
-  __END
-
-  __BORDER_PART __BGN
-    __ICLASS BUTTON_YELLOW_STEEL
-    __ACLASS ACTION_YELLOW
-    __CURSOR ICONIFY
-    __MIN_WIDTH 15
-    __MAX_WIDTH 15
-    __MIN_HEIGHT 22
-    __MAX_HEIGHT 22
-    __TOPLEFT_ORIGIN -1
-    __TOPLEFT_X_PERCENTAGE  0
-    __TOPLEFT_X_ABSOLUTE  30
-    __TOPLEFT_Y_PERCENTAGE  0
-    __TOPLEFT_Y_ABSOLUTE  16
-    __KEEP_WHEN_SHADED __ON
-  __END
-
-  __BORDER_PART __BGN
-    __ICLASS BUTTON_GREEN_STEEL
-    __ACLASS ACTION_GREEN
-    __CURSOR MAX
-    __MIN_WIDTH 15
-    __MAX_WIDTH 15
-    __MIN_HEIGHT 22
-    __MAX_HEIGHT 22
-    __TOPLEFT_ORIGIN -1
-    __TOPLEFT_X_PERCENTAGE  0
-    __TOPLEFT_X_ABSOLUTE  52
-    __TOPLEFT_Y_PERCENTAGE  0
-    __TOPLEFT_Y_ABSOLUTE  16
-    __KEEP_WHEN_SHADED __ON
-  __END
-
-  __BORDER_PART __BGN
-    __ICLASS BUTTON_CLEAR_STEEL
-    __ACLASS ACTION_CLEAR
-    __CURSOR RESIZE_BL
-    __MIN_WIDTH 15
-    __MAX_WIDTH 15
-    __MIN_HEIGHT 22
-    __MAX_HEIGHT 22
-    __TOPLEFT_ORIGIN -1
-    __TOPLEFT_X_PERCENTAGE  1024
-    __TOPLEFT_X_ABSOLUTE  -23
-    __TOPLEFT_Y_PERCENTAGE  0
-    __TOPLEFT_Y_ABSOLUTE  16
-    __KEEP_WHEN_SHADED __ON
-  __END
-
-
-  __BORDER_PART __BGN
-    __ICLASS RESIZE_HANDLE_STEEL
-    __ACLASS ACTION_RESIZE
-    __CURSOR RESIZE_BR
-    __MIN_WIDTH 14
-    __MAX_WIDTH 14
-    __MIN_HEIGHT 14
-    __MAX_HEIGHT 14
-    __TOPLEFT_ORIGIN -1
-    __TOPLEFT_X_PERCENTAGE  1024
-    __TOPLEFT_X_ABSOLUTE  -14
-    __TOPLEFT_Y_PERCENTAGE  1024
-    __TOPLEFT_Y_ABSOLUTE  -14
-    __BOTTOMRIGHT_ORIGIN -1
-   __BOTTOMRIGHT_X_PERCENTAGE  1024
-    __BOTTOMRIGHT_X_ABSOLUTE  -1
-    __BOTTOMRIGHT_Y_PERCENTAGE  1024
-    __BOTTOMRIGHT_Y_ABSOLUTE  -1
-    __KEEP_WHEN_SHADED __OFF
-  __END
-__END
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/TRANSIENT/border.cfg b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/TRANSIENT/border.cfg
deleted file mode 100755
index 7df49db..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/TRANSIENT/border.cfg
+++ /dev/null
@@ -1,90 +0,0 @@
-__BORDER __BGN
-  __NAME TRANSIENT
-  __BORDER_SIZE_LEFT 1
-  __BORDER_SIZE_RIGHT 1
-  __BORDER_SIZE_TOP 18
-  __BORDER_SIZE_BOTTOM 1
-  __SHADE_DIRECTION __UP
-  __CHANGES_SHAPE __OFF
-
-  __BORDER_PART __BGN
-    __ICLASS COMMON_TRANSIENT_TITLEBAR
-    __ACLASS ACTION_MOVE
-    __MIN_WIDTH 5
-    __MAX_WIDTH 99999
-    __MIN_HEIGHT 2
-    __MAX_HEIGHT 2
-    __TOPLEFT_ORIGIN -1
-    __TOPLEFT_X_PERCENTAGE 0
-    __TOPLEFT_X_ABSOLUTE 0
-    __TOPLEFT_Y_PERCENTAGE 0
-    __TOPLEFT_Y_ABSOLUTE 16
-    __BOTTOMRIGHT_ORIGIN -1
-    __BOTTOMRIGHT_X_PERCENTAGE 1024
-    __BOTTOMRIGHT_X_ABSOLUTE 0
-    __BOTTOMRIGHT_Y_PERCENTAGE 0
-    __BOTTOMRIGHT_Y_ABSOLUTE 18
-    __KEEP_WHEN_SHADED __ON
-  __END
- 
-  __BORDER_PART __BGN
-    __ICLASS COMMON_DEFAULT_LEFT
-    __ACLASS ACTION_MOVE
-    __MIN_WIDTH 1
-    __MAX_WIDTH 1
-    __MIN_HEIGHT -1
-    __MAX_HEIGHT 99999
-    __TOPLEFT_ORIGIN 0
-    __TOPLEFT_X_PERCENTAGE 0
-    __TOPLEFT_X_ABSOLUTE 0
-    __TOPLEFT_Y_PERCENTAGE 0
-    __TOPLEFT_Y_ABSOLUTE 1
-    __BOTTOMRIGHT_ORIGIN -1
-    __BOTTOMRIGHT_X_PERCENTAGE 0
-    __BOTTOMRIGHT_X_ABSOLUTE 0
-    __BOTTOMRIGHT_Y_PERCENTAGE 1024
-    __BOTTOMRIGHT_Y_ABSOLUTE 0
-    __KEEP_WHEN_SHADED __OFF
-  __END
-
-  __BORDER_PART __BGN
-    __ICLASS COMMON_DEFAULT_RIGHT
-    __ACLASS ACTION_MOVE
-    __MIN_WIDTH 1
-    __MAX_WIDTH 1
-    __MIN_HEIGHT -1
-    __MAX_HEIGHT 99999
-    __TOPLEFT_ORIGIN -1
-    __TOPLEFT_X_PERCENTAGE 1024
-    __TOPLEFT_X_ABSOLUTE -1
-    __TOPLEFT_Y_PERCENTAGE 0
-    __TOPLEFT_Y_ABSOLUTE 18
-    __BOTTOMRIGHT_ORIGIN -1
-    __BOTTOMRIGHT_X_PERCENTAGE 1024
-    __BOTTOMRIGHT_X_ABSOLUTE -1
-    __BOTTOMRIGHT_Y_PERCENTAGE 1024
-    __BOTTOMRIGHT_Y_ABSOLUTE 0
-    __KEEP_WHEN_SHADED __OFF
-  __END
-
-  __BORDER_PART __BGN
-    __ICLASS COMMON_FIXED_BOTTOM
-    __ACLASS ACTION_MOVE
-    __MIN_WIDTH 0
-    __MAX_WIDTH 99999
-    __MIN_HEIGHT 1
-    __MAX_HEIGHT 1
-    __TOPLEFT_ORIGIN -1
-    __TOPLEFT_X_PERCENTAGE 0
-    __TOPLEFT_X_ABSOLUTE 0
-    __TOPLEFT_Y_PERCENTAGE 1024
-    __TOPLEFT_Y_ABSOLUTE -1
-    __BOTTOMRIGHT_ORIGIN -1
-    __BOTTOMRIGHT_X_PERCENTAGE 1024
-    __BOTTOMRIGHT_X_ABSOLUTE 0
-    __BOTTOMRIGHT_Y_PERCENTAGE 1024
-    __BOTTOMRIGHT_Y_ABSOLUTE -1
-    __KEEP_WHEN_SHADED __OFF
-  __END
-
-__END
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/VERYSMALLFIXED/border.cfg b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/VERYSMALLFIXED/border.cfg
deleted file mode 100755
index 892f5c5..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/VERYSMALLFIXED/border.cfg
+++ /dev/null
@@ -1,90 +0,0 @@
-__BORDER __BGN
-  __NAME VERYSMALLFIXED
-  __BORDER_SIZE_LEFT 1
-  __BORDER_SIZE_RIGHT 1
-  __BORDER_SIZE_TOP 18
-  __BORDER_SIZE_BOTTOM 1
-  __SHADE_DIRECTION __UP
-  __CHANGES_SHAPE __OFF
-
-  __BORDER_PART __BGN
-    __ICLASS COMMON_TRANSIENT_TITLEBAR
-    __ACLASS ACTION_MOVE
-    __MIN_WIDTH 5
-    __MAX_WIDTH 99999
-    __MIN_HEIGHT 2
-    __MAX_HEIGHT 2
-    __TOPLEFT_ORIGIN -1
-    __TOPLEFT_X_PERCENTAGE 0
-    __TOPLEFT_X_ABSOLUTE 0
-    __TOPLEFT_Y_PERCENTAGE 0
-    __TOPLEFT_Y_ABSOLUTE 16
-    __BOTTOMRIGHT_ORIGIN -1
-    __BOTTOMRIGHT_X_PERCENTAGE 1024
-    __BOTTOMRIGHT_X_ABSOLUTE 0
-    __BOTTOMRIGHT_Y_PERCENTAGE 0
-    __BOTTOMRIGHT_Y_ABSOLUTE 18
-    __KEEP_WHEN_SHADED __ON
-  __END
- 
-  __BORDER_PART __BGN
-    __ICLASS COMMON_DEFAULT_LEFT
-    __ACLASS ACTION_MOVE
-    __MIN_WIDTH 1
-    __MAX_WIDTH 1
-    __MIN_HEIGHT -1
-    __MAX_HEIGHT 99999
-    __TOPLEFT_ORIGIN 0
-    __TOPLEFT_X_PERCENTAGE 0
-    __TOPLEFT_X_ABSOLUTE 0
-    __TOPLEFT_Y_PERCENTAGE 0
-    __TOPLEFT_Y_ABSOLUTE 1
-    __BOTTOMRIGHT_ORIGIN -1
-    __BOTTOMRIGHT_X_PERCENTAGE 0
-    __BOTTOMRIGHT_X_ABSOLUTE 0
-    __BOTTOMRIGHT_Y_PERCENTAGE 1024
-    __BOTTOMRIGHT_Y_ABSOLUTE 0
-    __KEEP_WHEN_SHADED __OFF
-  __END
-
-  __BORDER_PART __BGN
-    __ICLASS COMMON_DEFAULT_RIGHT
-    __ACLASS ACTION_MOVE
-    __MIN_WIDTH 1
-    __MAX_WIDTH 1
-    __MIN_HEIGHT -1
-    __MAX_HEIGHT 99999
-    __TOPLEFT_ORIGIN -1
-    __TOPLEFT_X_PERCENTAGE 1024
-    __TOPLEFT_X_ABSOLUTE -1
-    __TOPLEFT_Y_PERCENTAGE 0
-    __TOPLEFT_Y_ABSOLUTE 18
-    __BOTTOMRIGHT_ORIGIN -1
-    __BOTTOMRIGHT_X_PERCENTAGE 1024
-    __BOTTOMRIGHT_X_ABSOLUTE -1
-    __BOTTOMRIGHT_Y_PERCENTAGE 1024
-    __BOTTOMRIGHT_Y_ABSOLUTE 0
-    __KEEP_WHEN_SHADED __OFF
-  __END
-
-  __BORDER_PART __BGN
-    __ICLASS COMMON_FIXED_BOTTOM
-    __ACLASS ACTION_MOVE
-    __MIN_WIDTH 0
-    __MAX_WIDTH 99999
-    __MIN_HEIGHT 1
-    __MAX_HEIGHT 1
-    __TOPLEFT_ORIGIN -1
-    __TOPLEFT_X_PERCENTAGE 0
-    __TOPLEFT_X_ABSOLUTE 0
-    __TOPLEFT_Y_PERCENTAGE 1024
-    __TOPLEFT_Y_ABSOLUTE -1
-    __BOTTOMRIGHT_ORIGIN -1
-    __BOTTOMRIGHT_X_PERCENTAGE 1024
-    __BOTTOMRIGHT_X_ABSOLUTE 0
-    __BOTTOMRIGHT_Y_PERCENTAGE 1024
-    __BOTTOMRIGHT_Y_ABSOLUTE -1
-    __KEEP_WHEN_SHADED __OFF
-  __END
-
-__END
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/actions.cfg b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/actions.cfg
deleted file mode 100755
index 9599305..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/actions.cfg
+++ /dev/null
@@ -1,108 +0,0 @@
-__ACLASS __BGN
-  __NAME ACTION_MOVE
-  __TOOLTIP_TEXT "TITLE BAR"
-  __TYPE __TYPE_NORMAL
-  __TOOLTIP_ACTION_TEXT "Drag to move this Window. Double click to collapse window."
-  __EVENT __MOUSE_PRESS
-  __ALLOW_ANY_MODIFIER_KEYS __ON
-  __BUTTON 1
-  __ACTION __A_MOVE
-  __NEXT_ACTION
-  __TOOLTIP_ACTION_TEXT "Click to lower this window."
-  __EVENT __MOUSE_PRESS
-  __BUTTON 3
-  __ACTION __A_LOWER
-  __NEXT_ACTION
-  __TOOLTIP_ACTION_TEXT "Click to shade this window."
-  __EVENT __DOUBLE_CLICK
-  __ALLOW_ANY_BUTTON __ON
-  __ACTION __A_SHADE
-__END
-
-__ACLASS __BGN
-  __NAME ACTION_MOVE2
-  __TOOLTIP_TEXT "MOVE2"
-  __ALLOW_ANY_MODIFIER_KEYS __ON
-  __ALLOW_ANY_BUTTON __ON
-  __TYPE __TYPE_NORMAL
-  __TOOLTIP_ACTION_TEXT "Drag to move this window."
-  __EVENT __MOUSE_PRESS
-  __ACTION __A_MOVE
-  __NEXT_ACTION
-__END
-
-__ACLASS __BGN
-  __NAME ACTION_RESIZE
-  __TOOLTIP_TEXT "HANDLE"
-  __ALLOW_ANY_MODIFIER_KEYS __ON
-  __TYPE __TYPE_NORMAL
-  __TOOLTIP_ACTION_TEXT "Drag to scale window."
-  __EVENT __MOUSE_PRESS
-  __BUTTON 1
-  __ACTION __A_RESIZE
-  __NEXT_ACTION
-  __TOOLTIP_ACTION_TEXT "Drag to move window."
-  __BUTTON 3
-  __ACTION __A_MOVE
-__END
-__ACLASS __BGN
-  __NAME ACTION_KILL
-  __TOOLTIP_TEXT "RED BUTTON"
-  __TYPE __TYPE_NORMAL
-  __TOOLTIP_ACTION_TEXT "Click to close window."
-  __EVENT __MOUSE_RELEASE
-  __ALLOW_ANY_MODIFIER_KEYS __ON
-  __BUTTON 1
-  __ACTION __A_KILL
-  __NEXT_ACTION
-  __TOOLTIP_ACTION_TEXT "Click to forcibly close window."
-  __BUTTON 3
-  __ACTION __A_KILL_NASTY
-__END
-__ACLASS __BGN
-  __NAME ACTION_YELLOW  
-  __TOOLTIP_TEXT "YELLOW BUTTON"
-  __TYPE __TYPE_NORMAL
-  __TOOLTIP_ACTION_TEXT "Click to collapse window."
-  __EVENT __MOUSE_RELEASE
-  __BUTTON 1
-  __ACTION __A_SHADE
-  __NEXT_ACTION
-  __TOOLTIP_ACTION_TEXT "Click to iconify window."
-  __BUTTON 3
-  __ACTION __A_ICONIFY
-__END
-__ACLASS __BGN
-  __NAME ACTION_GREEN
-  __TOOLTIP_TEXT "GREEN BUTTON"
-  __TYPE __TYPE_NORMAL
-  __EVENT __MOUSE_RELEASE
-    __ALLOW_ANY_MODIFIER_KEYS __ON
-  __TOOLTIP_ACTION_TEXT "Click to maximize/restore window."
-  __BUTTON 1
-  __ACTION __A_MAX_SIZE
-  __NEXT_ACTION
-  __TOOLTIP_ACTION_TEXT "Click to maximize height of window."
-  __BUTTON 2
-  __ACTION __A_MAX_HEIGHT
-  __NEXT_ACTION
-  __TOOLTIP_ACTION_TEXT "Click to maximize width of window."
-  __BUTTON 3
-  __ACTION __A_MAX_WIDTH
-__END
-
-__ACLASS __BGN
-  __NAME ACTION_CLEAR
-  __TOOLTIP_TEXT "CLEAR BUTTON"
-  __TYPE __TYPE_NORMAL
-  __EVENT __MOUSE_PRESS
-  __ALLOW_ANY_MODIFIER_KEYS __ON
-  __TOOLTIP_ACTION_TEXT "Drag to scale window."
-  __BUTTON 1
-  __ACTION __A_RESIZE
-  __NEXT_ACTION
-  __TOOLTIP_ACTION_TEXT "Toggle the Omnipresent (visible on all desktop) state of this window."
-  __BUTTON 3
-  __ACTION __A_STICK
-__END
-
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/borders.cfg b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/borders.cfg
deleted file mode 100755
index 8db3927..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/borders.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <borders/common/border.cfg>
-#include <borders/BORDERLESS/border.cfg>
-#include <borders/DEFAULT/border.cfg>
-#include <borders/ICONBOX/border.cfg>
-#include <borders/PAGER/border.cfg>
-#include <borders/RIGHT_PAGER/border.cfg>
-#include <borders/TRANSIENT/border.cfg>
-#include <borders/STEEL/border.cfg>
-#include <borders/VERYSMALLFIXED/border.cfg>
-#include <borders/SMALL/border.cfg>
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/border.cfg b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/border.cfg
deleted file mode 100755
index bde7a55..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/border.cfg
+++ /dev/null
@@ -1,689 +0,0 @@
-__ICLASS __BGN
-  __NAME COMMON_DEFAULT_LEFT_RESIZE
-  __NORMAL "borders/common/images/leftresize_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED "borders/common/images/leftresize_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED "borders/common/images/leftresize_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE "borders/common/images/leftresize_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED_ACTIVE "borders/common/images/leftresize_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED_ACTIVE "borders/common/images/leftresize_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_STICKY "borders/common/images/leftresize_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED_STICKY "borders/common/images/leftresize_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED_STICKY "borders/common/images/leftresize_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_STICKY "borders/common/images/leftresize_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_HILITED "borders/common/images/leftresize_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_CLICKED "borders/common/images/leftresize_fg.png"
-  __EDGE_SCALING 0 0 0 0
-__END
-
-__ICLASS __BGN
-  __NAME COMMON_DEFAULT_RIGHT_TRIM
-  __NORMAL "borders/common/images/righttrim_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED "borders/common/images/righttrim_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED "borders/common/images/righttrim_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE "borders/common/images/righttrim_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED_ACTIVE "borders/common/images/righttrim_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED_ACTIVE "borders/common/images/righttrim_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_STICKY "borders/common/images/righttrim_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED_STICKY "borders/common/images/righttrim_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED_STICKY "borders/common/images/righttrim_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_STICKY "borders/common/images/righttrim_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_HILITED "borders/common/images/righttrim_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_CLICKED "borders/common/images/righttrim_fg.png"
-  __EDGE_SCALING 0 0 0 0
-__END
-
-__ICLASS __BGN
-  __NAME COMMON_DEFAULT_BOTTOM_RESIZE
-  __NORMAL "borders/common/images/bottomresize_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED "borders/common/images/bottomresize_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED "borders/common/images/bottomresize_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE "borders/common/images/bottomresize_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED_ACTIVE "borders/common/images/bottomresize_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED_ACTIVE "borders/common/images/bottomresize_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_STICKY "borders/common/images/bottomresize_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED_STICKY "borders/common/images/bottomresize_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED_STICKY "borders/common/images/bottomresize_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_STICKY "borders/common/images/bottomresize_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_HILITED "borders/common/images/bottomresize_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_CLICKED "borders/common/images/bottomresize_fg.png"
-  __EDGE_SCALING 0 0 0 0
-__END
-
-__ICLASS __BGN
-  __NAME COMMON_DEFAULT_BOTTOM
-  __NORMAL "borders/common/images/default_bottom_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED "borders/common/images/default_bottom_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED "borders/common/images/default_bottom_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE "borders/common/images/default_bottom_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED_ACTIVE "borders/common/images/default_bottom_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED_ACTIVE "borders/common/images/default_bottom_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_STICKY "borders/common/images/default_bottom_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED_STICKY "borders/common/images/default_bottom_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED_STICKY "borders/common/images/default_bottom_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_STICKY "borders/common/images/default_bottom_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_HILITED "borders/common/images/default_bottom_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_CLICKED "borders/common/images/default_bottom_fg.png"
-  __EDGE_SCALING 0 0 0 0
-__END
-
-__ICLASS __BGN
-  __NAME COMMON_DEFAULT_BOTTOM_TRIM
-  __NORMAL "borders/common/images/default_bottomtrim_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED "borders/common/images/default_bottomtrim_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED "borders/common/images/default_bottomtrim_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE "borders/common/images/default_bottomtrim_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED_ACTIVE "borders/common/images/default_bottomtrim_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED_ACTIVE "borders/common/images/default_bottomtrim_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_STICKY "borders/common/images/default_bottomtrim_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED_STICKY "borders/common/images/default_bottomtrim_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED_STICKY "borders/common/images/default_bottomtrim_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_STICKY "borders/common/images/default_bottomtrim_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_HILITED "borders/common/images/default_bottomtrim_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_CLICKED "borders/common/images/default_bottomtrim_fg.png"
-  __EDGE_SCALING 0 0 0 0
-__END
-
-__ICLASS __BGN
-  __NAME COMMON_DEFAULT_CLOSE
-  __NORMAL "borders/common/images/close_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED "borders/common/images/close_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED "borders/common/images/close_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE "borders/common/images/close_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED_ACTIVE "borders/common/images/close_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED_ACTIVE "borders/common/images/close_cl.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_STICKY "borders/common/images/close_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED_STICKY "borders/common/images/close_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED_STICKY "borders/common/images/close_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_STICKY "borders/common/images/close_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_HILITED "borders/common/images/close_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_CLICKED "borders/common/images/close_cl.png"
-  __EDGE_SCALING 0 0 0 0
-__END
-
-__ICLASS __BGN
-  __NAME COMMON_DEFAULT_MINIMIZE
-  __NORMAL "borders/common/images/minimize_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED "borders/common/images/minimize_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED "borders/common/images/minimize_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE "borders/common/images/minimize_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED_ACTIVE "borders/common/images/minimize_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED_ACTIVE "borders/common/images/minimize_cl.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_STICKY "borders/common/images/minimize_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED_STICKY "borders/common/images/minimize_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED_STICKY "borders/common/images/minimize_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_STICKY "borders/common/images/minimize_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_HILITED "borders/common/images/minimize_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_CLICKED "borders/common/images/minimize_cl.png"
-  __EDGE_SCALING 0 0 0 0
-__END
-
-__ICLASS __BGN
-  __NAME COMMON_DEFAULT_TITLEBAR
-  __NORMAL "borders/common/images/default_title_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED "borders/common/images/default_title_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED "borders/common/images/default_title_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE "borders/common/images/default_title_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED_ACTIVE "borders/common/images/default_title_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED_ACTIVE "borders/common/images/default_title_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_STICKY "borders/common/images/default_title_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED_STICKY "borders/common/images/default_title_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED_STICKY "borders/common/images/default_title_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_STICKY "borders/common/images/default_title_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_HILITED "borders/common/images/default_title_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_CLICKED "borders/common/images/default_title_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __PADDING 2 2 1 2
-__END
-
-__ICLASS __BGN
-  __NAME COMMON_DEFAULT_TOP_RIGHT_TRIM
-  __NORMAL "borders/common/images/toprighttrim_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED "borders/common/images/toprighttrim_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED "borders/common/images/toprighttrim_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE "borders/common/images/toprighttrim_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED_ACTIVE "borders/common/images/toprighttrim_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED_ACTIVE "borders/common/images/toprighttrim_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_STICKY "borders/common/images/toprighttrim_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED_STICKY "borders/common/images/toprighttrim_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED_STICKY "borders/common/images/toprighttrim_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_STICKY "borders/common/images/toprighttrim_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_HILITED "borders/common/images/toprighttrim_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_CLICKED "borders/common/images/toprighttrim_fg.png"
-  __EDGE_SCALING 0 0 0 0
-__END
-
-__ICLASS __BGN
-  __NAME COMMON_DEFAULT_TOP
-  __NORMAL "borders/common/images/default_top_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED "borders/common/images/default_top_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED "borders/common/images/default_top_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE "borders/common/images/default_top_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED_ACTIVE "borders/common/images/default_top_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED_ACTIVE "borders/common/images/default_top_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_STICKY "borders/common/images/default_top_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED_STICKY "borders/common/images/default_top_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED_STICKY "borders/common/images/default_top_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_STICKY "borders/common/images/default_top_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_HILITED "borders/common/images/default_top_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_CLICKED "borders/common/images/default_top_fg.png"
-  __EDGE_SCALING 0 0 0 0
-__END
-
-__ICLASS __BGN
-  __NAME COMMON_DEFAULT_STICK
-  __NORMAL "borders/common/images/stick_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED "borders/common/images/stick_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED "borders/common/images/stick_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE "borders/common/images/stick_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED_ACTIVE "borders/common/images/stick_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED_ACTIVE "borders/common/images/stick_cl.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_STICKY "borders/common/images/stick_bg_st.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED_STICKY "borders/common/images/stick_bg_st.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED_STICKY "borders/common/images/stick_bg_st.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_STICKY "borders/common/images/stick_fg_st.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_HILITED "borders/common/images/stick_fg_st.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_CLICKED "borders/common/images/stick_cl.png"
-  __EDGE_SCALING 0 0 0 0
-__END
-
-__ICLASS __BGN
-  __NAME COMMON_DEFAULT_LEFT_TRIM
-  __NORMAL "borders/common/images/lefttrim_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED "borders/common/images/lefttrim_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED "borders/common/images/lefttrim_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE "borders/common/images/lefttrim_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED_ACTIVE "borders/common/images/lefttrim_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED_ACTIVE "borders/common/images/lefttrim_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_STICKY "borders/common/images/lefttrim_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED_STICKY "borders/common/images/lefttrim_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED_STICKY "borders/common/images/lefttrim_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_STICKY "borders/common/images/lefttrim_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_HILITED "borders/common/images/lefttrim_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_CLICKED "borders/common/images/lefttrim_fg.png"
-  __EDGE_SCALING 0 0 0 0
-__END
-
-__ICLASS __BGN
-  __NAME COMMON_DEFAULT_LEFT
-  __NORMAL "borders/common/images/left_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED "borders/common/images/left_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED "borders/common/images/left_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE "borders/common/images/left_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED_ACTIVE "borders/common/images/left_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED_ACTIVE "borders/common/images/left_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_STICKY "borders/common/images/left_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED_STICKY "borders/common/images/left_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED_STICKY "borders/common/images/left_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_STICKY "borders/common/images/left_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_HILITED "borders/common/images/left_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_CLICKED "borders/common/images/left_fg.png"
-  __EDGE_SCALING 0 0 0 0
-__END
-
-__ICLASS __BGN
-  __NAME COMMON_DEFAULT_RIGHT
-  __NORMAL "borders/common/images/right_bg.png"
-  __EDGE_SCALING 0 0 3 3
-  __HILITED "borders/common/images/right_bg.png"
-  __EDGE_SCALING 0 0 3 3
-  __CLICKED "borders/common/images/right_bg.png"
-  __EDGE_SCALING 0 0 3 3
-  __NORMAL_ACTIVE "borders/common/images/right_fg.png"
-  __EDGE_SCALING 0 0 3 3
-  __HILITED_ACTIVE "borders/common/images/right_fg.png"
-  __EDGE_SCALING 0 0 3 3
-  __CLICKED_ACTIVE "borders/common/images/right_fg.png"
-  __EDGE_SCALING 0 0 3 3
-  __NORMAL_STICKY "borders/common/images/right_bg.png"
-  __EDGE_SCALING 0 0 3 3
-  __HILITED_STICKY "borders/common/images/right_bg.png"
-  __EDGE_SCALING 0 0 3 3
-  __CLICKED_STICKY "borders/common/images/right_bg.png"
-  __EDGE_SCALING 0 0 3 3
-  __NORMAL_ACTIVE_STICKY "borders/common/images/right_fg.png"
-  __EDGE_SCALING 0 0 3 3
-  __NORMAL_ACTIVE_HILITED "borders/common/images/right_fg.png"
-  __EDGE_SCALING 0 0 3 3
-  __NORMAL_ACTIVE_CLICKED "borders/common/images/right_fg.png"
-  __EDGE_SCALING 0 0 3 3
-__END
-
-__ICLASS __BGN
-  __NAME COMMON_DEFAULT_CLOSE_SHADED
-  __NORMAL "borders/common/images/close_sh_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED "borders/common/images/close_sh_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED "borders/common/images/close_sh_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE "borders/common/images/close_sh_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED_ACTIVE "borders/common/images/close_sh_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED_ACTIVE "borders/common/images/close_sh_cl.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_STICKY "borders/common/images/close_sh_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED_STICKY "borders/common/images/close_sh_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED_STICKY "borders/common/images/close_sh_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_STICKY "borders/common/images/close_sh_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_HILITED "borders/common/images/close_sh_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_CLICKED "borders/common/images/close_sh_cl.png"
-  __EDGE_SCALING 0 0 0 0
-__END
-
-__ICLASS __BGN
-  __NAME COMMON_DEFAULT_STICK_SHADED
-  __NORMAL "borders/common/images/stick_sh_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED "borders/common/images/stick_sh_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED "borders/common/images/stick_sh_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE "borders/common/images/stick_sh_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED_ACTIVE "borders/common/images/stick_sh_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED_ACTIVE "borders/common/images/stick_sh_cl.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_STICKY "borders/common/images/stick_sh_bg_st.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED_STICKY "borders/common/images/stick_sh_bg_st.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED_STICKY "borders/common/images/stick_sh_bg_st.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_STICKY "borders/common/images/stick_sh_fg_st.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_HILITED "borders/common/images/stick_sh_fg_st.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_CLICKED "borders/common/images/stick_sh_cl.png"
-  __EDGE_SCALING 0 0 0 0
-__END
-
-__ICLASS __BGN
-  __NAME COMMON_FIXED_BOTTOM
-  __NORMAL "borders/common/images/fixed_bottom_bg.png"
-  __EDGE_SCALING 4 4 0 0
-  __HILITED "borders/common/images/fixed_bottom_bg.png"
-  __EDGE_SCALING 4 4 0 0
-  __CLICKED "borders/common/images/fixed_bottom_bg.png"
-  __EDGE_SCALING 4 4 0 0
-  __NORMAL_ACTIVE "borders/common/images/fixed_bottom_fg.png"
-  __EDGE_SCALING 4 4 0 0
-  __HILITED_ACTIVE "borders/common/images/fixed_bottom_fg.png"
-  __EDGE_SCALING 4 4 0 0
-  __CLICKED_ACTIVE "borders/common/images/fixed_bottom_fg.png"
-  __EDGE_SCALING 4 4 0 0
-  __NORMAL_STICKY "borders/common/images/fixed_bottom_bg.png"
-  __EDGE_SCALING 4 4 0 0
-  __HILITED_STICKY "borders/common/images/fixed_bottom_bg.png"
-  __EDGE_SCALING 4 4 0 0
-  __CLICKED_STICKY "borders/common/images/fixed_bottom_bg.png"
-  __EDGE_SCALING 4 4 0 0
-  __NORMAL_ACTIVE_STICKY "borders/common/images/fixed_bottom_fg.png"
-  __EDGE_SCALING 4 4 0 0
-  __NORMAL_ACTIVE_HILITED "borders/common/images/fixed_bottom_fg.png"
-  __EDGE_SCALING 4 4 0 0
-  __NORMAL_ACTIVE_CLICKED "borders/common/images/fixed_bottom_fg.png"
-  __EDGE_SCALING 4 4 0 0
-__END
-
-__ICLASS __BGN
-  __NAME COMMON_VERYSMALL_TOP
-  __NORMAL "borders/common/images/transient_title_fg.png"
-  __EDGE_SCALING 6 6 0 0
-  __HILITED "borders/common/images/transient_title_fg.png"
-  __EDGE_SCALING 6 6 0 0
-  __CLICKED "borders/common/images/transient_title_fg.png"
-  __EDGE_SCALING 6 6 0 0
-  __NORMAL_ACTIVE "borders/common/images/transient_title_fg.png"
-  __EDGE_SCALING 6 6 0 0
-  __HILITED_ACTIVE "borders/common/images/transient_title_fg.png"
-  __EDGE_SCALING 6 6 0 0
-  __CLICKED_ACTIVE "borders/common/images/transient_title_fg.png"
-  __EDGE_SCALING 6 6 0 0
-  __NORMAL_STICKY "borders/common/images/transient_title_fg.png"
-  __EDGE_SCALING 6 6 0 0
-  __HILITED_STICKY "borders/common/images/transient_title_fg.png"
-  __EDGE_SCALING 6 6 0 0
-  __CLICKED_STICKY "borders/common/images/transient_title_fg.png"
-  __EDGE_SCALING 6 6 0 0
-  __NORMAL_ACTIVE_STICKY "borders/common/images/transient_title_fg.png"
-  __EDGE_SCALING 6 6 0 0
-  __NORMAL_ACTIVE_HILITED "borders/common/images/transient_title_fg.png"
-  __EDGE_SCALING 6 6 0 0
-  __NORMAL_ACTIVE_CLICKED "borders/common/images/transient_title_fg.png"
-  __EDGE_SCALING 6 6 0 0
-__END
-
-__ICLASS __BGN
-  __NAME COMMON_VERYSMALL_TOP_SHADED
-  __NORMAL "borders/common/images/verysmall_top_sh_bg.png"
-  __EDGE_SCALING 6 6 0 0
-  __HILITED "borders/common/images/verysmall_top_sh_bg.png"
-  __EDGE_SCALING 6 6 0 0
-  __CLICKED "borders/common/images/verysmall_top_sh_bg.png"
-  __EDGE_SCALING 6 6 0 0
-  __NORMAL_ACTIVE "borders/common/images/verysmall_top_sh_fg.png"
-  __EDGE_SCALING 6 6 0 0
-  __HILITED_ACTIVE "borders/common/images/verysmall_top_sh_fg.png"
-  __EDGE_SCALING 6 6 0 0
-  __CLICKED_ACTIVE "borders/common/images/verysmall_top_sh_fg.png"
-  __EDGE_SCALING 6 6 0 0
-  __NORMAL_STICKY "borders/common/images/verysmall_top_sh_bg.png"
-  __EDGE_SCALING 6 6 0 0
-  __HILITED_STICKY "borders/common/images/verysmall_top_sh_bg.png"
-  __EDGE_SCALING 6 6 0 0
-  __CLICKED_STICKY "borders/common/images/verysmall_top_sh_bg.png"
-  __EDGE_SCALING 6 6 0 0
-  __NORMAL_ACTIVE_STICKY "borders/common/images/verysmall_top_sh_fg.png"
-  __EDGE_SCALING 6 6 0 0
-  __NORMAL_ACTIVE_HILITED "borders/common/images/verysmall_top_sh_fg.png"
-  __EDGE_SCALING 6 6 0 0
-  __NORMAL_ACTIVE_CLICKED "borders/common/images/verysmall_top_sh_fg.png"
-  __EDGE_SCALING 6 6 0 0
-__END
-
-__ICLASS __BGN
-  __NAME COMMON_TRANSIENT_TITLEBAR
-  __NORMAL "borders/common/images/transient_title_bg.png"
-  __EDGE_SCALING 0 8 0 0
-  __HILITED "borders/common/images/transient_title_bg.png"
-  __EDGE_SCALING 0 8 0 0
-  __CLICKED "borders/common/images/transient_title_bg.png"
-  __EDGE_SCALING 0 8 0 0
-  __NORMAL_ACTIVE "borders/common/images/transient_title_fg.png"
-  __EDGE_SCALING 0 8 0 0
-  __HILITED_ACTIVE "borders/common/images/transient_title_fg.png"
-  __EDGE_SCALING 0 8 0 0
-  __CLICKED_ACTIVE "borders/common/images/transient_title_fg.png"
-  __EDGE_SCALING 0 8 0 0
-  __NORMAL_STICKY "borders/common/images/transient_title_bg.png"
-  __EDGE_SCALING 0 8 0 0
-  __HILITED_STICKY "borders/common/images/transient_title_bg.png"
-  __EDGE_SCALING 0 8 0 0
-  __CLICKED_STICKY "borders/common/images/transient_title_bg.png"
-  __EDGE_SCALING 0 8 0 0
-  __NORMAL_ACTIVE_STICKY "borders/common/images/transient_title_fg.png"
-  __EDGE_SCALING 0 8 0 0
-  __NORMAL_ACTIVE_HILITED "borders/common/images/transient_title_fg.png"
-  __EDGE_SCALING 0 8 0 0
-  __NORMAL_ACTIVE_CLICKED "borders/common/images/transient_title_fg.png"
-  __EDGE_SCALING 0 8 0 0
-  __PADDING 2 10 1 2
-__END
-
-__ICLASS __BGN
-  __NAME COMMON_LEFTSIDE_LEFT_TOP_TRIM
-  __NORMAL "borders/common/images/lefttoptrim_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED "borders/common/images/lefttoptrim_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED "borders/common/images/lefttoptrim_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE "borders/common/images/lefttoptrim_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED_ACTIVE "borders/common/images/lefttoptrim_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED_ACTIVE "borders/common/images/lefttoptrim_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_STICKY "borders/common/images/lefttoptrim_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED_STICKY "borders/common/images/lefttoptrim_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED_STICKY "borders/common/images/lefttoptrim_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_STICKY "borders/common/images/lefttoptrim_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_HILITED "borders/common/images/lefttoptrim_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_CLICKED "borders/common/images/lefttoptrim_fg.png"
-  __EDGE_SCALING 0 0 0 0
-__END
-
-__ICLASS __BGN
-  __NAME COMMON_LEFTSIDE_TITLEBAR
-  __NORMAL "borders/common/images/leftside_title_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED "borders/common/images/leftside_title_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED "borders/common/images/leftside_title_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE "borders/common/images/leftside_title_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED_ACTIVE "borders/common/images/leftside_title_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED_ACTIVE "borders/common/images/leftside_title_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_STICKY "borders/common/images/leftside_title_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED_STICKY "borders/common/images/leftside_title_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED_STICKY "borders/common/images/leftside_title_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_STICKY "borders/common/images/leftside_title_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_HILITED "borders/common/images/leftside_title_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_CLICKED "borders/common/images/leftside_title_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __PADDING 2 2 1 2
-__END
-
-__ICLASS __BGN
-  __NAME COMMON_LEFTSIDE_BOTTOM_TRIM
-  __NORMAL "borders/common/images/leftside_bottomtrim_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED "borders/common/images/leftside_bottomtrim_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED "borders/common/images/leftside_bottomtrim_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE "borders/common/images/leftside_bottomtrim_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED_ACTIVE "borders/common/images/leftside_bottomtrim_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED_ACTIVE "borders/common/images/leftside_bottomtrim_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_STICKY "borders/common/images/leftside_bottomtrim_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __HILITED_STICKY "borders/common/images/leftside_bottomtrim_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __CLICKED_STICKY "borders/common/images/leftside_bottomtrim_bg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_STICKY "borders/common/images/leftside_bottomtrim_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_HILITED "borders/common/images/leftside_bottomtrim_fg.png"
-  __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE_CLICKED "borders/common/images/leftside_bottomtrim_fg.png"
-  __EDGE_SCALING 0 0 0 0
-__END
-
-
-
-__TCLASS __BGN
-  __NAME "TITLE_TEXT"
-  __NORMAL "vixar/12"
-    __DRAWING_EFFECT __EFFECT_SHADOW
-    __FORGROUND_COLOR 192 192 192
-    __BACKGROUND_COLOR 0 0 0
-    __JUSTIFICATION 512
-  __NORMAL_ACTIVE "vixar/12"
-    __DRAWING_EFFECT __EFFECT_SHADOW
-    __FORGROUND_COLOR 255 255 255
-    __BACKGROUND_COLOR 0 0 0
-    __JUSTIFICATION 512
-  __NORMAL_ACTIVE_STICKY "vixar/12"
-    __DRAWING_EFFECT __EFFECT_SHADOW
-    __FORGROUND_COLOR 255 255 255
-    __BACKGROUND_COLOR 0 0 0
-    __JUSTIFICATION 512
-__END
-
-__TCLASS __BGN
-  __NAME "LEFTSIDE_TITLE_TEXT"
-  __NORMAL "vixar/12"
-    __DRAWING_EFFECT __EFFECT_SHADOW
-    __FORGROUND_COLOR 192 192 192
-    __BACKGROUND_COLOR 0 0 0
-    __JUSTIFICATION 512
-	__ORIENTATION __FONT_TO_UP
-  __NORMAL_ACTIVE "vixar/12"
-    __DRAWING_EFFECT __EFFECT_SHADOW
-    __FORGROUND_COLOR 255 255 255
-    __BACKGROUND_COLOR 0 0 0
-    __JUSTIFICATION 512
-	__ORIENTATION __FONT_TO_UP
-  __NORMAL_ACTIVE_STICKY "vixar/12"
-    __DRAWING_EFFECT __EFFECT_SHADOW
-    __FORGROUND_COLOR 255 255 255
-    __BACKGROUND_COLOR 0 0 0
-    __JUSTIFICATION 512
-	__ORIENTATION __FONT_TO_UP
-__END
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/fixed_bottom_bg.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/fixed_bottom_bg.png
deleted file mode 100755
index 44e6c2a..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/fixed_bottom_bg.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/fixed_bottom_fg.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/fixed_bottom_fg.png
deleted file mode 100755
index a0b1eec..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/fixed_bottom_fg.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/left_bg.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/left_bg.png
deleted file mode 100755
index 224caac..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/left_bg.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/left_fg.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/left_fg.png
deleted file mode 100755
index d24b56f..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/left_fg.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/pager_bottom.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/pager_bottom.png
deleted file mode 100755
index 8273bc8..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/pager_bottom.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/pager_left.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/pager_left.png
deleted file mode 100755
index aa02748..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/pager_left.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/pager_right.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/pager_right.png
deleted file mode 100755
index d5b2412..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/pager_right.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/pager_top.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/pager_top.png
deleted file mode 100755
index 64dc25f..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/pager_top.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/right_bg.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/right_bg.png
deleted file mode 100755
index a9f4cbb..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/right_bg.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/right_fg.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/right_fg.png
deleted file mode 100755
index dafa75a..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/right_fg.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/transient_title_bg.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/transient_title_bg.png
deleted file mode 100755
index 8cd29d9..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/transient_title_bg.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/transient_title_fg.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/transient_title_fg.png
deleted file mode 100755
index 5b6c119..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/common/images/transient_title_fg.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/images.cfg b/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/images.cfg
deleted file mode 100755
index 68c796a..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/borders/images.cfg
+++ /dev/null
@@ -1,247 +0,0 @@
-__ICLASS __BGN
-  __NAME RESIZE_HANDLE
-  __NORMAL "borders/DEFAULT/images/resize_handle.png"
-  __NORMAL_ACTIVE "borders/DEFAULT/images/resize_handle.png"
-  __HILITED_ACTIVE "borders/DEFAULT/images/resize_handle.png"
-  __CLICKED_ACTIVE "borders/DEFAULT/images/resize_handle.png"
-  __NORMAL_STICKY "borders/DEFAULT/images/resize_handle_stick.png"
-  __NORMAL_ACTIVE_STICKY "borders/DEFAULT/images/resize_handle_stick.png"
-  __HILITED_ACTIVE_STICKY "borders/DEFAULT/images/resize_handle_stick.png"
-  __CLICKED_ACTIVE_STICKY "borders/DEFAULT/images/resize_handle_stick.png"
-__END
-
-__ICLASS __BGN
-  __NAME RESIZE_HANDLE_STEEL
-  __NORMAL "borders/DEFAULT/images/resize_handle_stick.png"
-  __NORMAL_ACTIVE "borders/DEFAULT/images/resize_handle_stick.png"
-  __HILITED_ACTIVE "borders/DEFAULT/images/resize_handle_stick.png"
-  __CLICKED_ACTIVE "borders/DEFAULT/images/resize_handle_stick.png"
-  __NORMAL_STICKY "borders/DEFAULT/images/resize_handle_stick.png"
-  __NORMAL_ACTIVE_STICKY "borders/DEFAULT/images/resize_handle_stick.png"
-  __HILITED_ACTIVE_STICKY "borders/DEFAULT/images/resize_handle_stick.png"
-  __CLICKED_ACTIVE_STICKY "borders/DEFAULT/images/resize_handle_stick.png"
-__END
-
-__ICLASS __BGN
-  __NAME BUTTON_RED
-  __NORMAL  "borders/DEFAULT/images/button_inactive.png"
-  __NORMAL_ACTIVE "borders/DEFAULT/images/button_red.png"
-  __HILITED_ACTIVE "borders/DEFAULT/images/button_red_hi.png"
-  __CLICKED_ACTIVE "borders/DEFAULT/images/button_red_down.png"
-  __NORMAL_STICKY "borders/DEFAULT/images/button_clear2_stick.png"
-  __NORMAL_ACTIVE_STICKY "borders/DEFAULT/images/button_red_stick.png"
-  __HILITED_ACTIVE_STICKY "borders/DEFAULT/images/button_red_stick_hi.png"
-  __CLICKED_ACTIVE_STICKY "borders/DEFAULT/images/button_red_stick_down.png"
-__END
-
-__ICLASS __BGN
-  __NAME BUTTON_YELLOW
-  __NORMAL  "borders/DEFAULT/images/button_inactive.png"
-  __NORMAL_ACTIVE "borders/DEFAULT/images/button_yellow.png"
-  __HILITED_ACTIVE "borders/DEFAULT/images/button_yellow_hi.png"
-  __CLICKED_ACTIVE "borders/DEFAULT/images/button_yellow_down.png"
-  __NORMAL_STICKY "borders/DEFAULT/images/button_clear2_stick.png"
-  __NORMAL_ACTIVE_STICKY "borders/DEFAULT/images/button_yellow_stick.png"
-  __HILITED_ACTIVE_STICKY "borders/DEFAULT/images/button_yellow_stick_hi.png"
-  __CLICKED_ACTIVE_STICKY "borders/DEFAULT/images/button_yellow_stick_down.png"
-__END
-
-__ICLASS __BGN
-  __NAME BUTTON_GREEN
-  __NORMAL  "borders/DEFAULT/images/button_inactive.png"
-  __NORMAL_ACTIVE "borders/DEFAULT/images/button_green.png"
-  __HILITED_ACTIVE "borders/DEFAULT/images/button_green_hi.png"
-  __CLICKED_ACTIVE "borders/DEFAULT/images/button_green_down.png"
-  __NORMAL_STICKY "borders/DEFAULT/images/button_clear2_stick.png"
-  __NORMAL_ACTIVE_STICKY "borders/DEFAULT/images/button_green_stick.png"
-  __HILITED_ACTIVE_STICKY "borders/DEFAULT/images/button_green_stick_hi.png"
-  __CLICKED_ACTIVE_STICKY "borders/DEFAULT/images/button_green_stick_down.png"
-__END
-
-__ICLASS __BGN
-  __NAME BUTTON_CLEAR
-  __NORMAL  "borders/DEFAULT/images/button_inactive.png"
-  __NORMAL_ACTIVE "borders/DEFAULT/images/button_clear.png"
-  __HILITED_ACTIVE "borders/DEFAULT/images/button_clear_hi.png"
-  __CLICKED_ACTIVE "borders/DEFAULT/images/button_clear_down.png"
-  __NORMAL_STICKY "borders/DEFAULT/images/button_clear_stick.png"
-  __NORMAL_ACTIVE_STICKY "borders/DEFAULT/images/button_clear_stick.png"
-  __HILITED_ACTIVE_STICKY "borders/DEFAULT/images/button_clear_stick_hi.png"
-  __CLICKED_ACTIVE_STICKY "borders/DEFAULT/images/button_clear_stick_down.png"
-__END
-
-__ICLASS __BGN
-  __NAME TITLE_BAR
-  __NORMAL  "borders/DEFAULT/images/titlebar.png"
-  __EDGE_SCALING 6 6 1 1
-  __NORMAL_ACTIVE  "borders/DEFAULT/images/titlebar_active.png"
-  __EDGE_SCALING 6 6 1 1
-  __NORMAL_STICKY "borders/DEFAULT/images/titlebar_stick.png"
-  __EDGE_SCALING 6 6 1 1
-  __NORMAL_ACTIVE_STICKY "borders/DEFAULT/images/titlebar_stick_active.png"
-  __EDGE_SCALING 6 6 1 1
-__END
-
-__ICLASS __BGN
-  __NAME TITLE
-  __NORMAL  "borders/DEFAULT/images/title.png"
-  __NORMAL_ACTIVE  "borders/DEFAULT/images/title_active.png"
-  __PADDING 0 0 5 0
-  __NORMAL_STICKY "borders/DEFAULT/images/title_stick.png"
-  __NORMAL_ACTIVE_STICKY "borders/DEFAULT/images/title_stick_active.png"
-__END
-
-__ICLASS __BGN
-  __NAME TITLE_BAR_MASK
-  __NORMAL  "borders/DEFAULT/images/titlebar_mask.png"
-  __EDGE_SCALING 6 6 1 1
-  __NORMAL_ACTIVE  "borders/DEFAULT/images/titlebar_mask_active.png"
-  __EDGE_SCALING 6 6 1 1
-  __NORMAL_STICKY "borders/DEFAULT/images/titlebar_stick_mask.png"
-  __EDGE_SCALING 6 6 1 1
-  __NORMAL_ACTIVE_STICKY "borders/DEFAULT/images/titlebar_stick_mask_active.png"
-  __EDGE_SCALING 6 6 1 1
-__END
-
-__ICLASS __BGN
-  __NAME BUTTON_RED_STEEL
-  __NORMAL  "borders/DEFAULT/images/button_clear2_stick.png"
-  __NORMAL_ACTIVE "borders/DEFAULT/images/button_red_stick.png"
-  __HILITED_ACTIVE "borders/DEFAULT/images/button_red_stick_hi.png"
-  __CLICKED_ACTIVE "borders/DEFAULT/images/button_red_stick_down.png"
-  __NORMAL_STICKY "borders/DEFAULT/images/button_clear2_stick.png"
-  __NORMAL_ACTIVE_STICKY "borders/DEFAULT/images/button_red_stick.png"
-  __HILITED_ACTIVE_STICKY "borders/DEFAULT/images/button_red_stick_hi.png"
-  __CLICKED_ACTIVE_STICKY "borders/DEFAULT/images/button_red_stick_down.png"
-__END
-
-__ICLASS __BGN
-  __NAME BUTTON_YELLOW_STEEL
-  __NORMAL  "borders/DEFAULT/images/button_clear2_stick.png"
-  __NORMAL_ACTIVE "borders/DEFAULT/images/button_yellow_stick.png"
-  __HILITED_ACTIVE "borders/DEFAULT/images/button_yellow_stick_hi.png"
-  __CLICKED_ACTIVE "borders/DEFAULT/images/button_yellow_stick_down.png"
-  __NORMAL_STICKY "borders/DEFAULT/images/button_clear2_stick.png"
-  __NORMAL_ACTIVE_STICKY "borders/DEFAULT/images/button_yellow_stick.png"
-  __HILITED_ACTIVE_STICKY "borders/DEFAULT/images/button_yellow_stick_hi.png"
-  __CLICKED_ACTIVE_STICKY "borders/DEFAULT/images/button_yellow_stick_down.png"
-__END
-
-__ICLASS __BGN
-  __NAME BUTTON_GREEN_STEEL
-  __NORMAL  "borders/DEFAULT/images/button_clear2_stick.png"
-  __NORMAL_ACTIVE "borders/DEFAULT/images/button_green_stick.png"
-  __HILITED_ACTIVE "borders/DEFAULT/images/button_green_stick_hi.png"
-  __CLICKED_ACTIVE "borders/DEFAULT/images/button_green_stick_down.png"
-  __NORMAL_STICKY "borders/DEFAULT/images/button_clear2_stick.png"
-  __NORMAL_ACTIVE_STICKY "borders/DEFAULT/images/button_green_stick.png"
-  __HILITED_ACTIVE_STICKY "borders/DEFAULT/images/button_green_stick_hi.png"
-  __CLICKED_ACTIVE_STICKY "borders/DEFAULT/images/button_green_stick_down.png"
-__END
-
-__ICLASS __BGN
-  __NAME BUTTON_CLEAR_STEEL
-  __NORMAL  "borders/DEFAULT/images/button_clear_stick.png"
-  __NORMAL_ACTIVE "borders/DEFAULT/images/button_clear_stick.png"
-  __HILITED_ACTIVE "borders/DEFAULT/images/button_clear_stick_hi.png"
-  __CLICKED_ACTIVE "borders/DEFAULT/images/button_clear_stick_down.png"
-  __NORMAL_STICKY "borders/DEFAULT/images/button_clear_stick.png"
-  __NORMAL_ACTIVE_STICKY "borders/DEFAULT/images/button_clear_stick.png"
-  __HILITED_ACTIVE_STICKY "borders/DEFAULT/images/button_clear_stick_hi.png"
-  __CLICKED_ACTIVE_STICKY "borders/DEFAULT/images/button_clear_stick_down.png"
-__END
-
-
-__ICLASS __BGN
-  __NAME TITLE_BAR_STEEL
-  __NORMAL  "borders/DEFAULT/images/titlebar_stick.png"
-  __EDGE_SCALING 6 6 1 1
-  __NORMAL_ACTIVE  "borders/DEFAULT/images/titlebar_stick_active.png"
-  __EDGE_SCALING 6 6 1 1
-  __NORMAL_STICKY "borders/DEFAULT/images/titlebar_stick.png"
-  __EDGE_SCALING 6 6 1 1
-  __NORMAL_ACTIVE_STICKY "borders/DEFAULT/images/titlebar_stick_active.png"
-  __EDGE_SCALING 6 6 1 1
-__END
-
-__ICLASS __BGN
-  __NAME TITLE_STEEL
-  __NORMAL  "borders/DEFAULT/images/title_stick.png"
-  __NORMAL_ACTIVE  "borders/DEFAULT/images/title_stick_active.png"
-  __PADDING 0 0 5 0
-  __NORMAL_STICKY "borders/DEFAULT/images/title_stick.png"
-  __NORMAL_ACTIVE_STICKY "borders/DEFAULT/images/title_stick_active.png"
-__END
-
-__ICLASS __BGN
-  __NAME TITLE_BAR_MASK_STEEL
-  __NORMAL  "borders/DEFAULT/images/titlebar_stick_mask.png"
-  __EDGE_SCALING 6 6 1 1
-  __NORMAL_ACTIVE  "borders/DEFAULT/images/titlebar_stick_mask_active.png"
-  __EDGE_SCALING 6 6 1 1
-  __NORMAL_STICKY "borders/DEFAULT/images/titlebar_stick_mask.png"
-  __EDGE_SCALING 6 6 1 1
-  __NORMAL_ACTIVE_STICKY "borders/DEFAULT/images/titlebar_stick_mask_active.png"
-  __EDGE_SCALING 6 6 1 1
-__END
-
-__ICLASS __BGN
-  __NAME SMALL_BUTTON_RED
-  __NORMAL  "borders/SMALL/images/button_inactive.png"
-  __NORMAL_ACTIVE "borders/SMALL/images/button_red.png"
-  __HILITED_ACTIVE "borders/SMALL/images/button_red_hi.png"
-  __CLICKED_ACTIVE "borders/SMALL/images/button_red_down.png"
-  __NORMAL_STICKY "borders/SMALL/images/button_clear.png"
-  __NORMAL_ACTIVE_STICKY "borders/SMALL/images/button_red.png"
-  __HILITED_ACTIVE_STICKY "borders/SMALL/images/button_red_hi.png"
-  __CLICKED_ACTIVE_STICKY "borders/SMALL/images/button_red_down.png"
-__END
-
-__ICLASS __BGN
-  __NAME SMALL_BUTTON_YELLOW
-  __NORMAL  "borders/SMALL/images/button_inactive.png"
-  __NORMAL_ACTIVE "borders/SMALL/images/button_yellow.png"
-  __HILITED_ACTIVE "borders/SMALL/images/button_yellow_hi.png"
-  __CLICKED_ACTIVE "borders/SMALL/images/button_yellow_down.png"
-  __NORMAL_STICKY "borders/SMALL/images/button_clear.png"
-  __NORMAL_ACTIVE_STICKY "borders/SMALL/images/button_yellow.png"
-  __HILITED_ACTIVE_STICKY "borders/SMALL/images/button_yellow_hi.png"
-  __CLICKED_ACTIVE_STICKY "borders/SMALL/images/button_yellow_down.png"
-__END
-
-__ICLASS __BGN
-  __NAME SMALL_BUTTON_CLEAR
-  __NORMAL  "borders/SMALL/images/button_inactive.png"
-  __NORMAL_ACTIVE "borders/SMALL/images/button_clear.png"
-  __HILITED_ACTIVE "borders/SMALL/images/button_clear_hi.png"
-  __CLICKED_ACTIVE "borders/SMALL/images/button_clear_down.png"
-  __NORMAL_STICKY "borders/SMALL/images/button_clear.png"
-  __NORMAL_ACTIVE_STICKY "borders/SMALL/images/button_clear.png"
-  __HILITED_ACTIVE_STICKY "borders/SMALL/images/button_clear_hi.png"
-  __CLICKED_ACTIVE_STICKY "borders/SMALL/images/button_clear_down.png"
-__END
-
-__ICLASS __BGN
-  __NAME SMALL_TITLE
-  __NORMAL  "borders/SMALL/images/title.png"
-  __EDGE_SCALING 1 1 1 1
-  __NORMAL_ACTIVE  "borders/SMALL/images/title.png"
-  __EDGE_SCALING 1 1 1 1
-  __NORMAL_STICKY "borders/SMALL/images/title.png"
-  __EDGE_SCALING 1 1 1 1
-  __NORMAL_ACTIVE_STICKY "borders/SMALL/images/title.png"
-  __EDGE_SCALING 1 1 1 1
-__END
-
-__ICLASS __BGN
-  __NAME SMALL_RESIZE_HANDLE
-  __NORMAL "borders/DEFAULT/images/resize_handle.png"
-  __NORMAL_ACTIVE "borders/DEFAULT/images/resize_handle.png"
-  __HILITED_ACTIVE "borders/DEFAULT/images/resize_handle.png"
-  __CLICKED_ACTIVE "borders/DEFAULT/images/resize_handle.png"
-  __NORMAL_STICKY "borders/DEFAULT/images/resize_handle.png"
-  __NORMAL_ACTIVE_STICKY "borders/DEFAULT/images/resize_handle.png"
-  __HILITED_ACTIVE_STICKY "borders/DEFAULT/images/resize_handle.png"
-  __CLICKED_ACTIVE_STICKY "borders/DEFAULT/images/resize_handle.png"
-__END
-
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/colormodifiers.cfg b/abs/mv-core/e16-myth-settings/e16/themes/mine/colormodifiers.cfg
deleted file mode 100755
index cb75584..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/colormodifiers.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-#include <definitions>
-__E_CFG_VERSION 0
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/common/images/bg.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/common/images/bg.png
deleted file mode 100755
index af0ef1f..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/common/images/bg.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/common/images/blank.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/common/images/blank.png
deleted file mode 100755
index c3a292d..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/common/images/blank.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/common/images/selected.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/common/images/selected.png
deleted file mode 100755
index 1e51f96..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/common/images/selected.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/coords/coords.cfg b/abs/mv-core/e16-myth-settings/e16/themes/mine/coords/coords.cfg
deleted file mode 100755
index a0c29da..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/coords/coords.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-__ICLASS __BGN
-  __NAME COORDS
-  __NORMAL "common/images/bg.png"
-  __FILLRULE __TILE
-__END
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/cursors.cfg b/abs/mv-core/e16-myth-settings/e16/themes/mine/cursors.cfg
deleted file mode 100755
index bc74073..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/cursors.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <definitions>
-__E_CFG_VERSION 0
-#include <cursors/cursors.cfg>
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/desktops.cfg b/abs/mv-core/e16-myth-settings/e16/themes/mine/desktops.cfg
deleted file mode 100755
index b55f430..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/desktops.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <definitions>
-__E_CFG_VERSION 0
-#include <backgrounds/backgrounds.cfg>
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/dialogs.cfg b/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/dialogs.cfg
deleted file mode 100755
index bcc0e38..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/dialogs.cfg
+++ /dev/null
@@ -1,165 +0,0 @@
-__ICLASS __BGN
-  __NAME "DIALOG"
-  __NORMAL "common/images/bg.png"
-    __FILLRULE __TILE
-__END
-
-__ICLASS __BGN
-  __NAME "DIALOG_BUTTON"
-  __NORMAL "dialogs/images/button_up.png"
-    __EDGE_SCALING 14 14 4 7
-  __HILITED "dialogs/images/button_down.png"
-  __EDGE_SCALING 14 14 4 7
-  __PADDING 14 14 3 6
-  __CLICKED "dialogs/images/button_down.png"
-  __EDGE_SCALING 14 14 4 7
-  __PADDING 14 14 4 7
-__END
-
-__ICLASS __BGN
-  __NAME DIALOG_WIDGET_BUTTON
-  __NORMAL "dialogs/images/button_up.png"
-    __EDGE_SCALING 14 14 4 7
-  __HILITED "dialogs/images/button_down.png"
-  __EDGE_SCALING 14 14 4 7
-  __PADDING 14 14 4 7
-  __CLICKED "dialogs/images/button_down.png"
-  __EDGE_SCALING 14 14 4 7
-  __PADDING 14 14 4 7
-__END
-
-__ICLASS __BGN
-  __NAME DIALOG_WIDGET_SEPARATOR
-  __NORMAL "dialogs/images/separator.png"
-    __EDGE_SCALING 1 1 1 1
-  __PADDING 1 1 1 1
-__END
-
-__ICLASS __BGN
-  __NAME DIALOG_WIDGET_CHECK_BUTTON
-  __NORMAL "dialogs/images/check_off.png"
-    __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE "dialogs/images/check_on.png"
-    __EDGE_SCALING 0 0 0 0
-  __PADDING 4 5 4 5
-__END
-
-__ICLASS __BGN
-  __NAME DIALOG_WIDGET_RADIO_BUTTON
-  __NORMAL "dialogs/images/radio_off.png"
-    __EDGE_SCALING 0 0 0 0
-  __NORMAL_ACTIVE "dialogs/images/radio_on.png"
-    __EDGE_SCALING 0 0 0 0
-  __PADDING 4 5 4 5
-__END
-
-__ICLASS __BGN
-  __NAME DIALOG_WIDGET_SLIDER_BASE_HORIZONTAL
-  __NORMAL "dialogs/images/slider_horiz.png"
-    __EDGE_SCALING 3 3 0 0
-  __PADDING 4 4 8 8
-__END
-
-__ICLASS __BGN
-  __NAME DIALOG_WIDGET_SLIDER_KNOB_HORIZONTAL
-  __NORMAL "dialogs/images/slider_knob_horiz.png"
-    __EDGE_SCALING 0 0 0 0
-  __PADDING 4 5 4 5
-__END
-
-__ICLASS __BGN
-  __NAME DIALOG_WIDGET_SLIDER_BASE_VERTICAL
-  __NORMAL "dialogs/images/slider_vert.png"
-    __EDGE_SCALING 0 0 3 3
-  __PADDING 8 8 4 4
-__END
-
-__ICLASS __BGN
-  __NAME DIALOG_WIDGET_SLIDER_KNOB_VERTICAL
-  __NORMAL "dialogs/images/slider_knob_vert.png"
-    __EDGE_SCALING 0 0 0 0
-  __PADDING 4 5 4 5
-__END
-
-__ICLASS __BGN
-  __NAME "DIALOG_WIDGET_AREA"
-  __NORMAL "common/images/bg.png"
-  __FILLRULE __TILE
-__END
-
-__ICLASS __BGN
-  __NAME "SETTINGS_AREADESK_AREA"
-  __NORMAL "dialogs/images/window.png"
-    __EDGE_SCALING 2 2 2 2
-  __PADDING 4 4 4 4
-__END
-
-__ICLASS __BGN
-  __NAME "SETTINGS_DESKTOP_AREA"
-  __NORMAL "common/images/bg.png"
-  __FILLRULE __TILE
-__END
-
-__ICLASS __BGN
-  __NAME "DIALOG_WIDGET_TABLE"
-  __NORMAL "common/images/bg.png"
-  __FILLRULE __TILE
-__END
-
-__ICLASS __BGN
-  __NAME "SETTINGS_AREA_AREA"
-  __NORMAL "common/images/bg.png"
-  __FILLRULE __TILE
-__END
-
-
-
-
-__TCLASS __BGN
-  __NAME "DIALOG"
-  __NORMAL "-*-helvetica-medium-r-normal-*-*-120-*-*-*-*-*-*"
-    __FORGROUND_COLOR 0 0 0
-    __BACKGROUND_COLOR 192 192 192
-    __JUSTIFICATION 0
-__END
-
-__TCLASS __BGN
-  __NAME "DIALOG_BUTTON"
-  __NORMAL "-*-helvetica-medium-r-normal-*-*-120-*-*-*-*-*-*"
-    __DRAWING_EFFECT __EFFECT_NONE
-    __FORGROUND_COLOR 0 0 0
-    __BACKGROUND_COLOR 255 255 255
-    __JUSTIFICATION 512
-__END
-
-__TCLASS __BGN
-  __NAME "DIALOG_WIDGET_TEXT"
-  __NORMAL "-*-helvetica-medium-r-normal-*-*-120-*-*-*-*-*-*"
-  __FORGROUND_COLOR 0 0 0
-  __BACKGROUND_COLOR 192 192 192
-  __JUSTIFICATION 0
-__END
-
-__TCLASS __BGN
-  __NAME "DIALOG_WIDGET_CHECK_BUTTON"
-  __NORMAL "-*-helvetica-medium-r-normal-*-*-120-*-*-*-*-*-*"
-  __FORGROUND_COLOR 0 0 0
-  __BACKGROUND_COLOR 192 192 192
-  __JUSTIFICATION 0
-__END
-
-__TCLASS __BGN
-  __NAME "DIALOG_WIDGET_RADIO_BUTTON"
-  __NORMAL "-*-helvetica-medium-r-normal-*-*-120-*-*-*-*-*-*"
-  __FORGROUND_COLOR 0 0 0
-  __BACKGROUND_COLOR 192 192 192
-  __JUSTIFICATION 0
-__END
-
-__TCLASS __BGN
-  __NAME "DIALOG_WIDGET_BUTTON"
-  __NORMAL "-*-helvetica-medium-r-normal-*-*-120-*-*-*-*-*-*"
-  __FORGROUND_COLOR 0 0 0
-  __BACKGROUND_COLOR 255 255 255
-  __JUSTIFICATION 512
-__END
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/button_down.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/button_down.png
deleted file mode 100755
index d7eb3da..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/button_down.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/button_down2.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/button_down2.png
deleted file mode 100755
index f5e718f..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/button_down2.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/button_up.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/button_up.png
deleted file mode 100755
index a09fb66..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/button_up.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/button_up2.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/button_up2.png
deleted file mode 100755
index 1baa1d2..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/button_up2.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/check_off.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/check_off.png
deleted file mode 100755
index c6fcdd7..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/check_off.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/check_on.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/check_on.png
deleted file mode 100755
index 3641af2..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/check_on.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/radio_off.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/radio_off.png
deleted file mode 100755
index 144a878..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/radio_off.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/radio_on.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/radio_on.png
deleted file mode 100755
index 8051821..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/radio_on.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/separator.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/separator.png
deleted file mode 100755
index f523ac9..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/separator.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/slider_horiz.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/slider_horiz.png
deleted file mode 100755
index ea10851..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/slider_horiz.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/slider_knob_horiz.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/slider_knob_horiz.png
deleted file mode 100755
index fb6b505..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/slider_knob_horiz.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/slider_knob_vert.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/slider_knob_vert.png
deleted file mode 100755
index d0b6eac..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/slider_knob_vert.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/slider_vert.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/slider_vert.png
deleted file mode 100755
index e6d2f36..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/slider_vert.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/window.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/window.png
deleted file mode 100755
index 94cd7ee..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/dialogs/images/window.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/dragbar/dragbar.cfg b/abs/mv-core/e16-myth-settings/e16/themes/mine/dragbar/dragbar.cfg
deleted file mode 100755
index 7f44051..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/dragbar/dragbar.cfg
+++ /dev/null
@@ -1,55 +0,0 @@
-__ICLASS __BGN
-  __NAME DESKTOP_DRAGBUTTON_HORIZ
-  __NORMAL "dragbar/images/dragbar_horiz.png"
-  __FILLRULE __TILE
-  __CLICKED "dragbar/images/dragbar_horiz.png"
-  __FILLRULE __TILE
-__END
-
-__ICLASS __BGN
-  __NAME DESKTOP_RAISEBUTTON_HORIZ
-  __NORMAL "dragbar/images/uparrow.png"
-  __CLICKED "dragbar/images/uparrow_cl.png"
-__END
-
-__ICLASS __BGN
-  __NAME DESKTOP_LOWERBUTTON_HORIZ
-  __NORMAL "dragbar/images/downarrow.png"
-  __CLICKED "dragbar/images/downarrow_cl.png"
-__END
-
-__ICLASS __BGN
-  __NAME DESKTOP_DESKRAY_HORIZ
-  __NORMAL "dragbar/images/dragbar_horiz.png"
-  __FILLRULE __TILE
-  __CLICKED "dragbar/images/dragbar_horiz.png"
-  __FILLRULE __TILE
-__END
-
-__ICLASS __BGN
-  __NAME DESKTOP_DRAGBUTTON_VERT
-  __NORMAL "dragbar/images/dragbar_vert.png"
-  __FILLRULE __TILE
-  __CLICKED "dragbar/images/dragbar_vert.png"
-  __FILLRULE __TILE
-__END
-
-__ICLASS __BGN
-  __NAME DESKTOP_RAISEBUTTON_VERT
-  __NORMAL "dragbar/images/leftarrow.png"
-  __CLICKED "dragbar/images/leftarrow_cl.png"
-__END
-
-__ICLASS __BGN
-  __NAME DESKTOP_LOWERBUTTON_VERT
-  __NORMAL "dragbar/images/rightarrow.png"
-  __CLICKED "dragbar/images/rightarrow_cl.png"
-__END
-
-__ICLASS __BGN
-  __NAME DESKTOP_DESKRAY_VERT
-  __NORMAL "dragbar/images/dragbar_vert.png"
-  __FILLRULE __TILE
-  __CLICKED "dragbar/images/dragbar_vert.png"
-  __FILLRULE __TILE
-__END
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/dragbar/images/.xvpics/downarrow.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/dragbar/images/.xvpics/downarrow.png
deleted file mode 100755
index ba4f73e..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/dragbar/images/.xvpics/downarrow.png
+++ /dev/null
@@ -1,5 +0,0 @@
-P7 332
-#IMGINFO:16x16 RGB (619 bytes)
-#END_OF_COMMENTS
-16 16 255
-Û¶¶Ú·Ú·Ú¶ÛÚ¶Û¶¶ÛÛ¶ÿÛþÿÛÿÿÿÿÛÿÚÛ¶¶ÛÿÿÿÿÚÿÿÿÛÿÿÿ¶Ú¶ÛÿÿÛÿþÛÿÛþÿÿÛÛµ¶ÛÿÿÚÿÿÛÛþÿÿÿÛÛµ¶ÛÿÚ¶%IHJH’ÿÿÿÛ‘¶ÿÛÿÛHm%ImÛÿÿÞû–¶ÛÿÛþ·HII¶ÿÿÿÛÚ·¶ÛÿÿÿÿHInÿÚÿÿßû–¶ÛÿÛþÿÛ$ÛÛþÿÿÛß±¶ÿÛÿÿÿÛµÿÛÿÿÿÛÚ¶¶ÿÛÿÿÿÿÚÛÛÿÿþÛß²¶ÛÿÿÿÿÿÿÛÿþÿÿÿÛ¶¶ÛÚÿÿÿÿÿÿÿÿÿÿÿ¶¶¶’¶’’µ“µ’’¶’¶‘’·ÿ¶’’‘’’‘’’‘’’’ÚÛ
\ No newline at end of file
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/dragbar/images/downarrow.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/dragbar/images/downarrow.png
deleted file mode 100755
index 6432181..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/dragbar/images/downarrow.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/dragbar/images/downarrow_cl.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/dragbar/images/downarrow_cl.png
deleted file mode 100755
index e90a817..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/dragbar/images/downarrow_cl.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/dragbar/images/dragbar_horiz.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/dragbar/images/dragbar_horiz.png
deleted file mode 100755
index 4ad874e..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/dragbar/images/dragbar_horiz.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/dragbar/images/dragbar_vert.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/dragbar/images/dragbar_vert.png
deleted file mode 100755
index 0622fd2..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/dragbar/images/dragbar_vert.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/dragbar/images/uparrow.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/dragbar/images/uparrow.png
deleted file mode 100755
index 2985fc4..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/dragbar/images/uparrow.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/dragbar/images/uparrow_cl.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/dragbar/images/uparrow_cl.png
deleted file mode 100755
index c8bbf20..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/dragbar/images/uparrow_cl.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/focuslist/focuslist.cfg b/abs/mv-core/e16-myth-settings/e16/themes/mine/focuslist/focuslist.cfg
deleted file mode 100755
index a6de051..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/focuslist/focuslist.cfg
+++ /dev/null
@@ -1,21 +0,0 @@
-__ICLASS __BGN
-  __NAME WARPFOCUS
-  __NORMAL "common/images/bg.png"
-  __FILLRULE __TILE
-  __CLICKED "common/images/selected.png"
-  __FILLRULE __TILE
-__END
-
-
-
-__TCLASS __BGN
-  __NAME "WARPFOCUS"
-  __NORMAL "-*-helvetica-medium-r-normal-*-*-120-*-*-*-*-*-*"
-    __FORGROUND_COLOR 0 0 0 0
-    __BACKGROUND_COLOR 255 255 255
-    __JUSTIFICATION 0
-  __CLICKED "-*-helvetica-medium-r-normal-*-*-120-*-*-*-*-*-*"
-    __FORGROUND_COLOR 0 0 0
-    __BACKGROUND_COLOR 255 255 255
-    __JUSTIFICATION 0
-__END
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/focuslist/images/lightbg.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/focuslist/images/lightbg.png
deleted file mode 100755
index 90a49f9..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/focuslist/images/lightbg.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/focuslist/images/lightbg_hl.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/focuslist/images/lightbg_hl.png
deleted file mode 100755
index 58d5eda..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/focuslist/images/lightbg_hl.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/iconbox.cfg b/abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/iconbox.cfg
deleted file mode 100755
index 20b0c4f..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/iconbox.cfg
+++ /dev/null
@@ -1,118 +0,0 @@
-__ICLASS __BGN
-  __NAME ICONBOX_HORIZONTAL
-  __NORMAL "iconbox/images/background.png"
-  __FILLRULE __TILE
-__END
-
-__ICLASS __BGN
-  __NAME ICONBOX_VERTICAL
-  __NORMAL "iconbox/images/background.png"
-  __FILLRULE __TILE
-__END
-
-__ICLASS __BGN
-  __NAME ICONBOX_COVER_VERTICAL
-  __NORMAL "iconbox/images/ib_cover_v.png"
-  __EDGE_SCALING   6 6 6 6
-  __PADDING        4 4 4 4
-__END
-
-__ICLASS __BGN
-  __NAME ICONBOX_COVER_HORIZONTAL
-  __NORMAL "iconbox/images/ib_cover_h.png"
-  __EDGE_SCALING   6 6 6 6
-  __PADDING        4 4 4 4
-__END
-
-__ICLASS __BGN
-  __NAME ICONBOX_ARROW_LEFT
-  __NORMAL "iconbox/images/ar_l.png"
-  __EDGE_SCALING   4 4 4 4
-  __CLICKED "iconbox/images/ar_l.png"
-  __EDGE_SCALING   4 4 4 4
-  __PADDING        4 4 4 4
-__END
-
-__ICLASS __BGN
-  __NAME ICONBOX_ARROW_RIGHT
-  __NORMAL "iconbox/images/ar_r.png"
-  __EDGE_SCALING   4 4 4 4
-  __CLICKED "iconbox/images/ar_r.png"
-  __EDGE_SCALING   4 4 4 4
-  __PADDING        4 4 4 4
-__END
-
-__ICLASS __BGN
-  __NAME ICONBOX_ARROW_UP
-  __NORMAL "iconbox/images/ar_u.png"
-  __EDGE_SCALING   4 4 4 4
-  __CLICKED "iconbox/images/ar_u.png"
-  __EDGE_SCALING   4 4 4 4
-  __PADDING        4 4 4 4
-__END
-
-__ICLASS __BGN
-  __NAME ICONBOX_ARROW_DOWN
-  __NORMAL "iconbox/images/ar_d.png"
-  __EDGE_SCALING   4 4 4 4
-  __CLICKED "iconbox/images/ar_d.png"
-  __EDGE_SCALING   4 4 4 4
-  __PADDING        4 4 4 4
-__END
-
-__ICLASS __BGN
-  __NAME ICONBOX_SCROLLBAR_BASE_HORIZONTAL
-  __NORMAL "iconbox/images/htrough.png"
-  __EDGE_SCALING   5 5 0 0
-__END
-	
-__ICLASS __BGN
-  __NAME ICONBOX_SCROLLBAR_KNOB_HORIZONTAL
-  __NORMAL "iconbox/images/slh.png"
-  __EDGE_SCALING   4 4 4 4
-  __PADDING        4 4 4 4
-__END
-	
-__ICLASS __BGN
-  __NAME ICONBOX_SCROLLBAR_BASE_VERTICAL
-  __NORMAL "iconbox/images/vtrough.png"
-  __EDGE_SCALING   1 1 4 4
-  __PADDING        1 1 4 4
-__END
-
-__ICLASS __BGN
-  __NAME ICONBOX_SCROLLBAR_KNOB_VERTICAL
-  __NORMAL "iconbox/images/slv.png"
-  __EDGE_SCALING   4 4 4 4
-  __PADDING        4 4 4 4
-__END
-
-__ICLASS __BGN
-  __NAME ICONBOX_TITLE_BLANK
-  __NORMAL "common/images/blank.png"
-__END
-    
-__ICLASS __BGN
-  __NAME ICONBOX_TITLE_MAIN
-  __NORMAL "tooltips/images/ttip.png"
-  __EDGE_SCALING 2 3 2 3
-  __PADDING 3 4 4 4
-
-__END
-
-__ICLASS __BGN
-  __NAME DEFAULT_ICON_BUTTON
-  __NORMAL "iconbox/images/bt1.png"
-  __EDGE_SCALING   4 4 4 4
-  __PADDING        4 4 4 4
-__END
-
-__TCLASS __BGN
-  __NAME "ICONBOX_WINDOW_TITLE"
-  __NORMAL "-*-helvetica-bold-r-normal-*-*-120-*-*-*-*-*-*"
-  __FORGROUND_COLOR 0 0 0
-  __BACKGROUND_COLOR 255 255 255
-  __JUSTIFICATION 0
-__END
-	    
-DEFINE_TOOLTIP("ICONBOX", "ICONBOX_TITLE_MAIN", "ICONBOX_TITLE_BLANK", "ICONBOX_TITLE_BLANK", "ICONBOX_TITLE_BLANK", "ICONBOX_TITLE_BLANK", "ICONBOX_WINDOW_TITLE", 16)
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/ar_d.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/ar_d.png
deleted file mode 100755
index ffe79eb..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/ar_d.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/ar_l.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/ar_l.png
deleted file mode 100755
index 1b5a089..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/ar_l.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/ar_r.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/ar_r.png
deleted file mode 100755
index ab70e68..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/ar_r.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/ar_u.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/ar_u.png
deleted file mode 100755
index 63fd585..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/ar_u.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/background.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/background.png
deleted file mode 100755
index f91777b..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/background.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/bt1.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/bt1.png
deleted file mode 100755
index 442d35c..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/bt1.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/htrough.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/htrough.png
deleted file mode 100755
index 6dbe930..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/htrough.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/ib_cover_h.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/ib_cover_h.png
deleted file mode 100755
index 9885911..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/ib_cover_h.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/ib_cover_v.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/ib_cover_v.png
deleted file mode 100755
index 9885911..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/ib_cover_v.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/slh.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/slh.png
deleted file mode 100755
index b8ae13c..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/slh.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/slv.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/slv.png
deleted file mode 100755
index 821ad55..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/slv.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/vtrough.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/vtrough.png
deleted file mode 100755
index 4a66522..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/iconbox/images/vtrough.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/imageclasses.cfg b/abs/mv-core/e16-myth-settings/e16/themes/mine/imageclasses.cfg
deleted file mode 100755
index 0911e11..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/imageclasses.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-#include <definitions>
-__E_CFG_VERSION 0
-#include <coords/coords.cfg>
-#include <dialogs/dialogs.cfg>
-#include <dragbar/dragbar.cfg>
-#include <focuslist/focuslist.cfg>
-#include <iconbox/iconbox.cfg>
-#include <pager/pager.cfg>
-#include <epplets/epplets.cfg>
-#include <Eterm/Eterm.cfg>
-#include <buttons/images.cfg>
-#include <borders/images.cfg>
-#include <menus/images.cfg>
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/init.cfg b/abs/mv-core/e16-myth-settings/e16/themes/mine/init.cfg
deleted file mode 100755
index 905fb7e..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/init.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <definitions>
-__E_CFG_VERSION 0
-#include <init/init.cfg>
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/init/images/bar.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/init/images/bar.png
deleted file mode 100755
index 67659f3..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/init/images/bar.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/init/images/header.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/init/images/header.png
deleted file mode 100755
index 7e7f892..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/init/images/header.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/init/init.cfg b/abs/mv-core/e16-myth-settings/e16/themes/mine/init/init.cfg
deleted file mode 100755
index 60444fe..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/init/init.cfg
+++ /dev/null
@@ -1,52 +0,0 @@
-BEGIN_BACKGROUND("STARTUP_BACKGROUND")
-  SET_SOLID("255 255 255")
-  ADD_BACKGROUND_SCALED("backgrounds/blue.gif")
-//   ADD_OVERLAY_IMAGE_BOTTOM_MIDDLE("init/images/logo.png")
-  ADD_OVERLAY_IMAGE_CENTERED("init/images/header.png")
-END_BACKGROUND
-
-/*************************************************************************/
-/* Progress bar graphics and text                                        */
-/*************************************************************************/
-
-
-__ICLASS __BGN
-  __NAME STARTUP_BAR
-  __NORMAL "backgrounds/blue.gif"
-  __EDGE_SCALING 0 0 0 0
-__END
-
-
-__ICLASS __BGN
-  __NAME PROGRESS_BAR
-  /* Used for the text background */
-  __NORMAL  "init/images/bar.png"
-  __EDGE_SCALING 0 0 0 0
-  /* Used for the number background */
-  __CLICKED "init/images/bar.png"
-  __EDGE_SCALING 0 0 0 0
-  /* Used for the progress bar */
-  __NORMAL_ACTIVE  "init/images/bar.png"
-  __EDGE_SCALING 0 0 0 0
-  __PADDING 0 0 0 0 
-__END
-
-__TCLASS __BGN
-  __NAME "PROGRESS_TEXT"
-  __NORMAL "-*-helvetica-bold-r-normal-*-*-120-*-*-*-*-*-*"
-    __DRAWING_EFFECT __EFFECT_NONE
-    __FORGROUND_COLOR 0 0 0
-    __BACKGROUND_COLOR 0 0 0
-    __JUSTIFICATION 0
-__END
-
-__TCLASS __BGN
-  __NAME "PROGRESS_TEXT_NUMBER"
-
-  __NORMAL "-*-helvetica-bold-r-normal-*-*-120-*-*-*-*-*-*"
-    __DRAWING_EFFECT __EFFECT_NONE
-    __FORGROUND_COLOR 0 0 0
-    __BACKGROUND_COLOR 0 0 0
-    __JUSTIFICATION 1024
-__END
-
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/logo.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/logo.png
deleted file mode 100755
index 6c1e034..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/logo.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/actions.cfg b/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/actions.cfg
deleted file mode 100755
index 1743054..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/actions.cfg
+++ /dev/null
@@ -1,30 +0,0 @@
-__ACLASS __BGN
-        __NAME ACTION_AQUA_PREFERENCES
-        __TOOLTIP_TEXT "ENLIGHTENMENT"
-        __TYPE __TYPE_NORMAL
-        __TOOLTIP_ACTION_TEXT "Open Configuration Menu"
-        __BUTTON 1
-        __EVENT __MOUSE_RELEASE
-        __ACTION __A_SHOW_MENU "named CONFIG_SUBMENU"
-__END
-
-__ACLASS __BGN
-  __NAME ACTION_AQUA_SPECIAL
-  __TYPE __TYPE_NORMAL
-  __ALLOW_ANY_MODIFIER_KEYS __ON
-  __ALLOW_ANY_BUTTON __ON
-  __EVENT __MOUSE_RELEASE
-  __ACTION __A_SHOW_MENU "named AQUA_SPECIAL"
-__END
-
-__ACLASS __BGN
-  __NAME ACTION_AQUA_HELP
-  __TYPE __TYPE_NORMAL
-  __ALLOW_ANY_MODIFIER_KEYS __ON
-  __ALLOW_ANY_BUTTON __ON
-  __EVENT __MOUSE_RELEASE
-  __ACTION __A_SHOW_MENU "named AQUA_HELP_MENU"
-__END
-
-
-
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/buttons.cfg b/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/buttons.cfg
deleted file mode 100755
index 98a9c27..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/buttons.cfg
+++ /dev/null
@@ -1,53 +0,0 @@
-#include <definitions>
-
-__E_CFG_VERSION 0
-
-__BUTTON __BGN
-        __NAME MACBAR_PREFERENCES
-        __ICLASS BAR_PREFERENCES
-        __ACLASS ACTION_AQUA_PREFERENCES
-        __KEEP_ON_TOP __OFF
-        __X_ORIGIN 0
-        __Y_ORIGIN 0
-        __X_PERCENTAGE 0  
-        __X_ABSOLUTE 36
-        __Y_PERCENTAGE 0
-        __Y_ABSOLUTE 0
-        __USE_SIZE_OF_IMAGE __ON
-        __MAKE_STICKY __ON
-        __SHOW_BY_DEFAULT __ON
-__END
-
-__BUTTON __BGN
-        __NAME MACBAR_SPECIAL
-        __ICLASS BAR_SPECIAL
-        __ACLASS ACTION_AQUA_SPECIAL
-        __KEEP_ON_TOP __OFF
-        __X_ORIGIN 0
-        __Y_ORIGIN 0
-        __X_PERCENTAGE 0  
-        __X_ABSOLUTE 99
-        __Y_PERCENTAGE 0
-        __Y_ABSOLUTE 0
-        __USE_SIZE_OF_IMAGE __ON
-        __MAKE_STICKY __ON
-        __SHOW_BY_DEFAULT __ON
-__END
-
-__BUTTON __BGN
-        __NAME MACBAR_HELP
-        __ICLASS BAR_HELP
-        __ACLASS ACTION_AQUA_HELP
-        __KEEP_ON_TOP __OFF
-        __X_ORIGIN 0
-        __Y_ORIGIN 0
-        __X_PERCENTAGE 0  
-        __X_ABSOLUTE 145
-        __Y_PERCENTAGE 0
-        __Y_ABSOLUTE 0
-        __USE_SIZE_OF_IMAGE __ON
-        __MAKE_STICKY __ON
-        __SHOW_BY_DEFAULT __ON
-__END
-
-
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images.cfg b/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images.cfg
deleted file mode 100755
index 998b112..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images.cfg
+++ /dev/null
@@ -1,21 +0,0 @@
-__ICLASS __BGN
-	__NAME BAR_PREFERENCES
-	__NORMAL "menus/images/preferences.png"
-	__HILITED "menus/images/preferences_hi.png"
-	__CLICKED "menus/images/preferences_hi.png"
-__END
-
-__ICLASS __BGN
-        __NAME BAR_SPECIAL
-        __NORMAL "menus/images/special.png"
-	__HILITED "menus/images/special_hi.png"
-	__CLICKED "menus/images/special_hi.png"
-__END
-
-__ICLASS __BGN
-        __NAME BAR_HELP
-        __NORMAL "menus/images/help.png"
-	__HILITED "menus/images/help_hi.png"
-	__CLICKED "menus/images/help_hi.png"
-__END
-
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/.xvpics/go_hi.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/.xvpics/go_hi.png
deleted file mode 100755
index eb35f65..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/.xvpics/go_hi.png
+++ /dev/null
@@ -1,13 +0,0 @@
-P7 332
-#IMGINFO:26x15 RGB (829 bytes)
-#END_OF_COMMENTS
-26 15 255
-	
	
3.2.2
	
3w––·–2.VÛv32r3
ÞS		
-3––s2û
2Û–W¶·22Û2232ßRÿ
ßS
Û22Û2Û3–ÛR»22ßR–·2›Ú»»Ú
sߺ·2
-
-	


-
-		
-

-
-
	

\ No newline at end of file
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/.xvpics/help.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/.xvpics/help.png
deleted file mode 100755
index f3c63ee..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/.xvpics/help.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/.xvpics/help_hi.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/.xvpics/help_hi.png
deleted file mode 100755
index c4e2917..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/.xvpics/help_hi.png
+++ /dev/null
@@ -1,5 +0,0 @@
-P7 332
-#IMGINFO:65x22 RGB (1529 bytes)
-#END_OF_COMMENTS
-65 22 255
-ßûßÛßÚßÛßÛÿÛÞ62223222227.632322232722322222326ÛÿÛßÛÞÛßÛßû¿úÿÿÿÿÿÿÿÿÿÿÿÿÿ33/2ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ222.ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿßÿÿÿûßÿÿÿÿ23/2223.22.33ÿÿÿÿßÿûÿÿÞÿÿÿßûßÛßÚßÛßÛÿÛÞ62223222227.632322232722322222326ÛÿÛßÛÞÛßÛßûßÚÿÿÿßÿÿÿûßÿÿÿÿ27222S222—º22332ÿÿÿÿßÿÿÿûßÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÚÛ—ÿ3ºÛ3ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿßÿÿÿûßÿÿÿÿ2ßÛ3–ÿ3322¶ß.223ÿÿÿÿßÿÿÿûßÿÿÿßûßÛßÚßÛßÛÿÛÞ62R»Ú32Sšÿ.722—¶v3R»Û2w–2—–v32232ÿÛßÛÿºÿÛßÛßÛÞÿÿÿßÿÿÿûßÿÿÿÿ2ÛÛ3–ÿ32ÿ»¶ß–Ú»2¶ß·ÞÛÿw2.ÿÿÿßÿÿÿÿÛÿÿÿßÿÿÿÿÿÿÿÿÿÿÿÿÿ2ºÿÛßûßßÿ×ߺÛÖ¿3–ÿv2ºßÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿßÿÿÿûßÿÿÿÿ2ÛÛRvSV¶ÿ2ÿº·–»ÿ2¶ß2»Û23–ÿ2.ÿÿÿÿßÿÿÿûßÿÿÿßûßÛßÚßÛßÛÿÛÞ62R»Ú3R63¶ÿ32ÿ»¶š·šS2·ÞR–ÿR2—ÿR22.ÿßÛßú¿ûßÛßÛÞÛÿÿÿßÿÿÿûßÿÿÿÿ2ÛÛ22¶ÿ3Úß6232·Þ2¶ß2»ÿ23ÿÿÿÿßÿÿûÿßÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ2ºÛ2·ÿwÿ–23R2·ß·ÿvWÞ·2ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿßÿÿÿûßÿÿÿÿ2ÛÛ3¶ÿ3–ÿÿûß3¶ß3šûºÿßÛ3.3ÿÿÿÿÛÿþÿßÿÿÿÿßûßÛßÚßÛßÛÿÛÞ62R23R32V322S26s2232V322·Þ3RV3223223ÿÞÛßÛßÛßÚÿ»ûßÿÿÿßÿÿÿûßÿÿÿÿ232.232/2232323ºû32323ÿÿÿÿßÿÿÿûßÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿ23222322wº322ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿßÿÿÿûßÿÿÿÿ2322.3.22322.3.2ÿÿÿÿßûÿÿßÿÿÿÿÛ»ºÛ»ºÛ»ºÛ»»ÚV2S2V3R3V23R6S2R3V3R27R2S6RSV2S2W2R36RÛ»ºÛ»»Ú»»Ú»»ÚÛ¶¶¶I$IIÛ¶¶Ú%H%IÛ¶Ú¶%HI%Û¶Ú¶%HII·Ú¶¶I$IIÛ¶¶·HI$IÛ¶¶Û$IH%Û¶Ú·$IHI·
\ No newline at end of file
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/.xvpics/junk.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/.xvpics/junk.png
deleted file mode 100755
index fb62d7c..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/.xvpics/junk.png
+++ /dev/null
@@ -1,5 +0,0 @@
-P7 332
-#IMGINFO:20x30 RGB (177 bytes)
-#END_OF_COMMENTS
-20 30 255
-ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿI$IIÛ¶¶¶IH%IÛ¶¶Ú%HI%I$IIÛ¶¶¶IH%IÛ¶¶Ú%HI%Û¶¶¶I$IIÛ¶¶Ú%H%IÛ¶Ú¶Û¶¶¶I$IIÛ¶¶Ú%H%IÛ¶Ú¶Û¶¶¶I$IIÛ¶¶Ú%H%IÛ¶Ú¶Û¶¶¶I$IIÛ¶¶Ú%H%IÛ¶Ú¶I$IIÛ¶¶¶IH%IÛ¶¶Ú%HI%I$IIÛ¶¶¶IH%IÛ¶¶Ú%HI%I$IIÛ¶¶¶IH%IÛ¶¶Ú%HI%I$IIÛ¶¶¶IH%IÛ¶¶Ú%HI%Û¶¶¶I$IIÛ¶¶Ú%H%IÛ¶Ú¶Û¶¶¶I$IIÛ¶¶Ú%H%IÛ¶Ú¶Û¶¶¶I$IIÛ¶¶Ú%H%IÛ¶Ú¶Û¶¶¶I$IIÛ¶¶Ú%H%IÛ¶Ú¶I$IIÛ¶¶¶IH%IÛ¶¶Ú%HI%I$IIÛ¶¶¶IH%IÛ¶¶Ú%HI%I$IIÛ¶¶¶IH%IÛ¶¶Ú%HI%I$IIÛ¶¶¶IH%IÛ¶¶Ú%HI%Û¶¶¶I$IIÛ¶¶Ú%H%IÛ¶Ú¶Û¶¶¶I$IIÛ¶¶Ú%H%IÛ¶Ú¶
\ No newline at end of file
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/.xvpics/preferences.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/.xvpics/preferences.png
deleted file mode 100755
index b748a9e..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/.xvpics/preferences.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/.xvpics/preferences_hi.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/.xvpics/preferences_hi.png
deleted file mode 100755
index 2f72cc7..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/.xvpics/preferences_hi.png
+++ /dev/null
@@ -1,5 +0,0 @@
-P7 332
-#IMGINFO:87x22 RGB (1446 bytes)
-#END_OF_COMMENTS
-80 20 255
-ÿÿÿÿÿÿÿÿÿÿÿÿÿ22323223227.62232322222ßÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿß23/ÚÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿßÿÿÿÿÿÿÿûÿÿÿÿÿÿÿÛÿÿÚÿÿÿÛÿÛ/3223ÛÞÿûÿßûÿßþûÿßÿûÿßþûÿßûÿßÿúÿßÿûÿßûþßÿûÿÛÿþÛÿÛÿÚÿÿÛÛ3.2232/2322.3222ÛßûÿÚÿÛÿßúÿÛÿÛþßûÿÛþÛÿßûþÛÿÛÿÞûßûÿÚÿßÿÿÿÿÿÿÿÿÿÿÛÿß6/27.6R222.7v22232..22ßÿÿÿûÿþÿÿÿßÿÿÿÿÿûÿÿÿÿÿßÿÿÿÿÿûþÿÿÿÿßÿÿÿÿÿÿÿÿÿÿÿÿÛÿß2R»›º—w2RÛ2vw./ÛÿÿÿÿÿÿÿÿÿûÿßÿÿÿÿÿÿÿÿÿúÿßÿÿÿÿÿÿÿÿÿûÿßÿÛÿþÛÿÛÿÚÿÿÛÛ2šÛwvwV2rß23Rv2rW22»ÿûÞÿÛÿÛþûßÿÛÿÚÿûßÿÚÿÛÿûÞÿÛÿÛþûßÿÛþÛÿÿÿÿÛÿÿÚÿÿÿÛÿß223šÛ232232Vwr—¾S2rwv»ÛRV6.ßÿûßþÿÛÿÿûßÿþûßÿÿûßÿþÛÿÿûßÿÿúßÿÿÛÿÿûÞÿÿÿÿÿÿÿÿÿÿÿÿß22›¶W23v»ÛšÛÛVº»vÿ»¶W2ÞÿÿÿÿÿÿûÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿßÿÿÿÿÿÿÿÿÿÿÿÛÿÿÿÿÿÚ3šÿ»ÛºÛš32›Ú32—Ú2º»3úßÿÿÿûÿÿßÿÿÿÿûþßÿÿÿÿûÿÿßÿÿÿûþÿßÿÿÿÿûÿÿÛÿÚÿÛÿÚÛÿÛþ»32›ÛvrW.6Û—6“¾S2—Þ2Ú›2.ÚÿÛÿÚÿÛÛþÛÿÛþÛÿÛþÛÿÛÛþÛÿÛþÛÿÛþÛûßÚÿÛÿÿÿÿÿÿÿÿÛÿÿÿÿß223»ºR7223ÿ–3–»r¶ÛSº»2322ßûÿÿÿÿßÿÿÿûÿÿÿÿÞÿÿÿûÿÿÿÿßÿÿÿûÿÿÿþßÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿß.»º3222Ûš32–Û7.šÛ3¶»3ÿÿÿÿÿßÿÿÿÿûÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÛÿÿþÛÿÿÛÿÿÚ3šÛ—zwvšÛ–—ºßS¶»3–»w2ßúÿÿßûÿßúÿßÿûÿßúÿßûÿßÿúÿßûÿßûþÿßûÿßûþÿÿÛÿÚÿÿÛÿÿÚÿÛ.6w–»›·šSš·›vwR2wv32R›—V3.¿úÿßûÿßúÿÛÿßûþßûÿÛÿÞûÿÛÿßúÿßûÿÛþßûÿßûÿÿÿÿÿÿÿÿÿÿÿÿÛ32232232232632R22232232222ßÿÿûÿÿÿÿßÿÿÿÿÿÿÿÿÿÿÿûÿÿÿþßÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÛÿß23222323222.2ÞÿÿÿÿÿÿÿûßÿÿÿÿÿÿÿÿÿÿûßÿþÿÿÿÿÿÿÿÿûßÿÿÿÛþÛÛÚÛÛÚÛÚÿÛ¶222/22322.2·ÞÛúÛÛÚÛÚßÛÚûºûÛÚÛßÚÛÚûÛÚÛÚßÛÚÛûÚÛÚÛßI$IIÛ¶¶¶IH%IÛ¶¶Ú%HI%Û¶Ú¶%HII·Ú¶¶%HIIÛ¶¶¶I$IIÛ¶¶Û$I$IÛ¶Ú·$IH%Û¶Ú·$IHI·Ú¶·H%HIÛ¶¶·I$IIÛ¶¶¶IH%IÛ¶¶Ú%HI%Û¶Ú¶%HII·Ú¶¶%HIIÛ¶¶¶I$IIÛ¶¶Û$I$IÛ¶Ú·$IH%Û¶Ú·$IHI·Ú¶·H%HIÛ¶¶·
\ No newline at end of file
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/.xvpics/special.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/.xvpics/special.png
deleted file mode 100755
index 7f404c3..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/.xvpics/special.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/.xvpics/special_hi.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/.xvpics/special_hi.png
deleted file mode 100755
index aefaca1..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/.xvpics/special_hi.png
+++ /dev/null
@@ -1,5 +0,0 @@
-P7 332
-#IMGINFO:51x22 RGB (1197 bytes)
-#END_OF_COMMENTS
-51 22 255
-ÿÿÿÿÿÿÿÿÿÿÿ2227.6323223227.63232232ÿÚÿÛÿÚÛÿÚÿÛÛÿÿÿÿÿÿÿÿÿÿÿ33/ÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÿÛÿÿÿÿ222ÿÿÿÿÿÿÿÿÿÿÿÿÿÛþÛÛÿÚÿÛÛþ32.23.2.3ÿÿÿÿÿÿÿÛÿÿÿÿÿÿÿÿÿÿÛÿÿÿÿ23223223672223232236.72ûÿÚÿÛßúÛÿÛÞûÿÿÿÿÿÿÿÿÿÿÿ.23vvS2222.2ÿÿÿÿÿÿÿÛÿÿÿÿÿÿÿÿÿÿÛÿÿÿÿ2¶ÿß»ßÿ’33ÿÿÿÿÿÿÿÿÿÿÿÿÿÛþÛÛÿÚÿÛÛþ3ÛÿR232V/3222ÿÿÿÿÿÿÿÛÿÿÿÿÿÿÿÿÿÿÛÿÿÿÿ232vÿ—2R322S23rº—v232322ÿûÞÛûßúßÛÿÚûÿÿÿÿÿÿÿÿÿÿÿ.¶ÿ23222¶ÿ»ºÿ·2ÿÿÿûÿÿÿßÿÿÿûÿÿÿÿÿÿÛÿÿÿÿÛß.2Rÿw2rÿSÿÿÿÿÿÿÿÿÿÿÿÿÿÛþÛÛÿÚÿÛÛþ3Úß22vR3vÿR2Rÿ—.ÿÿÿÿÿûÿßþÿÿÿÿÿÿÿÿÿÛÿÿÿÿ2322—ÿR632ÿ·¶ÿ32V3þ—2322þÿÛûÞÛÿÚûßÛþÿÿÿÿÿÿÿÿÿÿÿ.3Rÿº3ÿ–—ÿvWÿ–2/þÿÿÿÿßÿûÿÿÿÿÿÿÿÿÿÿÛÿÿÿÿ2»ÿ–2ÿ—2ÿ»22»ÿ3ÿÿÿÿÿÿÿÿÿÿÿÿÿÛþÛÛÿÚÿÛÛþ326—ÿÿÛÿþw.sßûÿÞS232ÿÿÿÿÿÿûßÿÿÿÿÿÿÿÿÿÿÛÿÿÿÿ232R32WRv2S22S62SR6S22323þûßûÞÛûßúßÛûÿÿÿÿÿÿÿÿÿÿÿ.22222323232232/3ÿþÿÿûÿÿßÿÿÿûÿÿÿÿÿÿÛÿÿÿÿ23233322ÿÿÿÿÿÿÿÿÿÿÿÿÛÚÛÚ·ÚÛÚÛÚ·22.V32322R26/6R223223R7Ú×ÚÛÚ»Ú×ÚÚÛÿÿÿÿÿÿÿÿÿÿÿÿ.22222323232232/3ÿÿÿÿÿÿÿÿÿÿÿÿÛ¶¶¶I$IIÛ¶¶Ú%H%IÛ¶Ú¶%HI%Û¶Ú¶%HII·Ú¶¶I$IIÛ¶¶·HI$IÛ¶¶
\ No newline at end of file
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/.xvpics/themes.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/.xvpics/themes.png
deleted file mode 100755
index ddad94a..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/.xvpics/themes.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/go.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/go.png
deleted file mode 100755
index 1bd46a6..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/go.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/go_hi.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/go_hi.png
deleted file mode 100755
index b8b693d..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/go_hi.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/help.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/help.png
deleted file mode 100755
index a6cffb6..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/help.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/help_hi.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/help_hi.png
deleted file mode 100755
index 884acfc..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/help_hi.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/junk.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/junk.png
deleted file mode 100755
index 6bf0ead..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/junk.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/preferences.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/preferences.png
deleted file mode 100755
index ecbcd74..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/preferences.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/preferences_hi.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/preferences_hi.png
deleted file mode 100755
index 0c98b0d..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/preferences_hi.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/special.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/special.png
deleted file mode 100755
index 7270e86..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/special.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/special_hi.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/special_hi.png
deleted file mode 100755
index 3138815..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/special_hi.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/themes.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/themes.png
deleted file mode 100755
index c3500e1..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/images/themes.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/menus.cfg b/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/menus.cfg
deleted file mode 100755
index a8df144..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/menus/menus.cfg
+++ /dev/null
@@ -1,26 +0,0 @@
-BEGIN_NEW_MENU("MAIN_MENU", "EMPTY")
-ADD_MENU_TITLE("Main Menu")
-ADD_MENU_TEXT_ITEM("Regenerate Menus", __A_EXEC, ENLIGHTENMENT_BIN"/e_gen_menu")
-END_MENU
-
-BEGIN_NEW_MENU("SETTINGS_MENU", "EMPTY")
-ADD_MENU_TITLE("Settings Menu")
-ADD_MENU_TEXT_ITEM("Regenerate Menus", __A_EXEC, ENLIGHTENMENT_BIN"/e_gen_menu")
-END_MENU
-
-BEGIN_NEW_MENU("AQUA_SPECIAL", "EMPTY")
-ADD_MENU_TITLE("Special Menu")
-ADD_MENU_TEXT_ITEM("Query all cache usage", __A_EXEC, ENLIGHTENMENT_BIN"/e_cache_query all")
-ADD_MENU_TEXT_ITEM("Purge all caches", __A_EXEC, ENLIGHTENMENT_BIN"/e_cache_clean all")
-ADD_MENU_TEXT_ITEM("Regenerate Menus", __A_EXEC, ENLIGHTENMENT_BIN"/e_gen_menu")
-ADD_MENU_TEXT_ITEM("Restart Enlightenment", __A_EXIT,       "restart")
-ADD_MENU_TEXT_ITEM("Log Out", __A_EXIT,       "logout")
-END_MENU
-
-BEGIN_NEW_MENU("AQUA_HELP_MENU", "EMPTY")
-ADD_MENU_TITLE("Help Menu")
-ADD_MENU_TEXT_ITEM("Enlightenment Help", __A_EXEC, ENLIGHTENMENT_BIN"/dox" ENLIGHTENMENT_ROOT"/E-docs")
-ADD_MENU_TEXT_ITEM("About Enlightenment", __A_ABOUT, "")
-ADD_MENU_TEXT_ITEM("About This Theme",  __A_EXEC, ENLIGHTENMENT_BIN"/dox" ENLIGHTENMENT_THEME"/ABOUT")
-END_MENU
-
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/menustyles.cfg b/abs/mv-core/e16-myth-settings/e16/themes/mine/menustyles.cfg
deleted file mode 100755
index 8d5bf02..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/menustyles.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-#include <definitions>
-__E_CFG_VERSION 0
-
-#include <menustyles/menustyles.cfg>
-#include <menus/menus.cfg>
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/menustyles/images/submenu.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/menustyles/images/submenu.png
deleted file mode 100755
index f96e75e..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/menustyles/images/submenu.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/menustyles/images/submenu_selected.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/menustyles/images/submenu_selected.png
deleted file mode 100755
index 3368969..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/menustyles/images/submenu_selected.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/menustyles/menustyles.cfg b/abs/mv-core/e16-myth-settings/e16/themes/mine/menustyles/menustyles.cfg
deleted file mode 100755
index ef3f614..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/menustyles/menustyles.cfg
+++ /dev/null
@@ -1,47 +0,0 @@
-__ICLASS __BGN
-  __NAME MENU_BG
-  __NORMAL "common/images/bg.png"
-  __FILLRULE __TILE
-__END
-
-__ICLASS __BGN
-  __NAME MENU_SUBMENU
-  __NORMAL "menustyles/images/submenu.png"
-  __EDGE_SCALING 3 8 3 3
-  __PADDING 15 15 2 2
-  __HILITED "menustyles/images/submenu_selected.png"
-  __EDGE_SCALING 3 8 3 3
-  __PADDING 15 15 2 2
-  __CLICKED "menustyles/images/submenu_selected.png"
-  __EDGE_SCALING 3 8 3 3
-  __PADDING 15 15 2 2
-__END
-
-__ICLASS __BGN
-  __NAME MENU_SELECTED
-  __NORMAL "common/images/selected.png"
-  __FILLRULE __TILE
-  __PADDING 5 5 2 2
-__END
-
-__TCLASS __BGN
-  __NAME "MENU_TEXT"
-  __NORMAL "-*-helvetica-medium-r-normal-*-*-120-*-*-*-*-*-*"
-    __FORGROUND_COLOR 0 0 0
-    __BACKGROUND_COLOR 192 192 192
-    __JUSTIFICATION 0
-__END
-
-NORMAL_MENU_STYLE_VERTICAL("DEFAULT", "VERYSMALLFIXED", "MENU_TEXT", "MENU_BG", "MENU_SELECTED", "MENU_SUBMENU", 40)
-
-NORMAL_MENU_STYLE_VERTICAL("ROOT", "TRANSIENT", "MENU_TEXT", "MENU_BG", "MENU_SELECTED", "MENU_SUBMENU", 40)
-
-NORMAL_MENU_STYLE_VERTICAL("ROOT_IMAGE", "TRANSIENT", "MENU_TEXT", "MENU_BG", "MENU_SELECTED", "MENU_SUBMENU", 20)
-
-NORMAL_MENU_STYLE_VERTICAL("EMPTY", "VERYSMALLFIXED", "MENU_TEXT", "MENU_BG", "MENU_SELECTED", "MENU_SUBMENU", 40)
-
-NORMAL_MENU_STYLE_VERTICAL("TASK_MENU", "VERYSMALLFIXED", "MENU_TEXT", "MENU_BG", "MENU_SELECTED", "MENU_SUBMENU", 40)
-
-NORMAL_MENU_STYLE_VERTICAL("DESK_MENU", "VERYSMALLFIXED", "MENU_TEXT", "MENU_BG", "MENU_SELECTED", "MENU_SUBMENU", 40)
-
-/* (Menu type, Border type, Text type, Background, Selected item, Selected submenu) */
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/pager/images/selected.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/pager/images/selected.png
deleted file mode 100755
index 70e4ea4..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/pager/images/selected.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/pager/images/window.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/pager/images/window.png
deleted file mode 100755
index 371cc91..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/pager/images/window.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/pager/pager.cfg b/abs/mv-core/e16-myth-settings/e16/themes/mine/pager/pager.cfg
deleted file mode 100755
index 132871d..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/pager/pager.cfg
+++ /dev/null
@@ -1,40 +0,0 @@
-__ICLASS __BGN
-  __NAME PAGER_SEL
-  __NORMAL "pager/images/selected.png"
-  __EDGE_SCALING 2 2 2 2
-  __PADDING 2 2 2 2
-__END
-
-__ICLASS __BGN
-  __NAME PAGER_BACKGROUND
-  __NORMAL "tooltips/images/ttip.png"
-  __EDGE_SCALING 2 3 2 3
-  __PADDING 3 4 4 4
-__END
-
-__ICLASS __BGN
-  __NAME PAGER_WIN
-  __NORMAL "pager/images/window.png"
-    __EDGE_SCALING 1 1 1 1
-__END
-
-__ICLASS __BGN
-  __NAME PAGER_TITLE_BLANK
-  __NORMAL "common/images/blank.png"
-__END
-
-__ICLASS __BGN
-  __NAME PAGER_TITLE_MAIN
-  __NORMAL "tooltips/images/ttip.png"
-  __EDGE_SCALING 2 3 2 3
-  __PADDING 3 4 4 4
-__END
-
-__TCLASS __BGN
-  __NAME "PAGER_WINDOW_TITLE"
-  __NORMAL "-*-helvetica-bold-r-normal-*-*-120-*-*-*-*-*-*"
-  __FORGROUND_COLOR 0 0 0
-  __BACKGROUND_COLOR 255 255 255
-  __JUSTIFICATION 0
-__END
-DEFINE_TOOLTIP("PAGER", "PAGER_TITLE_MAIN", "PAGER_TITLE_BLANK", "PAGER_TITLE_BLANK", "PAGER_TITLE_BLANK", "PAGER_TITLE_BLANK", "PAGER_WINDOW_TITLE", 16)
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/textclasses.cfg b/abs/mv-core/e16-myth-settings/e16/themes/mine/textclasses.cfg
deleted file mode 100755
index 84ba2ca..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/textclasses.cfg
+++ /dev/null
@@ -1,70 +0,0 @@
-#include <definitions>
-
-__E_CFG_VERSION 0
-
-__TCLASS __BGN
-	__NAME "TEXT1"
-        __NORMAL "-*-helvetica-bold-r-normal-*-*-120-*-*-*-*-*-*"
-	__DRAWING_EFFECT __EFFECT_NONE
-	__FORGROUND_COLOR 73 80 96
-	__BACKGROUND_COLOR 174 174 174
-	
-        __NORMAL_ACTIVE "-*-helvetica-bold-r-normal-*-*-120-*-*-*-*-*-*"
-	__DRAWING_EFFECT __EFFECT_SHADOW
-	__FORGROUND_COLOR 0 0 0
-	__BACKGROUND_COLOR 174 174 174
- 	__JUSTIFICATION 512
- 	
-        __NORMAL_ACTIVE_STICKY "-*-helvetica-bold-r-normal-*-*-120-*-*-*-*-*-*"
-	__DRAWING_EFFECT __EFFECT_NONE
-	__FORGROUND_COLOR 70 48 80
-  	__BACKGROUND_COLOR 255 255 255
-	__JUSTIFICATION 512
-__END
-
-__TCLASS __BGN
-	__NAME "TEXT2"
-        __NORMAL "-*-helvetica-medium-r-normal-*-*-120-*-*-*-*-*-*"
-	__DRAWING_EFFECT __EFFECT_NONE
-	__FORGROUND_COLOR 0 0 0
-	__BACKGROUND_COLOR 0 0 0
-	__JUSTIFICATION 1024
-	
-        __NORMAL_ACTIVE "-*-helvetica-medium-r-normal-*-*-120-*-*-*-*-*-*"
-	__FORGROUND_COLOR 255 255 255
-	__BACKGROUND_COLOR 0 0 0
-	__JUSTIFICATION 1024
-__END
-
-__TCLASS __BGN
-	__NAME "TOOLTIP_TEXT"
-        __NORMAL "-*-helvetica-medium-r-normal-*-*-120-*-*-*-*-*-*"
-	__DRAWING_EFFECT __EFFECT_NONE
-	__FORGROUND_COLOR 0 0 0
-	__BACKGROUND_COLOR 0 0 0
-	__JUSTIFICATION 1024
-__END
-
-__TCLASS __BGN
-	__NAME "COORDS"
-        __NORMAL "-*-helvetica-medium-r-normal-*-*-120-*-*-*-*-*-*"
-	__DRAWING_EFFECT __EFFECT_NONE
-	__FORGROUND_COLOR 0 0 0
-	__BACKGROUND_COLOR 255 255 255
-	__JUSTIFICATION 0
-__END
-
-__TCLASS __BGN
-	__NAME "MENU"
-        __NORMAL "-*-helvetica-medium-r-normal-*-*-120-*-*-*-*-*-*"
-	__DRAWING_EFFECT __EFFECT_NONE
-	__FORGROUND_COLOR 0 0 0
-	__BACKGROUND_COLOR 255 255 255
-	__JUSTIFICATION 0
-	
-        __HILITED "-*-helvetica-medium-r-normal-*-*-120-*-*-*-*-*-*"
-	__DRAWING_EFFECT __EFFECT_NONE
-	__FORGROUND_COLOR 255 255 255
-	__BACKGROUND_COLOR 0 0 0
-	__JUSTIFICATION 0
-__END
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/tooltips.cfg b/abs/mv-core/e16-myth-settings/e16/themes/mine/tooltips.cfg
deleted file mode 100755
index 6d0a893..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/tooltips.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <definitions>
-__E_CFG_VERSION 0
-#include <tooltips/tooltips.cfg>
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/tooltips/images/ttip.png b/abs/mv-core/e16-myth-settings/e16/themes/mine/tooltips/images/ttip.png
deleted file mode 100755
index 94cd7ee..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/tooltips/images/ttip.png
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/tooltips/tooltips.cfg b/abs/mv-core/e16-myth-settings/e16/themes/mine/tooltips/tooltips.cfg
deleted file mode 100755
index e6570e4..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/tooltips/tooltips.cfg
+++ /dev/null
@@ -1,22 +0,0 @@
-#include <definitions>
-__E_CFG_VERSION 0
-__ICLASS __BGN
-        __NAME TOOLTIP
-        __NORMAL "tooltips/images/ttip.png"
-        __EDGE_SCALING 2 3 2 3
-        __PADDING 3 4 4 4
-__END
-
-__ICLASS __BGN
-        __NAME TRANS
-        __NORMAL "common/images/blank.png"
-__END
-
-__ICLASS __BGN
-        __NAME COORDS
-        __NORMAL "tooltips/images/ttip.png"
-        __EDGE_SCALING 2 3 2 3
-        __PADDING 3 4 4 4
-__END
-
-DEFINE_TOOLTIP("DEFAULT", "TOOLTIP", "TRANS", "TRANS", "TRANS", "TRANS", "COORDS", 5)
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/vixar.ttf b/abs/mv-core/e16-myth-settings/e16/themes/mine/vixar.ttf
deleted file mode 100755
index 7e690c5..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/vixar.ttf
+++ /dev/null
diff --git a/abs/mv-core/e16-myth-settings/e16/themes/mine/windowmatches.cfg b/abs/mv-core/e16-myth-settings/e16/themes/mine/windowmatches.cfg
deleted file mode 100755
index 0cfc83f..0000000
--- a/abs/mv-core/e16-myth-settings/e16/themes/mine/windowmatches.cfg
+++ /dev/null
@@ -1,20 +0,0 @@
-#include <definitions>
-
-__E_CFG_VERSION 0
-/*
-USE_BORDER_FOR_CLIENT_WITH_TITLE("Tool Options", "TRANS_WINDOW")
-USE_BORDER_FOR_CLIENT_WITH_TITLE("The GIMP", "TRANS_WINDOW")
-USE_BORDER_FOR_CLIENT_WITH_TITLE("Gradient Editor", "TRANS_WINDOW")
-USE_BORDER_FOR_CLIENT_WITH_TITLE("Color Picker", "TRANS_WINDOW")
-USE_BORDER_FOR_CLIENT_WITH_TITLE("Color Palette", "TRANS_WINDOW")
-USE_BORDER_FOR_CLIENT_WITH_TITLE("Brush Selection", "TRANS_WINDOW")
-USE_BORDER_FOR_CLIENT_WITH_TITLE("Pattern Selection", "TRANS_WINDOW")
-USE_BORDER_FOR_CLIENT_WITH_TITLE("0", "TRANS_WINDOW")
-USE_BORDER_FOR_UNRESIZABLE_CLIENT("FIXEDSIZE")
-USE_BORDER_FOR_CLIENT_WITH_NAME("kfm", "DEFAULT_WITH_ICON")
-USE_BORDER_FOR_CLIENT_WITH_NAME("gmc", "DEFAULT_WITH_ICON")
-USE_BORDER_FOR_TRANSIENT_CLIENT("TRANSIENT")
-USE_BORDER_FOR_CLIENT_WITH_CLASS("ENLIGHTENMENT_PAGER", "TRANS_WINDOW")*/
-USE_BORDER_FOR_CLIENT_WITH_TITLE("Iconbox", "BORDERLESS")
-USE_BORDER_FOR_CLIENT_WITH_TITLE("*etscape*", "STEEL")
-
diff --git a/abs/mv-core/e16-myth-settings/tilda/config_0 b/abs/mv-core/e16-myth-settings/tilda/config_0
deleted file mode 100755
index f640f38..0000000
--- a/abs/mv-core/e16-myth-settings/tilda/config_0
+++ /dev/null
@@ -1,53 +0,0 @@
-tilda_config_version = "0.9.5"
-# image = ""
-# command = ""
-font = "Monospace 13"
-key = "F2"
-title = "Tilda"
-background_color = "white"
-# working_dir = ""
-web_browser = "firefox"
-lines = 100
-max_width = 672
-max_height = 420
-min_width = 1
-min_height = 1
-transparency = 0
-x_pos = 64
-y_pos = 0
-tab_pos = 0
-backspace_key = 0
-delete_key = 1
-d_set_title = 3
-command_exit = 0
-scheme = 3
-slide_sleep_usec = 1
-animation_orientation = 2
-scrollbar_pos = 1
-back_red = 0
-back_green = 0
-back_blue = 0
-text_red = 65535
-text_green = 65535
-text_blue = 65535
-scroll_background = true
-scroll_on_output = false
-notebook_border = false
-antialias = true
-scrollbar = false
-use_image = false
-grab_focus = true
-above = true
-notaskbar = true
-bold = true
-blinks = false
-scroll_on_key = true
-bell = false
-run_command = false
-pinned = true
-animation = false
-hidden = true
-centered_horizontally = true
-centered_vertically = false
-enable_transparency = false
-double_buffer = true
diff --git a/abs/mv-core/enlightenment/PKGBUILD b/abs/mv-core/enlightenment/PKGBUILD
deleted file mode 100644
index abdd1ba..0000000
--- a/abs/mv-core/enlightenment/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Maintainer: Judd Vinet <jvinet@zeroflux.org>
-pkgname=enlightenment
-pkgver=0.16.8.9
-pkgrel=2
-pkgdesc="A fast, flexible, and very extensible Window Manager"
-arch=('i686' 'x86_64')
-url="http://www.enlightenment.org"
-license=('BSD')
-depends=('freetype2' 'libxinerama' 'libxft' 'libsm' 'libxxf86vm' 'imlib2' 'perl' 'libxcomposite' 'libxdamage' 'libxrandr')
-makedepends=('xbitmaps')
-source=(http://downloads.sourceforge.net/sourceforge/$pkgname/e16-$pkgver.tar.gz \
-  http://downloads.sourceforge.net/sourceforge/$pkgname/e16-theme-BrushedMetal-Tigert-0.16.8.tar.gz \
-  e_gen_menu.patch starting.patch)
-
-build() {
-  cd $startdir/src/e16-$pkgver
-  patch -Np0 -i $startdir/src/e_gen_menu.patch || return 1
-  patch -Np0 -i $startdir/src/starting.patch || return 1
-  ./configure --prefix=/usr --enable-fsstd --disable-sound --sysconfdir=/etc  --disable-nls
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-  rm -rf $startdir/pkg/opt/share
-  install -D -m644 COPYING $startdir/pkg/usr/share/licenses/$pkgname/COPYING
-  for theme in BrushedMetal-Tigert; do
-    cd $startdir/src/e16-theme-$theme-0.16.8
-    ./configure --prefix=/usr --enable-fsstd
-    make DESTDIR=$startdir/pkg install
-  done
-  chown -R root.root $startdir/pkg/usr/share/*
-}
diff --git a/abs/mv-core/enlightenment/e_gen_menu.patch b/abs/mv-core/enlightenment/e_gen_menu.patch
deleted file mode 100644
index d5ced43..0000000
--- a/abs/mv-core/enlightenment/e_gen_menu.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- scripts/e_gen_menu~	2006-03-29 22:09:17.000000000 +0200
-+++ scripts/e_gen_menu	2006-08-15 15:11:18.000000000 +0200
-@@ -25,7 +25,7 @@
- ##############################################################################
- 
- # Likely  prefixes
--$Prefixes = "/usr/local:/usr:/opt:/opt/kde:$ENV{'KDEDIR'}";
-+$Prefixes = "/usr/local:/usr:/opt:/opt/kde:/opt/gnome";
- $Prefixes = "$Prefixes:/opt/kde3:/opt/gnome";	# SUSE
- $Prefixes = RemoveDuplcates($Prefixes);
- 
diff --git a/abs/mv-core/enlightenment/enlightenment.desktop b/abs/mv-core/enlightenment/enlightenment.desktop
deleted file mode 100644
index 658ea91..0000000
--- a/abs/mv-core/enlightenment/enlightenment.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Enlightenment
-Comment=The enlightenment window manager
-Exec=e16
-# no icon yet, only the top three are currently used
-Icon=
-Type=Application
diff --git a/abs/mv-core/enlightenment/starting.patch b/abs/mv-core/enlightenment/starting.patch
deleted file mode 100644
index 9aafe4e..0000000
--- a/abs/mv-core/enlightenment/starting.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/config.c.orig	2007-09-17 19:31:51.000000000 +0000
-+++ src/config.c	2007-09-17 19:32:06.000000000 +0000
-@@ -602,7 +602,7 @@
- 
- 	     if ((i > 1) && (!p))
- 	       {
--		  p = ProgressbarCreate(_("Enlightenment Starting..."), 400,
-+		  p = ProgressbarCreate(_("Starting..."), 400,
- 					16);
- 		  if (p)
- 		     ProgressbarShow(p);
diff --git a/abs/mv-core/evrouter/PKGBUILD b/abs/mv-core/evrouter/PKGBUILD
deleted file mode 100644
index e4fb59d..0000000
--- a/abs/mv-core/evrouter/PKGBUILD
+++ /dev/null
@@ -1,18 +0,0 @@
-# Contributor: Jonathan Liu <net147@hotmail.com>
-pkgname=evrouter
-pkgver=0.3.3
-pkgrel=2
-pkgdesc="An Input Event Router for Linux"
-arch=(i686)
-url="http://www.bedroomlan.org/~alexios/coding_evrouter.html"
-license=('GPL2')
-depends=('libxt' 'libxtst' 'xorg-server')
-source=(http://www.bedroomlan.org/~alexios/files/SOFTWARE/evrouter/${pkgname}_${pkgver}.tar.gz)
-md5sums=('a20073e04679eb11a5c2da9ab59e75fd')
-
-build() {
-  cd "$startdir/src/$pkgname"
-  ./configure --prefix=/usr --without-xmms
-  make || return 1
-  make DESTDIR="$startdir/pkg" install
-}
diff --git a/abs/mv-core/func/PKGBUILD b/abs/mv-core/func/PKGBUILD
deleted file mode 100644
index 13d3189..0000000
--- a/abs/mv-core/func/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-pkgname=func
-pkgver=0.25
-pkgrel=2
-pkgdesc="fedora unifed network controller"
-url=""
-license="gpl"
-depends=(pyopenssl certmaster)
-makedepends=()
-conflicts=()
-replaces=()
-backup=()
-moddir="pkg/usr/lib/python2.6/site-packages/func/minion/modules/"
-install=func.install
-source=($pkgname-$pkgver.tar.gz  minion.conf power.py pacman.py failed_func.sh fe_restart.py)
-md5sums=()
-arch=('i686')
-
-build() {
-	cd $startdir/src/$pkgname-${pkgver}
-	python setup.py build
-	python setup.py install --prefix=$startdir/pkg/usr
-	cd $startdir/src
-	install -m755 -D minion.conf $startdir/pkg/etc/func/minion.conf
-	install -m755 -D async_methods.conf $startdir/pkg/etc/func/async_methods.conf
-	install -m755 -D $startdir/src/$pkgname-${pkgver}/etc/sample.acl $startdir/pkg/etc/func/minion-acl.d/sample.acl
-	install -m755 -D $startdir/src/$pkgname-${pkgver}/etc/Test.conf $startdir/pkg/etc/func/modules/Test.conf
-	install -m755 -D $startdir/src/power.py ${startdir}/${moddir}/power.py
-	install -m755 -D $startdir/src/pacman.py ${startdir}/${moddir}/pacman.py
-	install -m755 -D $startdir/src/fe_restart.py ${startdir}/${moddir}/fe_restart.py
-	install -m755 -D $startdir/src/failed_func.sh $startdir/pkg/usr/bin/failed_func.sh
-	mkdir -p  $startdir/pkg/var/log/func
-    cd $startdir/pkg
-    find ./ -name "*.pyc" -print | xargs rm -f
-}
diff --git a/abs/mv-core/func/failed_func.sh b/abs/mv-core/func/failed_func.sh
deleted file mode 100755
index 2ec4da7..0000000
--- a/abs/mv-core/func/failed_func.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-. /etc/profile
-. /etc/systemconfig
-curl -# http://$dbhost/failed_func_hosts|grep -q `hostname`
-status=$?
-if [ $status = 0 ]
-then
-	echo "removeing ca"
-	rm -f /etc/pki/func/*
-	echo "restarting func"
-	sv stop  funcd
-	sleep 3
-	sv start funcd
-fi
-
diff --git a/abs/mv-core/func/fe_restart.py b/abs/mv-core/func/fe_restart.py
deleted file mode 100644
index a75b0c5..0000000
--- a/abs/mv-core/func/fe_restart.py
+++ /dev/null
@@ -1,35 +0,0 @@
-##
-# other modules
-import sub_process
-
-# our modules
-import func_module
-
-# =================================
-
-class re_restart(func_module.FuncModule):
-
-    version = "0.0.1"
-    api_version = "0.0.1"
-    description = "Restart the frontend"
-
-    def killX (self,flags="restart frontend"):
-        """
-        Restart X
-        """
-        flags.replace(";","") # prevent stupidity
-        cmd = sub_process.Popen("/sbin/sv %s " % flags,stdout=sub_process.PIPE,shell=True)
-        data = cmd.communicate()[0]
-        results = ['Restarted UI']
-        return (cmd.returncode, results)
-
-    def killmyth (self,flags="-9 mythfrontend"):
-        """
-        kill the mythfrontend process server
-        """
-        flags.replace(";","") # prevent stupidity
-        cmd = sub_process.Popen("/usr/bin/killall %s" % flags,stdout=sub_process.PIPE,shell=True)
-        data = cmd.communicate()[0]
-        results = ['killed mythfrontend']
-        return (cmd.returncode, results)
-
diff --git a/abs/mv-core/func/func-0.24.tar.gz b/abs/mv-core/func/func-0.24.tar.gz
deleted file mode 100644
index baa8eef..0000000
--- a/abs/mv-core/func/func-0.24.tar.gz
+++ /dev/null
diff --git a/abs/mv-core/func/func-0.25.tar.gz b/abs/mv-core/func/func-0.25.tar.gz
deleted file mode 100644
index 381e0b6..0000000
--- a/abs/mv-core/func/func-0.25.tar.gz
+++ /dev/null
diff --git a/abs/mv-core/func/func.install b/abs/mv-core/func/func.install
deleted file mode 100755
index 5f0fa72..0000000
--- a/abs/mv-core/func/func.install
+++ /dev/null
@@ -1,56 +0,0 @@
-# This is a default template for a post-install scriptlet.  You can
-# remove any functions you don't need (and this header).
-
-# arg 1:  the new package version
-pre_install() {
-/bin/true
-mkdir -p /var/log/func
-}
-
-# arg 1:  the new package version
-post_install() {
-	if [ ! -e /etc/cron.tenminutes ]
-	then
-		mkdir /etc/cron.tenminutes
-	fi
-	if [ ! -e /etc/cron.tenminutes/failed_func.sh ]
-	then
-		ln -s /usr/bin/failed_func.sh /etc/cron.tenminutes/failed_func.sh
-	fi
-
-	if [ ! -e /var/log/func ]
-	then
-		mkdir -p /var/log/func
-	fi
-
-
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-pre_upgrade() {
-  /bin/true
-
-
-
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-	post_install
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  /bin/true
-}
-
-# arg 1:  the old package version
-post_remove() {
-  /bin/true
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/mv-core/func/minion.conf b/abs/mv-core/func/minion.conf
deleted file mode 100644
index d1665f1..0000000
--- a/abs/mv-core/func/minion.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-[main]
-log_level = INFO
-acl_dir = /etc/func/minion-acl.d
-
-listen_addr =
-listen_port = 51234
-minion_name =
-
diff --git a/abs/mv-core/func/pacman.py b/abs/mv-core/func/pacman.py
deleted file mode 100644
index c8f2e13..0000000
--- a/abs/mv-core/func/pacman.py
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/python
-
-
-# other modules
-import sub_process
-
-# our modules
-import func_module
-
-# =================================
-
-class pacman(func_module.FuncModule):
-    version = "0.0.1"
-    api_version = "0.0.1"
-    description = "update the server"
-    
-
-    def update_system(self,flags):
-        flags.replace(";","") # prevent stupidity
-        cmd = sub_process.Popen("/usr/bin/update_system %s" % flags,stdout=sub_process.PIPE,shell=True)
-        data = cmd.communicate()[0]
-        results = []
-        for x in data.split("\n"):
-            results.append(x)
-        return (cmd.returncode, results)
-
-    def pkgversion(self,flags):
-        flags.replace(";","") # prevent stupidity
-        cmd = sub_process.Popen("/usr/bin/pacman -Q %s | grep -v error" % flags,stdout=sub_process.PIPE,shell=True)
-        data = cmd.communicate()[0]
-        results = []
-        for x in data.split("\n"):
-            results.append(x)
-        return (cmd.returncode, results)
-
-
diff --git a/abs/mv-core/func/power.py b/abs/mv-core/func/power.py
deleted file mode 100644
index 668965a..0000000
--- a/abs/mv-core/func/power.py
+++ /dev/null
@@ -1,35 +0,0 @@
-##
-# other modules
-import sub_process
-
-# our modules
-import func_module
-
-# =================================
-
-class power(func_module.FuncModule):
-
-    version = "0.0.1"
-    api_version = "0.0.1"
-    description = "Reboot the server"
-
-    def reboot(self,flags="-q onecheck"):
-        """
-        Reboot the server
-    """
-        flags.replace(";","") # prevent stupidity
-        cmd = sub_process.Popen("/sbin/reboot")
-        data = cmd.communicate()[0]
-        results = ['reboot']
-        return (cmd.returncode, results)
-
-    def poweroff (self,flags="-q onecheck"):
-        """
-        Reboot the server
-        """
-        flags.replace(";","") # prevent stupidity
-        cmd = sub_process.Popen("/sbin/poweroff")
-        data = cmd.communicate()[0]
-        results = ['off']
-        return (cmd.returncode, results)
-
diff --git a/abs/mv-core/ghosd/PKGBUILD b/abs/mv-core/ghosd/PKGBUILD
deleted file mode 100755
index f63fcac..0000000
--- a/abs/mv-core/ghosd/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-pkgname=ghosd	
-pkgver=0.0.1
-pkgrel=19
-pkgdesc="notification program like xosd"
-depends=('cairo' 'perl' 'pango')
-makedepends=('pkgconfig')
-arch=('i686')
-source=(osdClient.pl osdServer.config osdServer.pl green800.png red800.png blue800.png yellow800.png 'grey800.png')
-
-
-build() {
-  cd $startdir/src
-  cp -rp $startdir/$pkgname-$pkgver .
-  cd $startdir/src/$pkgname-$pkgver
-  make distclean
-  make clean
-  ./configure --prefix=/usr  --disable-shared
-  make || return 1
-  make prefix=$startdir/pkg/usr install
-  #install -D -m755 ./examples/.libs/image $startdir/pkg/usr/bin/imageGhosd
-  install -D -m755 ./examples/image $startdir/pkg/usr/bin/imageGhosd
-
-  cd $startdir/src
-  install -D -m755 osdClient.pl  $startdir/pkg/usr/bin/osdClient.pl 
-  install -D -m755 osdServer.pl  $startdir/pkg/usr/bin/osdServer.pl
-  install -D -m755 osdServer.config $startdir/pkg/etc/osdServer.config
-  install -D -m755 green800.png $startdir/pkg/usr/share/green800.png
-  install -D -m755 red800.png $startdir/pkg/usr/share/red800.png
-  install -D -m755 blue800.png $startdir/pkg/usr/share/blue800.png
-  install -D -m755 yellow800.png $startdir/pkg/usr/share/yellow800.png
-  install -D -m755 grey800.png $startdir/pkg/usr/share/grey800.png
-}
-
diff --git a/abs/mv-core/ghosd/blue800.png b/abs/mv-core/ghosd/blue800.png
deleted file mode 100644
index 7b1b914..0000000
--- a/abs/mv-core/ghosd/blue800.png
+++ /dev/null
diff --git a/abs/mv-core/ghosd/gh800.png b/abs/mv-core/ghosd/gh800.png
deleted file mode 100755
index b0750d0..0000000
--- a/abs/mv-core/ghosd/gh800.png
+++ /dev/null
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/LICENSE b/abs/mv-core/ghosd/ghosd-0.0.1/LICENSE
deleted file mode 100644
index e9b2505..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/LICENSE
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2006 Evan Martin <martine@danga.com>
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/Makefile b/abs/mv-core/ghosd/ghosd-0.0.1/Makefile
deleted file mode 100644
index d797267..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/Makefile
+++ /dev/null
@@ -1,665 +0,0 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
-# Makefile.  Generated from Makefile.in by configure.
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-srcdir = .
-top_srcdir = .
-
-pkgdatadir = $(datadir)/ghosd
-pkglibdir = $(libdir)/ghosd
-pkgincludedir = $(includedir)/ghosd
-top_builddir = .
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = /bin/install -c
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = i686-pc-linux-gnu
-host_triplet = i686-pc-linux-gnu
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(srcdir)/ghosd.pc.in $(top_srcdir)/configure config.guess \
-	config.sub depcomp install-sh ltmain.sh missing
-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = ghosd.pc
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
-pkgconfigDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(pkgconfig_DATA)
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = ${SHELL} /data/local/jams/ghosd-0.0.1/missing --run aclocal-1.9
-AMDEP_FALSE = #
-AMDEP_TRUE = 
-AMTAR = ${SHELL} /data/local/jams/ghosd-0.0.1/missing --run tar
-AR = ar
-AUTOCONF = ${SHELL} /data/local/jams/ghosd-0.0.1/missing --run autoconf
-AUTOHEADER = ${SHELL} /data/local/jams/ghosd-0.0.1/missing --run autoheader
-AUTOMAKE = ${SHELL} /data/local/jams/ghosd-0.0.1/missing --run automake-1.9
-AWK = gawk
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2 -Wall -Wpointer-arith -Wstrict-prototypes                -Wmissing-prototypes -Wmissing-declarations                -Wnested-externs -fno-strict-aliasing
-CPP = gcc -E
-CPPFLAGS = 
-CXX = g++
-CXXCPP = g++ -E
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2
-CYGPATH_W = echo
-DEFS = -DHAVE_CONFIG_H
-DEPDIR = .deps
-ECHO = echo
-ECHO_C = 
-ECHO_N = -n
-ECHO_T = 
-EGREP = grep -E
-ENABLE_GTK_DOC_FALSE = 
-ENABLE_GTK_DOC_TRUE = #
-EXEEXT = 
-F77 = 
-FFLAGS = 
-GHOSD_CFLAGS = -I/usr/include/cairo -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
-GHOSD_EXAMPLE_CFLAGS = -I/usr/include/cairo -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
-GHOSD_EXAMPLE_LIBS = -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  
-GHOSD_LIBS = -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  
-GHOSD_PACKAGES = cairo pangocairo
-GTK_DOC_USE_LIBTOOL_FALSE = #
-GTK_DOC_USE_LIBTOOL_TRUE = 
-HTML_DIR = ${datadir}/gtk-doc/html
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
-LDFLAGS = 
-LIBOBJS = 
-LIBS = 
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LN_S = ln -s
-LTLIBOBJS = 
-MAINT = #
-MAINTAINER_MODE_FALSE = 
-MAINTAINER_MODE_TRUE = #
-MAKEINFO = ${SHELL} /data/local/jams/ghosd-0.0.1/missing --run makeinfo
-OBJEXT = o
-PACKAGE = ghosd
-PACKAGE_BUGREPORT = martine@danga.com
-PACKAGE_NAME = ghosd
-PACKAGE_STRING = ghosd 0.0.1
-PACKAGE_TARNAME = ghosd
-PACKAGE_VERSION = 0.0.1
-PANGO_FALSE = #
-PANGO_TRUE = 
-PATH_SEPARATOR = :
-PKG_CONFIG = /usr/bin/pkg-config
-RANLIB = ranlib
-SET_MAKE = 
-SHELL = /bin/sh
-STRIP = strip
-VERSION = 0.0.1
-VERSION_INFO = 0:0:0
-ac_ct_AR = ar
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_F77 = 
-ac_ct_RANLIB = ranlib
-ac_ct_STRIP = strip
-ac_pt_PKG_CONFIG = /usr/bin/pkg-config
-am__fastdepCC_FALSE = #
-am__fastdepCC_TRUE = 
-am__fastdepCXX_FALSE = #
-am__fastdepCXX_TRUE = 
-am__include = include
-am__leading_dot = .
-am__quote = 
-am__tar = ${AMTAR} chof - "$$tardir"
-am__untar = ${AMTAR} xf -
-bindir = ${exec_prefix}/bin
-build = i686-pc-linux-gnu
-build_alias = 
-build_cpu = i686
-build_os = linux-gnu
-build_vendor = pc
-datadir = ${prefix}/share
-exec_prefix = ${prefix}
-host = i686-pc-linux-gnu
-host_alias = 
-host_cpu = i686
-host_os = linux-gnu
-host_vendor = pc
-includedir = ${prefix}/include
-infodir = ${prefix}/info
-install_sh = /data/local/jams/ghosd-0.0.1/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localstatedir = ${prefix}/var
-mandir = ${prefix}/man
-mkdir_p = mkdir -p --
-oldincludedir = /usr/include
-prefix = /usr/local
-program_transform_name = s,x,x,
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-sysconfdir = ${prefix}/etc
-target_alias = 
-AUTOMAKE_OPTIONS = foreign
-SUBDIRS = ghosd examples doc
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = ghosd.pc
-EXTRA_DIST = LICENSE
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
-all: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-
-.SUFFIXES:
-am--refresh:
-	@:
-$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
-	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure: # $(am__configure_deps)
-	cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): # $(am__aclocal_m4_deps)
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) stamp-h1; \
-	else :; fi
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-	@rm -f stamp-h1
-	cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: # $(am__configure_deps) 
-	cd $(top_srcdir) && $(AUTOHEADER)
-	rm -f stamp-h1
-	touch $@
-
-distclean-hdr:
-	-rm -f config.h stamp-h1
-ghosd.pc: $(top_builddir)/config.status $(srcdir)/ghosd.pc.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-install-pkgconfigDATA: $(pkgconfig_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
-	@list='$(pkgconfig_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
-	  $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
-	done
-
-uninstall-pkgconfigDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(pkgconfig_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
-	done
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	$(am__remove_distdir)
-	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/.
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r $(distdir)
-dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
-
-dist-tarZ: distdir
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
-
-dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
-
-dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
-
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	case '$(DIST_ARCHIVES)' in \
-	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-	*.zip*) \
-	  unzip $(distdir).zip ;;\
-	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
-	chmod a-w $(distdir)
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && cd $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
-	$(am__remove_distdir)
-	@(echo "$(distdir) archives ready for distribution: "; \
-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
-distuninstallcheck:
-	@cd $(distuninstallcheck_dir) \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
-distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
-	       $(distcleancheck_listfiles) ; \
-	       exit 1; } >&2
-check-am: all-am
-check: check-recursive
-all-am: Makefile $(DATA) config.h
-installdirs: installdirs-recursive
-installdirs-am:
-	for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-	done
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-hdr \
-	distclean-libtool distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-info: info-recursive
-
-info-am:
-
-install-data-am: install-pkgconfigDATA
-
-install-exec-am:
-
-install-info: install-info-recursive
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-pkgconfigDATA
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
-	check-am clean clean-generic clean-libtool clean-recursive \
-	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-	dist-shar dist-tarZ dist-zip distcheck distclean \
-	distclean-generic distclean-hdr distclean-libtool \
-	distclean-recursive distclean-tags distcleancheck distdir \
-	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-pkgconfigDATA install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am \
-	uninstall-pkgconfigDATA
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/Makefile.am b/abs/mv-core/ghosd/ghosd-0.0.1/Makefile.am
deleted file mode 100644
index 8c8b27e..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-AUTOMAKE_OPTIONS = foreign
-
-SUBDIRS = ghosd examples doc
-
-pkgconfigdir=$(libdir)/pkgconfig
-pkgconfig_DATA=ghosd.pc
-
-EXTRA_DIST = LICENSE
-
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/Makefile.in b/abs/mv-core/ghosd/ghosd-0.0.1/Makefile.in
deleted file mode 100644
index dfbc6ac..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/Makefile.in
+++ /dev/null
@@ -1,665 +0,0 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = .
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
-	$(srcdir)/ghosd.pc.in $(top_srcdir)/configure config.guess \
-	config.sub depcomp install-sh ltmain.sh missing
-subdir = .
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES = ghosd.pc
-SOURCES =
-DIST_SOURCES =
-RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-	html-recursive info-recursive install-data-recursive \
-	install-exec-recursive install-info-recursive \
-	install-recursive installcheck-recursive installdirs-recursive \
-	pdf-recursive ps-recursive uninstall-info-recursive \
-	uninstall-recursive
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
-pkgconfigDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(pkgconfig_DATA)
-ETAGS = etags
-CTAGS = ctags
-DIST_SUBDIRS = $(SUBDIRS)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
-am__remove_distdir = \
-  { test ! -d $(distdir) \
-    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr $(distdir); }; }
-DIST_ARCHIVES = $(distdir).tar.gz
-GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
-distcleancheck_listfiles = find . -type f -print
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-GHOSD_CFLAGS = @GHOSD_CFLAGS@
-GHOSD_EXAMPLE_CFLAGS = @GHOSD_EXAMPLE_CFLAGS@
-GHOSD_EXAMPLE_LIBS = @GHOSD_EXAMPLE_LIBS@
-GHOSD_LIBS = @GHOSD_LIBS@
-GHOSD_PACKAGES = @GHOSD_PACKAGES@
-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
-HTML_DIR = @HTML_DIR@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PANGO_FALSE = @PANGO_FALSE@
-PANGO_TRUE = @PANGO_TRUE@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-VERSION_INFO = @VERSION_INFO@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-AUTOMAKE_OPTIONS = foreign
-SUBDIRS = ghosd examples doc
-pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = ghosd.pc
-EXTRA_DIST = LICENSE
-DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
-all: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-recursive
-
-.SUFFIXES:
-am--refresh:
-	@:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      echo ' cd $(srcdir) && $(AUTOMAKE) --foreign '; \
-	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    echo ' $(SHELL) ./config.status'; \
-	    $(SHELL) ./config.status;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	$(SHELL) ./config.status --recheck
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
-
-config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) stamp-h1; \
-	else :; fi
-
-stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
-	@rm -f stamp-h1
-	cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) 
-	cd $(top_srcdir) && $(AUTOHEADER)
-	rm -f stamp-h1
-	touch $@
-
-distclean-hdr:
-	-rm -f config.h stamp-h1
-ghosd.pc: $(top_builddir)/config.status $(srcdir)/ghosd.pc.in
-	cd $(top_builddir) && $(SHELL) ./config.status $@
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-install-pkgconfigDATA: $(pkgconfig_DATA)
-	@$(NORMAL_INSTALL)
-	test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
-	@list='$(pkgconfig_DATA)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(pkgconfigDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
-	  $(pkgconfigDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(pkgconfigdir)/$$f"; \
-	done
-
-uninstall-pkgconfigDATA:
-	@$(NORMAL_UNINSTALL)
-	@list='$(pkgconfig_DATA)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(pkgconfigdir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(pkgconfigdir)/$$f"; \
-	done
-
-# This directory's subdirectories are mostly independent; you can cd
-# into them and run `make' without going through this Makefile.
-# To change the values of `make' variables: instead of editing Makefiles,
-# (1) if the variable is set in `config.status', edit `config.status'
-#     (which will cause the Makefiles to be regenerated when you run `make');
-# (2) otherwise, pass the desired values on the `make' command line.
-$(RECURSIVE_TARGETS):
-	@failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	target=`echo $@ | sed s/-recursive//`; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    dot_seen=yes; \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done; \
-	if test "$$dot_seen" = "no"; then \
-	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-	fi; test -z "$$fail"
-
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
-	@failcom='exit 1'; \
-	for f in x $$MAKEFLAGS; do \
-	  case $$f in \
-	    *=* | --[!k]*);; \
-	    *k*) failcom='fail=yes';; \
-	  esac; \
-	done; \
-	dot_seen=no; \
-	case "$@" in \
-	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-	  *) list='$(SUBDIRS)' ;; \
-	esac; \
-	rev=''; for subdir in $$list; do \
-	  if test "$$subdir" = "."; then :; else \
-	    rev="$$subdir $$rev"; \
-	  fi; \
-	done; \
-	rev="$$rev ."; \
-	target=`echo $@ | sed s/-recursive//`; \
-	for subdir in $$rev; do \
-	  echo "Making $$target in $$subdir"; \
-	  if test "$$subdir" = "."; then \
-	    local_target="$$target-am"; \
-	  else \
-	    local_target="$$target"; \
-	  fi; \
-	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
-	  || eval $$failcom; \
-	done && test -z "$$fail"
-tags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
-	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
-	  include_option=--etags-include; \
-	  empty_fix=.; \
-	else \
-	  include_option=--include; \
-	  empty_fix=; \
-	fi; \
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test ! -f $$subdir/TAGS || \
-	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
-	  fi; \
-	done; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	$(am__remove_distdir)
-	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/.
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(mkdir_p) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	    distdir=`$(am__cd) $(distdir) && pwd`; \
-	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
-	    (cd $$subdir && \
-	      $(MAKE) $(AM_MAKEFLAGS) \
-	        top_distdir="$$top_distdir" \
-	        distdir="$$distdir/$$subdir" \
-	        distdir) \
-	      || exit 1; \
-	  fi; \
-	done
-	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
-	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
-	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
-	|| chmod -R a+r $(distdir)
-dist-gzip: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
-	$(am__remove_distdir)
-
-dist-tarZ: distdir
-	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
-	$(am__remove_distdir)
-
-dist-shar: distdir
-	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
-	$(am__remove_distdir)
-
-dist-zip: distdir
-	-rm -f $(distdir).zip
-	zip -rq $(distdir).zip $(distdir)
-	$(am__remove_distdir)
-
-dist dist-all: distdir
-	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	$(am__remove_distdir)
-
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	case '$(DIST_ARCHIVES)' in \
-	*.tar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\
-	*.tar.bz2*) \
-	  bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\
-	*.tar.Z*) \
-	  uncompress -c $(distdir).tar.Z | $(am__untar) ;;\
-	*.shar.gz*) \
-	  GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\
-	*.zip*) \
-	  unzip $(distdir).zip ;;\
-	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
-	mkdir $(distdir)/_build
-	mkdir $(distdir)/_inst
-	chmod a-w $(distdir)
-	dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
-	  && cd $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
-	    $(DISTCHECK_CONFIGURE_FLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (cd ../.. && umask 077 && mkdir "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist \
-	  && rm -rf $(DIST_ARCHIVES) \
-	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
-	$(am__remove_distdir)
-	@(echo "$(distdir) archives ready for distribution: "; \
-	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
-	  sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
-distuninstallcheck:
-	@cd $(distuninstallcheck_dir) \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
-distcleancheck: distclean
-	@if test '$(srcdir)' = . ; then \
-	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
-	  exit 1 ; \
-	fi
-	@test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
-	       $(distcleancheck_listfiles) ; \
-	       exit 1; } >&2
-check-am: all-am
-check: check-recursive
-all-am: Makefile $(DATA) config.h
-installdirs: installdirs-recursive
-installdirs-am:
-	for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-	done
-install: install-recursive
-install-exec: install-exec-recursive
-install-data: install-data-recursive
-uninstall: uninstall-recursive
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-recursive
-
-clean-am: clean-generic clean-libtool mostlyclean-am
-
-distclean: distclean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-hdr \
-	distclean-libtool distclean-tags
-
-dvi: dvi-recursive
-
-dvi-am:
-
-html: html-recursive
-
-info: info-recursive
-
-info-am:
-
-install-data-am: install-pkgconfigDATA
-
-install-exec-am:
-
-install-info: install-info-recursive
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-recursive
-	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
-	-rm -rf $(top_srcdir)/autom4te.cache
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-recursive
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-pkgconfigDATA
-
-uninstall-info: uninstall-info-recursive
-
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
-	check-am clean clean-generic clean-libtool clean-recursive \
-	ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
-	dist-shar dist-tarZ dist-zip distcheck distclean \
-	distclean-generic distclean-hdr distclean-libtool \
-	distclean-recursive distclean-tags distcleancheck distdir \
-	distuninstallcheck dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-pkgconfigDATA install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic maintainer-clean-recursive \
-	mostlyclean mostlyclean-generic mostlyclean-libtool \
-	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-info-am \
-	uninstall-pkgconfigDATA
-
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/README b/abs/mv-core/ghosd/ghosd-0.0.1/README
deleted file mode 100644
index 3e4305b..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/README
+++ /dev/null
@@ -1,6 +0,0 @@
-/* ghosd -- OSD with fake transparency, cairo, and pango.
- * Copyright (C) 2006 Evan Martin <martine@danga.com>
- */
-
-(Nothing here yet.)
-
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/aclocal.m4 b/abs/mv-core/ghosd/ghosd-0.0.1/aclocal.m4
deleted file mode 100644
index b67354e..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/aclocal.m4
+++ /dev/null
@@ -1,6981 +0,0 @@
-# generated automatically by aclocal 1.9.5 -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005  Free Software Foundation, Inc.
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-dnl -*- mode: autoconf -*-
-
-# serial 1
-
-dnl Usage:
-dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
-AC_DEFUN([GTK_DOC_CHECK],
-[
-  AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
-  AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-  dnl for overriding the documentation installation directory
-  AC_ARG_WITH(html-dir,
-    AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
-    [with_html_dir='${datadir}/gtk-doc/html'])
-  HTML_DIR="$with_html_dir"
-  AC_SUBST(HTML_DIR)
-
-  dnl enable/disable documentation building
-  AC_ARG_ENABLE(gtk-doc,
-    AC_HELP_STRING([--enable-gtk-doc],
-                   [use gtk-doc to build documentation [default=no]]),,
-    enable_gtk_doc=no)
-
-  have_gtk_doc=no
-  if test x$enable_gtk_doc = xyes; then
-    if test -z "$PKG_CONFIG"; then
-      AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-    fi
-    if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
-      have_gtk_doc=yes
-    fi
-
-  dnl do we want to do a version check?
-ifelse([$1],[],,
-    [gtk_doc_min_version=$1
-    if test "$have_gtk_doc" = yes; then
-      AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
-      if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
-        AC_MSG_RESULT(yes)
-      else
-        AC_MSG_RESULT(no)
-        have_gtk_doc=no
-      fi
-    fi
-])
-    if test "$have_gtk_doc" != yes; then
-      enable_gtk_doc=no
-    fi
-  fi
-
-  AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
-  AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
-])
-
-# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
-
-# serial 47 AC_PROG_LIBTOOL
-# Debian $Rev: 214 $
-
-
-# AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-# -----------------------------------------------------------
-# If this macro is not defined by Autoconf, define it here.
-m4_ifdef([AC_PROVIDE_IFELSE],
-         [],
-         [m4_define([AC_PROVIDE_IFELSE],
-	         [m4_ifdef([AC_PROVIDE_$1],
-		           [$2], [$3])])])
-
-
-# AC_PROG_LIBTOOL
-# ---------------
-AC_DEFUN([AC_PROG_LIBTOOL],
-[AC_REQUIRE([_AC_PROG_LIBTOOL])dnl
-dnl If AC_PROG_CXX has already been expanded, run AC_LIBTOOL_CXX
-dnl immediately, otherwise, hook it in at the end of AC_PROG_CXX.
-  AC_PROVIDE_IFELSE([AC_PROG_CXX],
-    [AC_LIBTOOL_CXX],
-    [define([AC_PROG_CXX], defn([AC_PROG_CXX])[AC_LIBTOOL_CXX
-  ])])
-dnl And a similar setup for Fortran 77 support
-  AC_PROVIDE_IFELSE([AC_PROG_F77],
-    [AC_LIBTOOL_F77],
-    [define([AC_PROG_F77], defn([AC_PROG_F77])[AC_LIBTOOL_F77
-])])
-
-dnl Quote A][M_PROG_GCJ so that aclocal doesn't bring it in needlessly.
-dnl If either AC_PROG_GCJ or A][M_PROG_GCJ have already been expanded, run
-dnl AC_LIBTOOL_GCJ immediately, otherwise, hook it in at the end of both.
-  AC_PROVIDE_IFELSE([AC_PROG_GCJ],
-    [AC_LIBTOOL_GCJ],
-    [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],
-      [AC_LIBTOOL_GCJ],
-      [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],
-	[AC_LIBTOOL_GCJ],
-      [ifdef([AC_PROG_GCJ],
-	     [define([AC_PROG_GCJ], defn([AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-       ifdef([A][M_PROG_GCJ],
-	     [define([A][M_PROG_GCJ], defn([A][M_PROG_GCJ])[AC_LIBTOOL_GCJ])])
-       ifdef([LT_AC_PROG_GCJ],
-	     [define([LT_AC_PROG_GCJ],
-		defn([LT_AC_PROG_GCJ])[AC_LIBTOOL_GCJ])])])])
-])])# AC_PROG_LIBTOOL
-
-
-# _AC_PROG_LIBTOOL
-# ----------------
-AC_DEFUN([_AC_PROG_LIBTOOL],
-[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_CXX])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_F77])dnl
-AC_BEFORE([$0],[AC_LIBTOOL_GCJ])dnl
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-AC_SUBST(LIBTOOL)dnl
-
-# Prevent multiple expansion
-define([AC_PROG_LIBTOOL], [])
-])# _AC_PROG_LIBTOOL
-
-
-# AC_LIBTOOL_SETUP
-# ----------------
-AC_DEFUN([AC_LIBTOOL_SETUP],
-[AC_PREREQ(2.50)dnl
-AC_REQUIRE([AC_ENABLE_SHARED])dnl
-AC_REQUIRE([AC_ENABLE_STATIC])dnl
-AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_PROG_LD])dnl
-AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl
-AC_REQUIRE([AC_PROG_NM])dnl
-
-AC_REQUIRE([AC_PROG_LN_S])dnl
-AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-AC_REQUIRE([AC_OBJEXT])dnl
-AC_REQUIRE([AC_EXEEXT])dnl
-dnl
-
-AC_LIBTOOL_SYS_MAX_CMD_LEN
-AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-AC_LIBTOOL_OBJDIR
-
-AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-_LT_AC_PROG_ECHO_BACKSLASH
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e s/^X//'
-[sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
-
-# Same as above, but do not quote variable references.
-[double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g']
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-# Constants:
-rm="rm -f"
-
-# Global variables:
-default_ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except M$VC,
-# which needs '.lib').
-libext=a
-ltmain="$ac_aux_dir/ltmain.sh"
-ofile="$default_ofile"
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-AC_CHECK_TOOL(AR, ar, false)
-AC_CHECK_TOOL(RANLIB, ranlib, :)
-AC_CHECK_TOOL(STRIP, strip, :)
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-test -z "$AS" && AS=as
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-test -z "$LD" && LD=ld
-test -z "$LN_S" && LN_S="ln -s"
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-test -z "$NM" && NM=nm
-test -z "$SED" && SED=sed
-test -z "$OBJDUMP" && OBJDUMP=objdump
-test -z "$RANLIB" && RANLIB=:
-test -z "$STRIP" && STRIP=:
-test -z "$ac_objext" && ac_objext=o
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
-    ;;
-  *)
-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    AC_PATH_MAGIC
-  fi
-  ;;
-esac
-
-AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)
-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-enable_win32_dll=yes, enable_win32_dll=no)
-
-AC_ARG_ENABLE([libtool-lock],
-    [AC_HELP_STRING([--disable-libtool-lock],
-	[avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-AC_ARG_WITH([pic],
-    [AC_HELP_STRING([--with-pic],
-	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [pic_mode="$withval"],
-    [pic_mode=default])
-test -z "$pic_mode" && pic_mode=default
-
-# Use C for the default configuration in the libtool script
-tagname=
-AC_LIBTOOL_LANG_C_CONFIG
-_LT_AC_TAGCONFIG
-])# AC_LIBTOOL_SETUP
-
-
-# _LT_AC_SYS_COMPILER
-# -------------------
-AC_DEFUN([_LT_AC_SYS_COMPILER],
-[AC_REQUIRE([AC_PROG_CC])dnl
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-])# _LT_AC_SYS_COMPILER
-
-
-# _LT_AC_SYS_LIBPATH_AIX
-# ----------------------
-# Links a minimal program and checks the executable
-# for the system default hardcoded library path. In most cases,
-# this is /usr/lib:/lib, but when the MPI compilers are used
-# the location of the communication and MPI libs are included too.
-# If we don't find anything, use the default library path according
-# to the aix ld manual.
-AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi],[])
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-])# _LT_AC_SYS_LIBPATH_AIX
-
-
-# _LT_AC_SHELL_INIT(ARG)
-# ----------------------
-AC_DEFUN([_LT_AC_SHELL_INIT],
-[ifdef([AC_DIVERSION_NOTICE],
-	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
-	 [AC_DIVERT_PUSH(NOTICE)])
-$1
-AC_DIVERT_POP
-])# _LT_AC_SHELL_INIT
-
-
-# _LT_AC_PROG_ECHO_BACKSLASH
-# --------------------------
-# Add some code to the start of the generated configure script which
-# will find an echo command which doesn't interpret backslashes.
-AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH],
-[_LT_AC_SHELL_INIT([
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
-  ;;
-esac
-
-echo=${ECHO-echo}
-if test "X[$]1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X[$]1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell.
-  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
-fi
-
-if test "X[$]1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-[$]*
-EOF
-  exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-
-if test -z "$ECHO"; then
-if test "X${echo_test_string+set}" != Xset; then
-# find a string as large as possible, as long as the shell can cope with it
-  for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
-    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-       echo_test_string="`eval $cmd`" &&
-       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-    then
-      break
-    fi
-  done
-fi
-
-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-   test "X$echo_testing_string" = "X$echo_test_string"; then
-  :
-else
-  # The Solaris, AIX, and Digital Unix default echo programs unquote
-  # backslashes.  This makes it impossible to quote backslashes using
-  #   echo "$something" | sed 's/\\/\\\\/g'
-  #
-  # So, first we look for a working echo in the user's PATH.
-
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for dir in $PATH /usr/ucb; do
-    IFS="$lt_save_ifs"
-    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      echo="$dir/echo"
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-
-  if test "X$echo" = Xecho; then
-    # We didn't find a better echo, so look for alternatives.
-    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      # This shell has a builtin print -r that does the trick.
-      echo='print -r'
-    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-	 test "X$CONFIG_SHELL" != X/bin/ksh; then
-      # If we have ksh, try running configure again with it.
-      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-      export ORIGINAL_CONFIG_SHELL
-      CONFIG_SHELL=/bin/ksh
-      export CONFIG_SHELL
-      exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
-    else
-      # Try using printf.
-      echo='printf %s\n'
-      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-	 test "X$echo_testing_string" = "X$echo_test_string"; then
-	# Cool, printf works
-	:
-      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	export CONFIG_SHELL
-	SHELL="$CONFIG_SHELL"
-	export SHELL
-	echo="$CONFIG_SHELL [$]0 --fallback-echo"
-      elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	echo="$CONFIG_SHELL [$]0 --fallback-echo"
-      else
-	# maybe with a smaller string...
-	prev=:
-
-	for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
-	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
-	  then
-	    break
-	  fi
-	  prev="$cmd"
-	done
-
-	if test "$prev" != 'sed 50q "[$]0"'; then
-	  echo_test_string=`eval $prev`
-	  export echo_test_string
-	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
-	else
-	  # Oops.  We lost completely, so just stick with echo.
-	  echo=echo
-	fi
-      fi
-    fi
-  fi
-fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-ECHO=$echo
-if test "X$ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
-   ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-fi
-
-AC_SUBST(ECHO)
-])])# _LT_AC_PROG_ECHO_BACKSLASH
-
-
-# _LT_AC_LOCK
-# -----------
-AC_DEFUN([_LT_AC_LOCK],
-[AC_ARG_ENABLE([libtool-lock],
-    [AC_HELP_STRING([--disable-libtool-lock],
-	[avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-   if test "$lt_cv_prog_gnu_ld" = yes; then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -melf32bsmip"
-      ;;
-    *N32*)
-      LD="${LD-ld} -melf32bmipn32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -melf64bmip"
-      ;;
-    esac
-   else
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-   fi
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if AC_TRY_EVAL(ac_compile); then
-    case "`/usr/bin/file conftest.o`" in
-    *32-bit*)
-      case $host in
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_i386"
-          ;;
-        ppc64-*linux*|powerpc64-*linux*)
-          LD="${LD-ld} -m elf32ppclinux"
-          ;;
-        s390x-*linux*)
-          LD="${LD-ld} -m elf_s390"
-          ;;
-        sparc64-*linux*)
-          LD="${LD-ld} -m elf32_sparc"
-          ;;
-      esac
-      ;;
-    *64-bit*)
-      case $host in
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        ppc*-*linux*|powerpc*-*linux*)
-          LD="${LD-ld} -m elf64ppc"
-          ;;
-        s390*-*linux*)
-          LD="${LD-ld} -m elf64_s390"
-          ;;
-        sparc*-*linux*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
-    [AC_LANG_PUSH(C)
-     AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
-     AC_LANG_POP])
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
-[*-*-cygwin* | *-*-mingw* | *-*-pw32*)
-  AC_CHECK_TOOL(DLLTOOL, dlltool, false)
-  AC_CHECK_TOOL(AS, as, false)
-  AC_CHECK_TOOL(OBJDUMP, objdump, false)
-  ;;
-  ])
-esac
-
-need_locks="$enable_libtool_lock"
-
-])# _LT_AC_LOCK
-
-
-# AC_LIBTOOL_COMPILER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])
-# ----------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],
-[AC_REQUIRE([LT_AC_PROG_SED])
-AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-  ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$3"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s conftest.err; then
-       $2=yes
-     fi
-   fi
-   $rm conftest*
-])
-
-if test x"[$]$2" = xyes; then
-    ifelse([$5], , :, [$5])
-else
-    ifelse([$6], , :, [$6])
-fi
-])# AC_LIBTOOL_COMPILER_OPTION
-
-
-# AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,
-#                          [ACTION-SUCCESS], [ACTION-FAILURE])
-# ------------------------------------------------------------
-# Check whether the given compiler option works
-AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
-[AC_CACHE_CHECK([$1], [$2],
-  [$2=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $3"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&AS_MESSAGE_LOG_FD
-     else
-       $2=yes
-     fi
-   fi
-   $rm conftest*
-   LDFLAGS="$save_LDFLAGS"
-])
-
-if test x"[$]$2" = xyes; then
-    ifelse([$4], , :, [$4])
-else
-    ifelse([$5], , :, [$5])
-fi
-])# AC_LIBTOOL_LINKER_OPTION
-
-
-# AC_LIBTOOL_SYS_MAX_CMD_LEN
-# --------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_MAX_CMD_LEN],
-[# find the maximum length of command line arguments
-AC_MSG_CHECKING([the maximum length of command line arguments])
-AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
-  i=0
-  teststring="ABCD"
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
- *)
-    # If test is not a shell built-in, we'll probably end up computing a
-    # maximum length that is only half of the actual maximum length, but
-    # we can't tell.
-    while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
-	       = "XX$teststring") >/dev/null 2>&1 &&
-	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
-	    lt_cv_sys_max_cmd_len=$new_result &&
-	    test $i != 17 # 1/2 MB should be enough
-    do
-      i=`expr $i + 1`
-      teststring=$teststring$teststring
-    done
-    teststring=
-    # Add a significant safety factor because C++ compilers can tack on massive
-    # amounts of additional arguments before passing them to the linker.
-    # It appears as though 1/2 is a usable value.
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    ;;
-  esac
-])
-if test -n $lt_cv_sys_max_cmd_len ; then
-  AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
-else
-  AC_MSG_RESULT(none)
-fi
-])# AC_LIBTOOL_SYS_MAX_CMD_LEN
-
-
-# _LT_AC_CHECK_DLFCN
-# --------------------
-AC_DEFUN([_LT_AC_CHECK_DLFCN],
-[AC_CHECK_HEADERS(dlfcn.h)dnl
-])# _LT_AC_CHECK_DLFCN
-
-
-# _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
-#                           ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
-# ------------------------------------------------------------------
-AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-if test "$cross_compiling" = yes; then :
-  [$4]
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-[#line __oline__ "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-
-    exit (status);
-}]
-EOF
-  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) $1 ;;
-      x$lt_dlneed_uscore) $2 ;;
-      x$lt_unknown|x*) $3 ;;
-    esac
-  else :
-    # compilation failed
-    $3
-  fi
-fi
-rm -fr conftest*
-])# _LT_AC_TRY_DLOPEN_SELF
-
-
-# AC_LIBTOOL_DLOPEN_SELF
-# -------------------
-AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
-[AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-   ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-   ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ])
-   ;;
-
-  *)
-    AC_CHECK_FUNC([shl_load],
-	  [lt_cv_dlopen="shl_load"],
-      [AC_CHECK_LIB([dld], [shl_load],
-	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],
-	[AC_CHECK_FUNC([dlopen],
-	      [lt_cv_dlopen="dlopen"],
-	  [AC_CHECK_LIB([dl], [dlopen],
-		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
-	    [AC_CHECK_LIB([svld], [dlopen],
-		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
-	      [AC_CHECK_LIB([dld], [dld_link],
-		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])
-	      ])
-	    ])
-	  ])
-	])
-      ])
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    AC_CACHE_CHECK([whether a program can dlopen itself],
-	  lt_cv_dlopen_self, [dnl
-	  _LT_AC_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self=yes, lt_cv_dlopen_self=yes,
-	    lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
-    ])
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      LDFLAGS="$LDFLAGS $link_static_flag"
-      AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
-    	  lt_cv_dlopen_self_static, [dnl
-	  _LT_AC_TRY_DLOPEN_SELF(
-	    lt_cv_dlopen_self_static=yes, lt_cv_dlopen_self_static=yes,
-	    lt_cv_dlopen_self_static=no,  lt_cv_dlopen_self_static=cross)
-      ])
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-])# AC_LIBTOOL_DLOPEN_SELF
-
-
-# AC_LIBTOOL_PROG_CC_C_O([TAGNAME])
-# ---------------------------------
-# Check to see if options -c and -o are simultaneously supported by compiler
-AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
-  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
-  [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
-   $rm -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-   -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s out/conftest.err; then
-       _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-     fi
-   fi
-   chmod u+w .
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
-])
-])# AC_LIBTOOL_PROG_CC_C_O
-
-
-# AC_LIBTOOL_SYS_HARD_LINK_LOCKS([TAGNAME])
-# -----------------------------------------
-# Check to see if we can do hard links to lock some files if needed
-AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS],
-[AC_REQUIRE([_LT_AC_LOCK])dnl
-
-hard_links="nottested"
-if test "$_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  AC_MSG_CHECKING([if we can lock with hard links])
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  AC_MSG_RESULT([$hard_links])
-  if test "$hard_links" = no; then
-    AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-])# AC_LIBTOOL_SYS_HARD_LINK_LOCKS
-
-
-# AC_LIBTOOL_OBJDIR
-# -----------------
-AC_DEFUN([AC_LIBTOOL_OBJDIR],
-[AC_CACHE_CHECK([for objdir], [lt_cv_objdir],
-[rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null])
-objdir=$lt_cv_objdir
-])# AC_LIBTOOL_OBJDIR
-
-
-# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH([TAGNAME])
-# ----------------------------------------------
-# Check hardcoding attributes.
-AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH],
-[AC_MSG_CHECKING([how to hardcode library paths into programs])
-_LT_AC_TAGVAR(hardcode_action, $1)=
-if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
-   test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
-   test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
-     test "$_LT_AC_TAGVAR(hardcode_minus_L, $1)" != no; then
-    # Linking always hardcodes the temporary library directory.
-    _LT_AC_TAGVAR(hardcode_action, $1)=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    _LT_AC_TAGVAR(hardcode_action, $1)=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  _LT_AC_TAGVAR(hardcode_action, $1)=unsupported
-fi
-AC_MSG_RESULT([$_LT_AC_TAGVAR(hardcode_action, $1)])
-
-if test "$_LT_AC_TAGVAR(hardcode_action, $1)" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-])# AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH
-
-
-# AC_LIBTOOL_SYS_LIB_STRIP
-# ------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP],
-[striplib=
-old_striplib=
-AC_MSG_CHECKING([whether stripping libraries is possible])
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  AC_MSG_RESULT([yes])
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         AC_MSG_RESULT([yes])
-       else
-  AC_MSG_RESULT([no])
-fi
-       ;;
-   *)
-  AC_MSG_RESULT([no])
-    ;;
-  esac
-fi
-])# AC_LIBTOOL_SYS_LIB_STRIP
-
-
-# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-# -----------------------------
-# PORTME Fill in your ld.so characteristics
-AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
-[AC_MSG_CHECKING([dynamic linker characteristics])
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix4* | aix5*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[[01]] | aix4.[[01]].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi4*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $rm \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | [grep ';[c-zC-Z]:/' >/dev/null]; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-freebsd*)
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.[01]* | freebsdelf3.[01]*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  *) # from 3.2 on
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case "$host_cpu" in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-   hppa*64*)
-     shrext_cmds='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`$SED -e 's/[:,\t]/ /g;s/=[^=]*$//;s/=[^= ]* / /g' /etc/ld.so.conf | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsdelf*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
-  ;;
-
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-nto-qnx*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-openbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=yes
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[[89]] | openbsd2.[[89]].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-AC_MSG_RESULT([$dynamic_linker])
-test "$dynamic_linker" = no && can_build_shared=no
-])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
-
-
-# _LT_AC_TAGCONFIG
-# ----------------
-AC_DEFUN([_LT_AC_TAGCONFIG],
-[AC_ARG_WITH([tags],
-    [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
-        [include additional configurations @<:@automatic@:>@])],
-    [tagnames="$withval"])
-
-if test -f "$ltmain" && test -n "$tagnames"; then
-  if test ! -f "${ofile}"; then
-    AC_MSG_WARN([output file `$ofile' does not exist])
-  fi
-
-  if test -z "$LTCC"; then
-    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
-    if test -z "$LTCC"; then
-      AC_MSG_WARN([output file `$ofile' does not look like a libtool script])
-    else
-      AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
-    fi
-  fi
-
-  # Extract list of available tagged configurations in $ofile.
-  # Note that this assumes the entire list is on one line.
-  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
-
-  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-  for tagname in $tagnames; do
-    IFS="$lt_save_ifs"
-    # Check whether tagname contains only valid characters
-    case `$echo "X$tagname" | $Xsed -e 's:[[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]]::g'` in
-    "") ;;
-    *)  AC_MSG_ERROR([invalid tag name: $tagname])
-	;;
-    esac
-
-    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
-    then
-      AC_MSG_ERROR([tag name \"$tagname\" already exists])
-    fi
-
-    # Update the list of available tags.
-    if test -n "$tagname"; then
-      echo appending configuration tag \"$tagname\" to $ofile
-
-      case $tagname in
-      CXX)
-	if test -n "$CXX" && test "X$CXX" != "Xno"; then
-	  AC_LIBTOOL_LANG_CXX_CONFIG
-	else
-	  tagname=""
-	fi
-	;;
-
-      F77)
-	if test -n "$F77" && test "X$F77" != "Xno"; then
-	  AC_LIBTOOL_LANG_F77_CONFIG
-	else
-	  tagname=""
-	fi
-	;;
-
-      GCJ)
-	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
-	  AC_LIBTOOL_LANG_GCJ_CONFIG
-	else
-	  tagname=""
-	fi
-	;;
-
-      RC)
-	AC_LIBTOOL_LANG_RC_CONFIG
-	;;
-
-      *)
-	AC_MSG_ERROR([Unsupported tag name: $tagname])
-	;;
-      esac
-
-      # Append the new tag name to the list of available tags.
-      if test -n "$tagname" ; then
-      available_tags="$available_tags $tagname"
-    fi
-    fi
-  done
-  IFS="$lt_save_ifs"
-
-  # Now substitute the updated list of available tags.
-  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
-    mv "${ofile}T" "$ofile"
-    chmod +x "$ofile"
-  else
-    rm -f "${ofile}T"
-    AC_MSG_ERROR([unable to update list of available tagged configurations.])
-  fi
-fi
-])# _LT_AC_TAGCONFIG
-
-
-# AC_LIBTOOL_DLOPEN
-# -----------------
-# enable checks for dlopen support
-AC_DEFUN([AC_LIBTOOL_DLOPEN],
- [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])
-])# AC_LIBTOOL_DLOPEN
-
-
-# AC_LIBTOOL_WIN32_DLL
-# --------------------
-# declare package support for building win32 dll's
-AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
-[AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
-])# AC_LIBTOOL_WIN32_DLL
-
-
-# AC_ENABLE_SHARED([DEFAULT])
-# ---------------------------
-# implement the --enable-shared flag
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_SHARED],
-[define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([shared],
-    [AC_HELP_STRING([--enable-shared@<:@=PKGS@:>@],
-	[build shared libraries @<:@default=]AC_ENABLE_SHARED_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_shared=]AC_ENABLE_SHARED_DEFAULT)
-])# AC_ENABLE_SHARED
-
-
-# AC_DISABLE_SHARED
-# -----------------
-#- set the default shared flag to --disable-shared
-AC_DEFUN([AC_DISABLE_SHARED],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_SHARED(no)
-])# AC_DISABLE_SHARED
-
-
-# AC_ENABLE_STATIC([DEFAULT])
-# ---------------------------
-# implement the --enable-static flag
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_STATIC],
-[define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([static],
-    [AC_HELP_STRING([--enable-static@<:@=PKGS@:>@],
-	[build static libraries @<:@default=]AC_ENABLE_STATIC_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_static=]AC_ENABLE_STATIC_DEFAULT)
-])# AC_ENABLE_STATIC
-
-
-# AC_DISABLE_STATIC
-# -----------------
-# set the default static flag to --disable-static
-AC_DEFUN([AC_DISABLE_STATIC],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_STATIC(no)
-])# AC_DISABLE_STATIC
-
-
-# AC_ENABLE_FAST_INSTALL([DEFAULT])
-# ---------------------------------
-# implement the --enable-fast-install flag
-# DEFAULT is either `yes' or `no'.  If omitted, it defaults to `yes'.
-AC_DEFUN([AC_ENABLE_FAST_INSTALL],
-[define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl
-AC_ARG_ENABLE([fast-install],
-    [AC_HELP_STRING([--enable-fast-install@<:@=PKGS@:>@],
-    [optimize for fast installation @<:@default=]AC_ENABLE_FAST_INSTALL_DEFAULT[@:>@])],
-    [p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac],
-    [enable_fast_install=]AC_ENABLE_FAST_INSTALL_DEFAULT)
-])# AC_ENABLE_FAST_INSTALL
-
-
-# AC_DISABLE_FAST_INSTALL
-# -----------------------
-# set the default to --disable-fast-install
-AC_DEFUN([AC_DISABLE_FAST_INSTALL],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-AC_ENABLE_FAST_INSTALL(no)
-])# AC_DISABLE_FAST_INSTALL
-
-
-# AC_LIBTOOL_PICMODE([MODE])
-# --------------------------
-# implement the --with-pic flag
-# MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
-AC_DEFUN([AC_LIBTOOL_PICMODE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-pic_mode=ifelse($#,1,$1,default)
-])# AC_LIBTOOL_PICMODE
-
-
-# AC_PROG_EGREP
-# -------------
-# This is predefined starting with Autoconf 2.54, so this conditional
-# definition can be removed once we require Autoconf 2.54 or later.
-m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP],
-[AC_CACHE_CHECK([for egrep], [ac_cv_prog_egrep],
-   [if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-    then ac_cv_prog_egrep='grep -E'
-    else ac_cv_prog_egrep='egrep'
-    fi])
- EGREP=$ac_cv_prog_egrep
- AC_SUBST([EGREP])
-])])
-
-
-# AC_PATH_TOOL_PREFIX
-# -------------------
-# find a file program which can recognise shared library
-AC_DEFUN([AC_PATH_TOOL_PREFIX],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_MSG_CHECKING([for $1])
-AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
-[case $MAGIC_CMD in
-[[\\/*] |  ?:[\\/]*])
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-dnl $ac_dummy forces splitting on constant user-supplied paths.
-dnl POSIX.2 word splitting is done only on the output of word expansions,
-dnl not every word.  This closes a longstanding sh security hole.
-  ac_dummy="ifelse([$2], , $PATH, [$2])"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$1; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/$1"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  AC_MSG_RESULT($MAGIC_CMD)
-else
-  AC_MSG_RESULT(no)
-fi
-])# AC_PATH_TOOL_PREFIX
-
-
-# AC_PATH_MAGIC
-# -------------
-# find a file program which can recognise a shared library
-AC_DEFUN([AC_PATH_MAGIC],
-[AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    AC_PATH_TOOL_PREFIX(file, /usr/bin$PATH_SEPARATOR$PATH)
-  else
-    MAGIC_CMD=:
-  fi
-fi
-])# AC_PATH_MAGIC
-
-
-# AC_PROG_LD
-# ----------
-# find the pathname to the GNU or non-GNU linker
-AC_DEFUN([AC_PROG_LD],
-[AC_ARG_WITH([gnu-ld],
-    [AC_HELP_STRING([--with-gnu-ld],
-	[assume the C compiler uses GNU ld @<:@default=no@:>@])],
-    [test "$withval" = no || with_gnu_ld=yes],
-    [with_gnu_ld=no])
-AC_REQUIRE([LT_AC_PROG_SED])dnl
-AC_REQUIRE([AC_PROG_CC])dnl
-AC_REQUIRE([AC_CANONICAL_HOST])dnl
-AC_REQUIRE([AC_CANONICAL_BUILD])dnl
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  AC_MSG_CHECKING([for ld used by $CC])
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [[\\/]]* | ?:[[\\/]]*)
-      re_direlt='/[[^/]][[^/]]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  AC_MSG_CHECKING([for GNU ld])
-else
-  AC_MSG_CHECKING([for non-GNU ld])
-fi
-AC_CACHE_VAL(lt_cv_path_LD,
-[if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
-      *)
-	test "$with_gnu_ld" != yes && break
-	;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi])
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  AC_MSG_RESULT($LD)
-else
-  AC_MSG_RESULT(no)
-fi
-test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH])
-AC_PROG_LD_GNU
-])# AC_PROG_LD
-
-
-# AC_PROG_LD_GNU
-# --------------
-AC_DEFUN([AC_PROG_LD_GNU],
-[AC_REQUIRE([AC_PROG_EGREP])dnl
-AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac])
-with_gnu_ld=$lt_cv_prog_gnu_ld
-])# AC_PROG_LD_GNU
-
-
-# AC_PROG_LD_RELOAD_FLAG
-# ----------------------
-# find reload flag for linker
-#   -- PORTME Some linkers may need a different reload flag.
-AC_DEFUN([AC_PROG_LD_RELOAD_FLAG],
-[AC_CACHE_CHECK([for $LD option to reload object files],
-  lt_cv_ld_reload_flag,
-  [lt_cv_ld_reload_flag='-r'])
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-])# AC_PROG_LD_RELOAD_FLAG
-
-
-# AC_DEPLIBS_CHECK_METHOD
-# -----------------------
-# how to check for library dependencies
-#  -- PORTME fill in with the dynamic library characteristics
-AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
-[AC_CACHE_CHECK([how to recognise dependent libraries],
-lt_cv_deplibs_check_method,
-[lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix4* | aix5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi4*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | kfreebsd*-gnu)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case "$host_cpu" in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-nto-qnx*)
-  lt_cv_deplibs_check_method=unknown
-  ;;
-
-openbsd*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
-  else
-    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-])
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-])# AC_DEPLIBS_CHECK_METHOD
-
-
-# AC_PROG_NM
-# ----------
-# find the pathname to a BSD-compatible name lister
-AC_DEFUN([AC_PROG_NM],
-[AC_CACHE_CHECK([for BSD-compatible nm], lt_cv_path_NM,
-[if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
-    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-      */dev/null* | *'Invalid file or object type'*)
-	lt_cv_path_NM="$tmp_nm -B"
-	break
-        ;;
-      *)
-	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	*/dev/null*)
-	  lt_cv_path_NM="$tmp_nm -p"
-	  break
-	  ;;
-	*)
-	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	  continue # so that we can try to find one that supports BSD flags
-	  ;;
-	esac
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi])
-NM="$lt_cv_path_NM"
-])# AC_PROG_NM
-
-
-# AC_CHECK_LIBM
-# -------------
-# check for math library
-AC_DEFUN([AC_CHECK_LIBM],
-[AC_REQUIRE([AC_CANONICAL_HOST])dnl
-LIBM=
-case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
-  # These system don't have libm, or don't need it
-  ;;
-*-ncr-sysv4.3*)
-  AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
-  AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
-  ;;
-*)
-  AC_CHECK_LIB(m, cos, LIBM="-lm")
-  ;;
-esac
-])# AC_CHECK_LIBM
-
-
-# AC_LIBLTDL_CONVENIENCE([DIRECTORY])
-# -----------------------------------
-# sets LIBLTDL to the link flags for the libltdl convenience library and
-# LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-convenience to the configure arguments.  Note that LIBLTDL
-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
-# DIRECTORY is not provided, it is assumed to be `libltdl'.  LIBLTDL will
-# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
-# '${top_srcdir}/' (note the single quotes!).  If your package is not
-# flat and you're not using automake, define top_builddir and
-# top_srcdir appropriately in the Makefiles.
-AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  case $enable_ltdl_convenience in
-  no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;;
-  "") enable_ltdl_convenience=yes
-      ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;;
-  esac
-  LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la
-  LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-  # For backwards non-gettext consistent compatibility...
-  INCLTDL="$LTDLINCL"
-])# AC_LIBLTDL_CONVENIENCE
-
-
-# AC_LIBLTDL_INSTALLABLE([DIRECTORY])
-# -----------------------------------
-# sets LIBLTDL to the link flags for the libltdl installable library and
-# LTDLINCL to the include flags for the libltdl header and adds
-# --enable-ltdl-install to the configure arguments.  Note that LIBLTDL
-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called.  If
-# DIRECTORY is not provided and an installed libltdl is not found, it is
-# assumed to be `libltdl'.  LIBLTDL will be prefixed with '${top_builddir}/'
-# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
-# quotes!).  If your package is not flat and you're not using automake,
-# define top_builddir and top_srcdir appropriately in the Makefiles.
-# In the future, this macro may have to be called after AC_PROG_LIBTOOL.
-AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
-[AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
-  AC_CHECK_LIB(ltdl, lt_dlinit,
-  [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no],
-  [if test x"$enable_ltdl_install" = xno; then
-     AC_MSG_WARN([libltdl not installed, but installation disabled])
-   else
-     enable_ltdl_install=yes
-   fi
-  ])
-  if test x"$enable_ltdl_install" = x"yes"; then
-    ac_configure_args="$ac_configure_args --enable-ltdl-install"
-    LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la
-    LTDLINCL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl'])
-  else
-    ac_configure_args="$ac_configure_args --enable-ltdl-install=no"
-    LIBLTDL="-lltdl"
-    LTDLINCL=
-  fi
-  # For backwards non-gettext consistent compatibility...
-  INCLTDL="$LTDLINCL"
-])# AC_LIBLTDL_INSTALLABLE
-
-
-# AC_LIBTOOL_CXX
-# --------------
-# enable support for C++ libraries
-AC_DEFUN([AC_LIBTOOL_CXX],
-[AC_REQUIRE([_LT_AC_LANG_CXX])
-])# AC_LIBTOOL_CXX
-
-
-# _LT_AC_LANG_CXX
-# ---------------
-AC_DEFUN([_LT_AC_LANG_CXX],
-[AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXXCPP])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
-])# _LT_AC_LANG_CXX
-
-
-# AC_LIBTOOL_F77
-# --------------
-# enable support for Fortran 77 libraries
-AC_DEFUN([AC_LIBTOOL_F77],
-[AC_REQUIRE([_LT_AC_LANG_F77])
-])# AC_LIBTOOL_F77
-
-
-# _LT_AC_LANG_F77
-# ---------------
-AC_DEFUN([_LT_AC_LANG_F77],
-[AC_REQUIRE([AC_PROG_F77])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}F77])
-])# _LT_AC_LANG_F77
-
-
-# AC_LIBTOOL_GCJ
-# --------------
-# enable support for GCJ libraries
-AC_DEFUN([AC_LIBTOOL_GCJ],
-[AC_REQUIRE([_LT_AC_LANG_GCJ])
-])# AC_LIBTOOL_GCJ
-
-
-# _LT_AC_LANG_GCJ
-# ---------------
-AC_DEFUN([_LT_AC_LANG_GCJ],
-[AC_PROVIDE_IFELSE([AC_PROG_GCJ],[],
-  [AC_PROVIDE_IFELSE([A][M_PROG_GCJ],[],
-    [AC_PROVIDE_IFELSE([LT_AC_PROG_GCJ],[],
-      [ifdef([AC_PROG_GCJ],[AC_REQUIRE([AC_PROG_GCJ])],
-	 [ifdef([A][M_PROG_GCJ],[AC_REQUIRE([A][M_PROG_GCJ])],
-	   [AC_REQUIRE([A][C_PROG_GCJ_OR_A][M_PROG_GCJ])])])])])])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}GCJ])
-])# _LT_AC_LANG_GCJ
-
-
-# AC_LIBTOOL_RC
-# --------------
-# enable support for Windows resource files
-AC_DEFUN([AC_LIBTOOL_RC],
-[AC_REQUIRE([LT_AC_PROG_RC])
-_LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}RC])
-])# AC_LIBTOOL_RC
-
-
-# AC_LIBTOOL_LANG_C_CONFIG
-# ------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG], [_LT_AC_LANG_C_CONFIG])
-AC_DEFUN([_LT_AC_LANG_C_CONFIG],
-[lt_save_CC="$CC"
-AC_LANG_PUSH(C)
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}\n'
-
-_LT_AC_SYS_COMPILER
-
-#
-# Check for any special shared library compilation flags.
-#
-_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)=
-if test "$GCC" = no; then
-  case $host_os in
-  sco3.2v5*)
-    _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf'
-    ;;
-  esac
-fi
-if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
-  AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
-  if echo "$old_CC $old_CFLAGS " | grep "[[ 	]]$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[ 	]]" >/dev/null; then :
-  else
-    AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
-    _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
-  fi
-fi
-
-
-#
-# Check to make sure the static flag actually works.
-#
-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works],
-  _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
-  $_LT_AC_TAGVAR(lt_prog_compiler_static, $1),
-  [],
-  [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
-
-
-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF($1)
-
-# Report which librarie types wil actually be built
-AC_MSG_CHECKING([if libtool supports shared libraries])
-AC_MSG_RESULT([$can_build_shared])
-
-AC_MSG_CHECKING([whether to build shared libraries])
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case "$host_os" in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-
-aix4* | aix5*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
-  fi
-  ;;
-  darwin* | rhapsody*)
-  if test "$GCC" = yes; then
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    case "$host_os" in
-    rhapsody* | darwin1.[[012]])
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
-      ;;
-    *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-      else
-        case ${MACOSX_DEPLOYMENT_TARGET} in
-          10.[[012]])
-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
-            ;;
-        esac
-      fi
-      ;;
-    esac
-    output_verbose_link_cmd='echo'
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
-    _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
-    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-  else
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-  fi
-    ;;
-esac
-AC_MSG_RESULT([$enable_shared])
-
-AC_MSG_CHECKING([whether to build static libraries])
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-AC_MSG_RESULT([$enable_static])
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_C_CONFIG
-
-
-# AC_LIBTOOL_LANG_CXX_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG], [_LT_AC_LANG_CXX_CONFIG(CXX)])
-AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
-[AC_LANG_PUSH(C++)
-AC_REQUIRE([AC_PROG_CXX])
-AC_REQUIRE([AC_PROG_CXXCPP])
-
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-_LT_AC_TAGVAR(always_export_symbols, $1)=no
-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_direct, $1)=no
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-_LT_AC_TAGVAR(module_cmds, $1)=
-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_AC_TAGVAR(no_undefined_flag, $1)=
-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Dependencies to place before and after the object being linked:
-_LT_AC_TAGVAR(predep_objects, $1)=
-_LT_AC_TAGVAR(postdep_objects, $1)=
-_LT_AC_TAGVAR(predeps, $1)=
-_LT_AC_TAGVAR(postdeps, $1)=
-_LT_AC_TAGVAR(compiler_lib_search_path, $1)=
-
-# Source file extension for C++ test sources.
-ac_ext=cc
-
-# Object file extension for compiled C++ test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_LD=$LD
-lt_save_GCC=$GCC
-GCC=$GXX
-lt_save_with_gnu_ld=$with_gnu_ld
-lt_save_path_LD=$lt_cv_path_LD
-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-else
-  unset lt_cv_prog_gnu_ld
-fi
-if test -n "${lt_cv_path_LDCXX+set}"; then
-  lt_cv_path_LD=$lt_cv_path_LDCXX
-else
-  unset lt_cv_path_LD
-fi
-test -z "${LDCXX+set}" || LD=$LDCXX
-CC=${CXX-"c++"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-
-# We don't want -fno-exception wen compiling C++ code, so set the
-# no_builtin_flag separately
-if test "$GXX" = yes; then
-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-else
-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-fi
-
-if test "$GXX" = yes; then
-  # Set up default GNU C++ configuration
-
-  AC_PROG_LD
-
-  # Check if GNU C++ uses GNU ld as the underlying linker, since the
-  # archiving commands below assume that GNU ld is being used.
-  if test "$with_gnu_ld" = yes; then
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-    #     investigate it a little bit more. (MM)
-    wlarc='${wl}'
-
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
-	grep 'no-whole-archive' > /dev/null; then
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-    fi
-  else
-    with_gnu_ld=no
-    wlarc=
-
-    # A generic and very simple default shared library creation
-    # command for GNU C++ for the case where it uses the native
-    # linker, instead of GNU ld.  If possible, this setting should
-    # overridden to take advantage of the native linker features on
-    # the platform it is being used on.
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-  fi
-
-  # Commands to make compiler produce verbose output that lists
-  # what "hidden" libraries, object files and flags are used when
-  # linking a shared library.
-  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-else
-  GXX=no
-  with_gnu_ld=no
-  wlarc=
-fi
-
-# PORTME: fill in a description of your system's C++ link characteristics
-AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-case $host_os in
-  aix3*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  aix4* | aix5*)
-    if test "$host_cpu" = ia64; then
-      # On IA64, the linker does run time linking by default, so we don't
-      # have to do anything special.
-      aix_use_runtimelinking=no
-      exp_sym_flag='-Bexport'
-      no_entry_flag=""
-    else
-      aix_use_runtimelinking=no
-
-      # Test if we are trying to use run time linking or normal
-      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-      # need to do runtime linking.
-      case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
-	for ld_flag in $LDFLAGS; do
-	  case $ld_flag in
-	  *-brtl*)
-	    aix_use_runtimelinking=yes
-	    break
-	    ;;
-	  esac
-	done
-      esac
-
-      exp_sym_flag='-bexport'
-      no_entry_flag='-bnoentry'
-    fi
-
-    # When large executables or shared objects are built, AIX ld can
-    # have problems creating the table of contents.  If linking a library
-    # or program results in "error TOC overflow" add -mminimal-toc to
-    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-    _LT_AC_TAGVAR(archive_cmds, $1)=''
-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-    if test "$GXX" = yes; then
-      case $host_os in aix4.[012]|aix4.[012].*)
-      # We only want to do this on AIX 4.2 and lower, the check
-      # below for broken collect2 doesn't work under 4.3+
-	collect2name=`${CC} -print-prog-name=collect2`
-	if test -f "$collect2name" && \
-	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	then
-	  # We have reworked collect2
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-	else
-	  # We have old collect2
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-	fi
-      esac
-      shared_flag='-shared'
-    else
-      # not using gcc
-      if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	shared_flag='-G'
-      else
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag='${wl}-G'
-	else
-	  shared_flag='${wl}-bM:SRE'
-	fi
-      fi
-    fi
-
-    # It seems that -bexpall does not export symbols beginning with
-    # underscore (_), so it is better to generate a list of symbols to export.
-    _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-    if test "$aix_use_runtimelinking" = yes; then
-      # Warning - without using the other runtime loading flags (-brtl),
-      # -berok will link without error, but may produce a broken library.
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
-      # Determine the default libpath from the value encoded in an empty executable.
-      _LT_AC_SYS_LIBPATH_AIX
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-     else
-      if test "$host_cpu" = ia64; then
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-      else
-	# Determine the default libpath from the value encoded in an empty executable.
-	_LT_AC_SYS_LIBPATH_AIX
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	# Warning - without using the other run time loading flags,
-	# -berok will link without error, but may produce a broken library.
-	_LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	# -bexpall does not export symbols beginning with underscore (_)
-	_LT_AC_TAGVAR(always_export_symbols, $1)=yes
-	# Exported symbols can be pulled into shared objects from archives
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
-	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-	# This is similar to how AIX traditionally builds it's shared libraries.
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-      fi
-    fi
-    ;;
-  chorus*)
-    case $cc_basename in
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-
-  cygwin* | mingw* | pw32*)
-    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-    # as there is no search path for DLLs.
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-    _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-    _LT_AC_TAGVAR(always_export_symbols, $1)=no
-    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
-    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-      # If the export-symbols file already is a .def file (1st line
-      # is EXPORTS), use it as is; otherwise, prepend...
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	cp $export_symbols $output_objdir/$soname.def;
-      else
-	echo EXPORTS > $output_objdir/$soname.def;
-	cat $export_symbols >> $output_objdir/$soname.def;
-      fi~
-      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-    else
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    fi
-  ;;
-
-  darwin* | rhapsody*)
-  if test "$GXX" = yes; then
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    case "$host_os" in
-    rhapsody* | darwin1.[[012]])
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
-      ;;
-    *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-      else
-        case ${MACOSX_DEPLOYMENT_TARGET} in
-          10.[[012]])
-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
-            ;;
-        esac
-      fi
-      ;;
-    esac
-    lt_int_apple_cc_single_mod=no
-    output_verbose_link_cmd='echo'
-    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-      lt_int_apple_cc_single_mod=yes
-    fi
-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-    else
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-    fi
-    _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-
-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    else
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    fi
-    _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    _LT_AC_TAGVAR(hardcode_direct, $1)=no
-    _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-    _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-  else
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-  fi
-    ;;
-
-  dgux*)
-    case $cc_basename in
-      ec++)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      ghcx)
-	# Green Hills C++ Compiler
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  freebsd[12]*)
-    # C++ shared libraries reported to be fairly broken before switch to ELF
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  freebsd-elf*)
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    ;;
-  freebsd* | kfreebsd*-gnu)
-    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-    # conventions
-    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-    ;;
-  gnu*)
-    ;;
-  hpux9*)
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-    _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-    _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-				# but as the default
-				# location of the library.
-
-    case $cc_basename in
-    CC)
-      # FIXME: insert proper C++ library support
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-    aCC)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      # Commands to make compiler produce verbose output that lists
-      # what "hidden" libraries, object files and flags are used when
-      # linking a shared library.
-      #
-      # There doesn't appear to be a way to prevent this compiler from
-      # explicitly linking system object files so we need to strip them
-      # from the output so that they don't get included in the library
-      # dependencies.
-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[-]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-      ;;
-    *)
-      if test "$GXX" = yes; then
-        _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-        # FIXME: insert proper C++ library support
-        _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-    esac
-    ;;
-  hpux10*|hpux11*)
-    if test $with_gnu_ld = no; then
-      case "$host_cpu" in
-      hppa*64*)
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-        ;;
-      ia64*)
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-        ;;
-      *)
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-        ;;
-      esac
-    fi
-    case "$host_cpu" in
-    hppa*64*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-    ia64*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-					      # but as the default
-					      # location of the library.
-      ;;
-    *)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
-					      # but as the default
-					      # location of the library.
-      ;;
-    esac
-
-    case $cc_basename in
-      CC)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      aCC)
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  ;;
-	esac
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes; then
-	  if test $with_gnu_ld = no; then
-	    case "$host_cpu" in
-	    ia64*|hppa*64*)
-	      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
-	      ;;
-	    *)
-	      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
-	    esac
-	  fi
-	else
-	  # FIXME: insert proper C++ library support
-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-    esac
-    ;;
-  irix5* | irix6*)
-    case $cc_basename in
-      CC)
-	# SGI C++
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-
-	# Archives containing C++ object files must be created using
-	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-	# necessary to make sure instantiated templates are included
-	# in the archive.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	;;
-      *)
-	if test "$GXX" = yes; then
-	  if test "$with_gnu_ld" = no; then
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-	  else
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
-	  fi
-	fi
-	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-	;;
-    esac
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-    ;;
-  linux*)
-    case $cc_basename in
-      KCC)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-
-	# Archives containing C++ object files must be created using
-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-	;;
-      icpc)
-	# Intel C++
-	with_gnu_ld=yes
-	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	;;
-      cxx)
-	# Compaq C++
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-
-	runpath_var=LD_RUN_PATH
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-    esac
-    ;;
-  lynxos*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  m88k*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  mvs*)
-    case $cc_basename in
-      cxx)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-      wlarc=
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-    fi
-    # Workaround some broken pre-1.5 toolchains
-    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-    ;;
-  osf3*)
-    case $cc_basename in
-      KCC)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Archives containing C++ object files must be created using
-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
-
-	;;
-      RCC)
-	# Rational C++ 2.4.1
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      cxx)
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	  # Commands to make compiler produce verbose output that lists
-	  # what "hidden" libraries, object files and flags are used when
-	  # linking a shared library.
-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-	else
-	  # FIXME: insert proper C++ library support
-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-    esac
-    ;;
-  osf4* | osf5*)
-    case $cc_basename in
-      KCC)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	_LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Archives containing C++ object files must be created using
-	# the KAI C++ compiler.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
-	;;
-      RCC)
-	# Rational C++ 2.4.1
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      cxx)
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-	  echo "-hidden">> $lib.exp~
-	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
-	  $rm $lib.exp'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	 _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-
-	  # Commands to make compiler produce verbose output that lists
-	  # what "hidden" libraries, object files and flags are used when
-	  # linking a shared library.
-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-	else
-	  # FIXME: insert proper C++ library support
-	  _LT_AC_TAGVAR(ld_shlibs, $1)=no
-	fi
-	;;
-    esac
-    ;;
-  psos*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  sco*)
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    case $cc_basename in
-      CC)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  sunos4*)
-    case $cc_basename in
-      CC)
-	# Sun C++ 4.x
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      lcc)
-	# Lucid
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  solaris*)
-    case $cc_basename in
-      CC)
-	# Sun C++ 4.2, 5.x and Centerline C++
-	_LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-	case $host_os in
-	  solaris2.[0-5] | solaris2.[0-5].*) ;;
-	  *)
-	    # The C++ compiler is used as linker so we must use $wl
-	    # flag to pass the commands to the underlying system
-	    # linker.
-	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-	    _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	    ;;
-	esac
-	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-
-	# Archives containing C++ object files must be created using
-	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	# necessary to make sure instantiated templates are included
-	# in the archive.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
-	;;
-      gcx)
-	# Green Hills C++ Compiler
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-
-	# The C++ compiler must be used to create the archive.
-	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	;;
-      *)
-	# GNU C++ compiler with Solaris linker
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
-	  if $CC --version | grep -v '^2\.7' > /dev/null; then
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-	  else
-	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
-	    # platform.
-	    _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	    _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-	  fi
-
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
-	fi
-	;;
-    esac
-    ;;
-  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
-    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-    ;;
-  tandem*)
-    case $cc_basename in
-      NCC)
-	# NonStop-UX NCC 3.20
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	;;
-    esac
-    ;;
-  vxworks*)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-  *)
-    # FIXME: insert proper C++ library support
-    _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    ;;
-esac
-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-_LT_AC_TAGVAR(GCC, $1)="$GXX"
-_LT_AC_TAGVAR(LD, $1)="$LD"
-
-AC_LIBTOOL_POSTDEP_PREDEP($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF($1)
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC=$lt_save_CC
-LDCXX=$LD
-LD=$lt_save_LD
-GCC=$lt_save_GCC
-with_gnu_ldcxx=$with_gnu_ld
-with_gnu_ld=$lt_save_with_gnu_ld
-lt_cv_path_LDCXX=$lt_cv_path_LD
-lt_cv_path_LD=$lt_save_path_LD
-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-])# AC_LIBTOOL_LANG_CXX_CONFIG
-
-# AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
-# ------------------------
-# Figure out "hidden" library dependencies from verbose
-# compiler output when linking a shared library.
-# Parse the compiler output and extract the necessary
-# objects, libraries and library flags.
-AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP],[
-dnl we can't use the lt_simple_compile_test_code here,
-dnl because it contains code intended for an executable,
-dnl not a library.  It's possible we should let each
-dnl tag define a new lt_????_link_test_code variable,
-dnl but it's only used here...
-ifelse([$1],[],[cat > conftest.$ac_ext <<EOF
-int a;
-void foo (void) { a = 0; }
-EOF
-],[$1],[CXX],[cat > conftest.$ac_ext <<EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-EOF
-],[$1],[F77],[cat > conftest.$ac_ext <<EOF
-      subroutine foo
-      implicit none
-      integer*4 a
-      a=0
-      return
-      end
-EOF
-],[$1],[GCJ],[cat > conftest.$ac_ext <<EOF
-public class foo {
-  private int a;
-  public void bar (void) {
-    a = 0;
-  }
-};
-EOF
-])
-dnl Parse the compiler output and extract the necessary
-dnl objects, libraries and library flags.
-if AC_TRY_EVAL(ac_compile); then
-  # Parse the compiler output and extract the necessary
-  # objects, libraries and library flags.
-
-  # Sentinel used to keep track of whether or not we are before
-  # the conftest object file.
-  pre_test_object_deps_done=no
-
-  # The `*' in the case matches for architectures that use `case' in
-  # $output_verbose_cmd can trigger glob expansion during the loop
-  # eval without this substitution.
-  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
-
-  for p in `eval $output_verbose_link_cmd`; do
-    case $p in
-
-    -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test $p = "-L" \
-	  || test $p = "-R"; then
-	 prev=$p
-	 continue
-       else
-	 prev=
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 case $p in
-	 -L* | -R*)
-	   # Internal compiler library paths should come after those
-	   # provided the user.  The postdeps already come after the
-	   # user supplied libs so there is no need to process them.
-	   if test -z "$_LT_AC_TAGVAR(compiler_lib_search_path, $1)"; then
-	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
-	   else
-	     _LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
-	   fi
-	   ;;
-	 # The "-l" case would never come before the object being
-	 # linked, so don't bother handling this case.
-	 esac
-       else
-	 if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
-	   _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
-	 else
-	   _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
-	 fi
-       fi
-       ;;
-
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-	 pre_test_object_deps_done=yes
-	 continue
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 if test -z "$_LT_AC_TAGVAR(predep_objects, $1)"; then
-	   _LT_AC_TAGVAR(predep_objects, $1)="$p"
-	 else
-	   _LT_AC_TAGVAR(predep_objects, $1)="$_LT_AC_TAGVAR(predep_objects, $1) $p"
-	 fi
-       else
-	 if test -z "$_LT_AC_TAGVAR(postdep_objects, $1)"; then
-	   _LT_AC_TAGVAR(postdep_objects, $1)="$p"
-	 else
-	   _LT_AC_TAGVAR(postdep_objects, $1)="$_LT_AC_TAGVAR(postdep_objects, $1) $p"
-	 fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling $1 test program"
-fi
-
-$rm -f confest.$objext
-
-case " $_LT_AC_TAGVAR(postdeps, $1) " in
-*" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
-esac
-])# AC_LIBTOOL_POSTDEP_PREDEP
-
-# AC_LIBTOOL_LANG_F77_CONFIG
-# ------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG], [_LT_AC_LANG_F77_CONFIG(F77)])
-AC_DEFUN([_LT_AC_LANG_F77_CONFIG],
-[AC_REQUIRE([AC_PROG_F77])
-AC_LANG_PUSH(Fortran 77)
-
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-_LT_AC_TAGVAR(allow_undefined_flag, $1)=
-_LT_AC_TAGVAR(always_export_symbols, $1)=no
-_LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_direct, $1)=no
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-_LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-_LT_AC_TAGVAR(hardcode_automatic, $1)=no
-_LT_AC_TAGVAR(module_cmds, $1)=
-_LT_AC_TAGVAR(module_expsym_cmds, $1)=
-_LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
-_LT_AC_TAGVAR(no_undefined_flag, $1)=
-_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="      program t\n      end\n"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${F77-"f77"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-
-AC_MSG_CHECKING([if libtool supports shared libraries])
-AC_MSG_RESULT([$can_build_shared])
-
-AC_MSG_CHECKING([whether to build shared libraries])
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case "$host_os" in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-aix4* | aix5*)
-  test "$enable_shared" = yes && enable_static=no
-  ;;
-esac
-AC_MSG_RESULT([$enable_shared])
-
-AC_MSG_CHECKING([whether to build static libraries])
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-AC_MSG_RESULT([$enable_static])
-
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-_LT_AC_TAGVAR(GCC, $1)="$G77"
-_LT_AC_TAGVAR(LD, $1)="$LD"
-
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_POP
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_F77_CONFIG
-
-
-# AC_LIBTOOL_LANG_GCJ_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the C compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG], [_LT_AC_LANG_GCJ_CONFIG(GCJ)])
-AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG],
-[AC_LANG_SAVE
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${GCJ-"gcj"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-
-AC_LIBTOOL_PROG_COMPILER_NO_RTTI($1)
-AC_LIBTOOL_PROG_COMPILER_PIC($1)
-AC_LIBTOOL_PROG_CC_C_O($1)
-AC_LIBTOOL_SYS_HARD_LINK_LOCKS($1)
-AC_LIBTOOL_PROG_LD_SHLIBS($1)
-AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
-AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
-AC_LIBTOOL_SYS_LIB_STRIP
-AC_LIBTOOL_DLOPEN_SELF($1)
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_RESTORE
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_GCJ_CONFIG
-
-
-# AC_LIBTOOL_LANG_RC_CONFIG
-# --------------------------
-# Ensure that the configuration vars for the Windows resource compiler are
-# suitably defined.  Those variables are subsequently used by
-# AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
-AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG], [_LT_AC_LANG_RC_CONFIG(RC)])
-AC_DEFUN([_LT_AC_LANG_RC_CONFIG],
-[AC_LANG_SAVE
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-_LT_AC_TAGVAR(objext, $1)=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-_LT_AC_SYS_COMPILER
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${RC-"windres"}
-compiler=$CC
-_LT_AC_TAGVAR(compiler, $1)=$CC
-_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
-
-AC_LIBTOOL_CONFIG($1)
-
-AC_LANG_RESTORE
-CC="$lt_save_CC"
-])# AC_LIBTOOL_LANG_RC_CONFIG
-
-
-# AC_LIBTOOL_CONFIG([TAGNAME])
-# ----------------------------
-# If TAGNAME is not passed, then create an initial libtool script
-# with a default configuration from the untagged config vars.  Otherwise
-# add code to config.status for appending the configuration named by
-# TAGNAME from the matching tagged config vars.
-AC_DEFUN([AC_LIBTOOL_CONFIG],
-[# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    _LT_AC_TAGVAR(compiler, $1) \
-    _LT_AC_TAGVAR(CC, $1) \
-    _LT_AC_TAGVAR(LD, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1) \
-    _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) \
-    _LT_AC_TAGVAR(export_dynamic_flag_spec, $1) \
-    _LT_AC_TAGVAR(thread_safe_flag_spec, $1) \
-    _LT_AC_TAGVAR(whole_archive_flag_spec, $1) \
-    _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1) \
-    _LT_AC_TAGVAR(old_archive_cmds, $1) \
-    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) \
-    _LT_AC_TAGVAR(predep_objects, $1) \
-    _LT_AC_TAGVAR(postdep_objects, $1) \
-    _LT_AC_TAGVAR(predeps, $1) \
-    _LT_AC_TAGVAR(postdeps, $1) \
-    _LT_AC_TAGVAR(compiler_lib_search_path, $1) \
-    _LT_AC_TAGVAR(archive_cmds, $1) \
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1) \
-    _LT_AC_TAGVAR(postinstall_cmds, $1) \
-    _LT_AC_TAGVAR(postuninstall_cmds, $1) \
-    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) \
-    _LT_AC_TAGVAR(allow_undefined_flag, $1) \
-    _LT_AC_TAGVAR(no_undefined_flag, $1) \
-    _LT_AC_TAGVAR(export_symbols_cmds, $1) \
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) \
-    _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1) \
-    _LT_AC_TAGVAR(hardcode_libdir_separator, $1) \
-    _LT_AC_TAGVAR(hardcode_automatic, $1) \
-    _LT_AC_TAGVAR(module_cmds, $1) \
-    _LT_AC_TAGVAR(module_expsym_cmds, $1) \
-    _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
-    _LT_AC_TAGVAR(exclude_expsyms, $1) \
-    _LT_AC_TAGVAR(include_expsyms, $1); do
-
-    case $var in
-    _LT_AC_TAGVAR(old_archive_cmds, $1) | \
-    _LT_AC_TAGVAR(old_archive_from_new_cmds, $1) | \
-    _LT_AC_TAGVAR(archive_cmds, $1) | \
-    _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
-    _LT_AC_TAGVAR(module_cmds, $1) | \
-    _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
-    _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
-    _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\[$]0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\[$]0 --fallback-echo"[$]/[$]0 --fallback-echo"/'`
-    ;;
-  esac
-
-ifelse([$1], [],
-  [cfgfile="${ofile}T"
-  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-  $rm -f "$cfgfile"
-  AC_MSG_NOTICE([creating $ofile])],
-  [cfgfile="$ofile"])
-
-  cat <<__EOF__ >> "$cfgfile"
-ifelse([$1], [],
-[#! $SHELL
-
-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-# Free Software Foundation, Inc.
-#
-# This file is part of GNU Libtool:
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# A sed program that does not truncate output.
-SED=$lt_SED
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="$SED -e s/^X//"
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-
-# The names of the tagged configurations supported by this script.
-available_tags=
-
-# ### BEGIN LIBTOOL CONFIG],
-[# ### BEGIN LIBTOOL TAG CONFIG: $tagname])
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$_LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# A language-specific compiler.
-CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
-
-# Is the compiler the GNU C compiler?
-with_gcc=$_LT_AC_TAGVAR(GCC, $1)
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_[]_LT_AC_TAGVAR(LD, $1)
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
-
-# Must we lock files when doing compilation ?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_static, $1)
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_[]_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_[]_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_[]_LT_AC_TAGVAR(whole_archive_flag_spec, $1)
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_[]_LT_AC_TAGVAR(thread_safe_flag_spec, $1)
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_cmds, $1)
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_new_cmds, $1)
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_[]_LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_[]_LT_AC_TAGVAR(archive_cmds, $1)
-archive_expsym_cmds=$lt_[]_LT_AC_TAGVAR(archive_expsym_cmds, $1)
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_[]_LT_AC_TAGVAR(module_cmds, $1)
-module_expsym_cmds=$lt_[]_LT_AC_TAGVAR(module_expsym_cmds, $1)
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_[]_LT_AC_TAGVAR(predep_objects, $1)
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_[]_LT_AC_TAGVAR(postdep_objects, $1)
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_[]_LT_AC_TAGVAR(predeps, $1)
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_[]_LT_AC_TAGVAR(postdeps, $1)
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_[]_LT_AC_TAGVAR(compiler_lib_search_path, $1)
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_[]_LT_AC_TAGVAR(allow_undefined_flag, $1)
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_[]_LT_AC_TAGVAR(no_undefined_flag, $1)
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$_LT_AC_TAGVAR(hardcode_action, $1)
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_[]_LT_AC_TAGVAR(hardcode_libdir_separator, $1)
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$_LT_AC_TAGVAR(hardcode_direct, $1)
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$_LT_AC_TAGVAR(hardcode_minus_L, $1)
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$_LT_AC_TAGVAR(hardcode_automatic, $1)
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$_LT_AC_TAGVAR(link_all_deplibs, $1)
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_[]_LT_AC_TAGVAR(export_symbols_cmds, $1)
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_[]_LT_AC_TAGVAR(exclude_expsyms, $1)
-
-# Symbols that must always be exported.
-include_expsyms=$lt_[]_LT_AC_TAGVAR(include_expsyms, $1)
-
-ifelse([$1],[],
-[# ### END LIBTOOL CONFIG],
-[# ### END LIBTOOL TAG CONFIG: $tagname])
-
-__EOF__
-
-ifelse([$1],[], [
-  case $host_os in
-  aix3*)
-    cat <<\EOF >> "$cfgfile"
-
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-EOF
-    ;;
-  esac
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
-
-  mv -f "$cfgfile" "$ofile" || \
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-])
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-])# AC_LIBTOOL_CONFIG
-
-
-# AC_LIBTOOL_PROG_COMPILER_NO_RTTI([TAGNAME])
-# -------------------------------------------
-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI],
-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
-
-_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-
-if test "$GCC" = yes; then
-  _LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
-
-  AC_LIBTOOL_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
-    lt_cv_prog_compiler_rtti_exceptions,
-    [-fno-rtti -fno-exceptions], [],
-    [_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1) -fno-rtti -fno-exceptions"])
-fi
-])# AC_LIBTOOL_PROG_COMPILER_NO_RTTI
-
-
-# AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-# ---------------------------------
-AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
-[AC_REQUIRE([AC_CANONICAL_HOST])
-AC_REQUIRE([AC_PROG_NM])
-AC_REQUIRE([AC_OBJEXT])
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-AC_MSG_CHECKING([command to parse $NM output from $compiler object])
-AC_CACHE_VAL([lt_cv_sys_global_symbol_pipe],
-[
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[[BCDEGRST]]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
-
-# Transform the above into a raw symbol and a C symbol.
-symxfrm='\1 \2\3 \3'
-
-# Transform an extracted symbol line into a proper C declaration
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[[BCDT]]'
-  ;;
-cygwin* | mingw* | pw32*)
-  symcode='[[ABCDGISTW]]'
-  ;;
-hpux*) # Its linker distinguishes data from code symbols
-  if test "$host_cpu" = ia64; then
-    symcode='[[ABCDEGRST]]'
-  fi
-  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-  ;;
-irix* | nonstopux*)
-  symcode='[[BCDEGRST]]'
-  ;;
-osf*)
-  symcode='[[BCDEGQRST]]'
-  ;;
-solaris* | sysv5*)
-  symcode='[[BDRT]]'
-  ;;
-sysv4)
-  symcode='[[DFNSTU]]'
-  ;;
-esac
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[[ABCDGIRSTW]]' ;;
-esac
-
-# Try without a prefix undercore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Write the raw and C identifiers.
-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ 	]]\($symcode$symcode*\)[[ 	]][[ 	]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-EOF
-
-  if AC_TRY_EVAL(ac_compile); then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if grep ' nm_test_var$' "$nlist" >/dev/null; then
-	if grep ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
-
-	  cat <<EOF >> conftest.$ac_ext
-#if defined (__STDC__) && __STDC__
-# define lt_ptr_t void *
-#else
-# define lt_ptr_t char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-const struct {
-  const char *name;
-  lt_ptr_t address;
-}
-lt_preloaded_symbols[[]] =
-{
-EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
-	  cat <<\EOF >> conftest.$ac_ext
-  {0, (lt_ptr_t) 0}
-};
-
-#ifdef __cplusplus
-}
-#endif
-EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
-	  LIBS="conftstm.$ac_objext"
-	  CFLAGS="$CFLAGS$_LT_AC_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
-	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
-	    pipe_works=yes
-	  fi
-	  LIBS="$lt_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
-	else
-	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&AS_MESSAGE_LOG_FD
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&AS_MESSAGE_LOG_FD
-    fi
-  else
-    echo "$progname: failed program was:" >&AS_MESSAGE_LOG_FD
-    cat conftest.$ac_ext >&5
-  fi
-  rm -f conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-])
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  AC_MSG_RESULT(failed)
-else
-  AC_MSG_RESULT(ok)
-fi
-]) # AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE
-
-
-# AC_LIBTOOL_PROG_COMPILER_PIC([TAGNAME])
-# ---------------------------------------
-AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC],
-[_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=
-_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=
-
-AC_MSG_CHECKING([for $compiler option to produce PIC])
- ifelse([$1],[CXX],[
-  # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-    aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-      ;;
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    mingw* | os2* | pw32*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case "$host_cpu" in
-      hppa*64*|ia64*)
-	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-    *)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    case $host_os in
-      aix4* | aix5*)
-	# All AIX code is PIC.
-	if test "$host_cpu" = ia64; then
-	  # AIX 5 now supports IA64 processor
-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	else
-	  _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-	fi
-	;;
-      chorus*)
-	case $cc_basename in
-	cxch68)
-	  # Green Hills C++ Compiler
-	  # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-	  ;;
-	esac
-	;;
-      dgux*)
-	case $cc_basename in
-	  ec++)
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  ghcx)
-	    # Green Hills C++ Compiler
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      freebsd* | kfreebsd*-gnu)
-	# FreeBSD uses GNU C++
-	;;
-      hpux9* | hpux10* | hpux11*)
-	case $cc_basename in
-	  CC)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-	    if test "$host_cpu" != ia64; then
-	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	    fi
-	    ;;
-	  aCC)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-	    case "$host_cpu" in
-	    hppa*64*|ia64*)
-	      # +Z the default
-	      ;;
-	    *)
-	      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	      ;;
-	    esac
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      irix5* | irix6* | nonstopux*)
-	case $cc_basename in
-	  CC)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    # CC pic flag -KPIC is the default.
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      linux*)
-	case $cc_basename in
-	  KCC)
-	    # KAI C++ Compiler
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    ;;
-	  icpc)
-	    # Intel C++
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-	    ;;
-	  cxx)
-	    # Compaq C++
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      lynxos*)
-	;;
-      m88k*)
-	;;
-      mvs*)
-	case $cc_basename in
-	  cxx)
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-	;;
-      osf3* | osf4* | osf5*)
-	case $cc_basename in
-	  KCC)
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
-	    ;;
-	  RCC)
-	    # Rational C++ 2.4.1
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  cxx)
-	    # Digital/Compaq C++
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      psos*)
-	;;
-      sco*)
-	case $cc_basename in
-	  CC)
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      solaris*)
-	case $cc_basename in
-	  CC)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-	    ;;
-	  gcx)
-	    # Green Hills C++ Compiler
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sunos4*)
-	case $cc_basename in
-	  CC)
-	    # Sun C++ 4.x
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	    ;;
-	  lcc)
-	    # Lucid
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      tandem*)
-	case $cc_basename in
-	  NCC)
-	    # NonStop-UX NCC 3.20
-	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      unixware*)
-	;;
-      vxworks*)
-	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-	;;
-    esac
-  fi
-],
-[
-  if test "$GCC" = yes; then
-    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-    _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
-      ;;
-
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      enable_shared=no
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
-      fi
-      ;;
-
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case "$host_cpu" in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-	;;
-      esac
-      ;;
-
-    *)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      else
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case "$host_cpu" in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # PIC (with -KPIC) is the default.
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    newsos6)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    linux*)
-      case $CC in
-      icc* | ecc*)
-	_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
-        ;;
-      ccc*)
-        _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-        # All Alpha code is PIC.
-        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-        ;;
-      esac
-      ;;
-
-    osf3* | osf4* | osf5*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      # All OSF/1 code is PIC.
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
-      ;;
-
-    sco3.2v5*)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn'
-      ;;
-
-    solaris*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sunos4*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-      _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
-	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      fi
-      ;;
-
-    uts4*)
-      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
-      _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-      ;;
-
-    *)
-      _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
-      ;;
-    esac
-  fi
-])
-AC_MSG_RESULT([$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)])
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)"; then
-  AC_LIBTOOL_COMPILER_OPTION([if $compiler PIC flag $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) works],
-    _LT_AC_TAGVAR(lt_prog_compiler_pic_works, $1),
-    [$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])], [],
-    [case $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1) in
-     "" | " "*) ;;
-     *) _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=" $_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)" ;;
-     esac],
-    [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-     _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
-fi
-case "$host_os" in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-    ;;
-  *)
-    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
-    ;;
-esac
-])
-
-
-# AC_LIBTOOL_PROG_LD_SHLIBS([TAGNAME])
-# ------------------------------------
-# See if the linker supports building shared libraries.
-AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
-ifelse([$1],[CXX],[
-  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  case $host_os in
-  aix4* | aix5*)
-    # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-    else
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-    fi
-    ;;
-  pw32*)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-  ;;
-  cygwin* | mingw*)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  linux*)
-    _LT_AC_TAGVAR(link_all_deplibs, $1)=no
-  ;;
-  *)
-    _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  esac
-],[
-  runpath_var=
-  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-  _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=no
-  _LT_AC_TAGVAR(archive_cmds, $1)=
-  _LT_AC_TAGVAR(archive_expsym_cmds, $1)=
-  _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)=
-  _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1)=
-  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
-  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-  _LT_AC_TAGVAR(thread_safe_flag_spec, $1)=
-  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
-  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-  _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
-  _LT_AC_TAGVAR(hardcode_automatic, $1)=no
-  _LT_AC_TAGVAR(module_cmds, $1)=
-  _LT_AC_TAGVAR(module_expsym_cmds, $1)=
-  _LT_AC_TAGVAR(always_export_symbols, $1)=no
-  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  _LT_AC_TAGVAR(include_expsyms, $1)=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  _LT_AC_TAGVAR(exclude_expsyms, $1)="_GLOBAL_OFFSET_TABLE_"
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix3* | aix4* | aix5*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	cat <<EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-EOF
-      fi
-      ;;
-
-    amigaos*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can't use
-      # them.
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-      # as there is no search path for DLLs.
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(always_export_symbols, $1)=no
-      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris* | sysv5*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-	cat <<EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-EOF
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-
-    sunos4*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-  linux*)
-    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_cmds, $1)="$tmp_archive_cmds"
-      supports_anon_versioning=no
-      case `$LD -v 2>/dev/null` in
-        *\ [01].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
-        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-        *\ 2.11.*) ;; # other 2.11 versions
-        *) supports_anon_versioning=yes ;;
-      esac
-      if test $supports_anon_versioning = yes; then
-        _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-$echo "local: *; };" >> $output_objdir/$libname.ver~
-        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-      else
-        _LT_AC_TAGVAR(archive_expsym_cmds, $1)="$tmp_archive_cmds"
-      fi
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=no
-    else
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    fi
-    ;;
-
-    *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-      fi
-      ;;
-    esac
-
-    if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
-      runpath_var=LD_RUN_PATH
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-      # ancient GNU ld didn't support --whole-archive et. al.
-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- 	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
-      fi
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      if test "$GCC" = yes && test -z "$link_static_flag"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	_LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-      fi
-      ;;
-
-    aix4* | aix5*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-	else
-	  _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
-	  for ld_flag in $LDFLAGS; do
-  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-  	    aix_use_runtimelinking=yes
-  	    break
-  	  fi
-	  done
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      _LT_AC_TAGVAR(archive_cmds, $1)=''
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.[012]|aix4.[012].*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" && \
-  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	  then
-  	  # We have reworked collect2
-  	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-	  else
-  	  # We have old collect2
-  	  _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
-  	  # It fails to find uninstalled libraries when the uninstalled
-  	  # path is not listed in the libpath.  Setting hardcode_minus_L
-  	  # to unsupported forces relinking
-  	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
-	  fi
-	esac
-	shared_flag='-shared'
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-  	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-  	if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-  	fi
-	fi
-      fi
-
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       _LT_AC_SYS_LIBPATH_AIX
-       _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-       else
-	if test "$host_cpu" = ia64; then
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an empty executable.
-	 _LT_AC_SYS_LIBPATH_AIX
-	 _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
-	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	  # -bexpall does not export symbols beginning with underscore (_)
-	  _LT_AC_TAGVAR(always_export_symbols, $1)=yes
-	  # Exported symbols can be pulled into shared objects from archives
-	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-	  # This is similar to how AIX traditionally builds it's shared libraries.
-	  _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      # see comment about different semantics on the GNU ld section
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
-    bsdi4*)
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
-      # FIXME: Should let the user specify the lib program.
-      _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path='`cygpath -w "$srcfile"`'
-      _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      ;;
-
-    darwin* | rhapsody*)
-    if test "$GXX" = yes ; then
-      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-      case "$host_os" in
-      rhapsody* | darwin1.[[012]])
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined suppress'
-	;;
-      *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-      	_LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-      else
-        case ${MACOSX_DEPLOYMENT_TARGET} in
-          10.[[012]])
-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            _LT_AC_TAGVAR(allow_undefined_flag, $1)='-undefined dynamic_lookup'
-            ;;
-        esac
-      fi
-	;;
-      esac
-    	lt_int_apple_cc_single_mod=no
-    	output_verbose_link_cmd='echo'
-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-    	  lt_int_apple_cc_single_mod=yes
-    	fi
-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-    	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-    	else
-        _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      fi
-      _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        else
-          _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        fi
-          _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=no
-      _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-      _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-    else
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-    fi
-      ;;
-
-    dgux*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    freebsd1*)
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      ;;
-
-    hpux10* | hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	case "$host_cpu" in
-	hppa*64*)
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-	  ;;
-	ia64*)
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-	  _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-	  ;;
-	*)
-	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-	  _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    newsos6)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    openbsd*)
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
-      else
-       case $host_os in
-	 openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
-	   _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	   ;;
-	 *)
-	   _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
-	   ;;
-       esac
-      fi
-      ;;
-
-    os2*)
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
-      else
-	_LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-      ;;
-
-    sco3.2v5*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
-      runpath_var=LD_RUN_PATH
-      hardcode_runpath_var=yes
-      ;;
-
-    solaris*)
-      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	_LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      case $host_os in
-      solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
-      esac
-      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_AC_TAGVAR(reload_cmds, $1)='$CC -r -o $output$reload_objs'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no
-        ;;
-	motorola)
-	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  _LT_AC_TAGVAR(hardcode_direct, $1)=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv4.3*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	_LT_AC_TAGVAR(ld_shlibs, $1)=yes
-      fi
-      ;;
-
-    sysv4.2uw2*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
-      _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      hardcode_runpath_var=yes
-      runpath_var=LD_RUN_PATH
-      ;;
-
-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
-      _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
-      if test "$GCC" = yes; then
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	_LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      runpath_var='LD_RUN_PATH'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    sysv5*)
-      _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
-      # $CC -shared without GNU ld will not create a library from C++
-      # object files and a static libstdc++, better avoid it by now
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      runpath_var='LD_RUN_PATH'
-      ;;
-
-    uts4*)
-      _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-      _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-      ;;
-
-    *)
-      _LT_AC_TAGVAR(ld_shlibs, $1)=no
-      ;;
-    esac
-  fi
-])
-AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)" in
-x|xyes)
-  # Assume -lc should be added
-  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $_LT_AC_TAGVAR(archive_cmds, $1) in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
-      $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$_LT_AC_TAGVAR(allow_undefined_flag, $1)
-        _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-        if AC_TRY_EVAL(_LT_AC_TAGVAR(archive_cmds, $1) 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1)
-        then
-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
-        else
-	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
-        fi
-        _LT_AC_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      AC_MSG_RESULT([$_LT_AC_TAGVAR(archive_cmds_need_lc, $1)])
-      ;;
-    esac
-  fi
-  ;;
-esac
-])# AC_LIBTOOL_PROG_LD_SHLIBS
-
-
-# _LT_AC_FILE_LTDLL_C
-# -------------------
-# Be careful that the start marker always follows a newline.
-AC_DEFUN([_LT_AC_FILE_LTDLL_C], [
-# /* ltdll.c starts here */
-# #define WIN32_LEAN_AND_MEAN
-# #include <windows.h>
-# #undef WIN32_LEAN_AND_MEAN
-# #include <stdio.h>
-#
-# #ifndef __CYGWIN__
-# #  ifdef __CYGWIN32__
-# #    define __CYGWIN__ __CYGWIN32__
-# #  endif
-# #endif
-#
-# #ifdef __cplusplus
-# extern "C" {
-# #endif
-# BOOL APIENTRY DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved);
-# #ifdef __cplusplus
-# }
-# #endif
-#
-# #ifdef __CYGWIN__
-# #include <cygwin/cygwin_dll.h>
-# DECLARE_CYGWIN_DLL( DllMain );
-# #endif
-# HINSTANCE __hDllInstance_base;
-#
-# BOOL APIENTRY
-# DllMain (HINSTANCE hInst, DWORD reason, LPVOID reserved)
-# {
-#   __hDllInstance_base = hInst;
-#   return TRUE;
-# }
-# /* ltdll.c ends here */
-])# _LT_AC_FILE_LTDLL_C
-
-
-# _LT_AC_TAGVAR(VARNAME, [TAGNAME])
-# ---------------------------------
-AC_DEFUN([_LT_AC_TAGVAR], [ifelse([$2], [], [$1], [$1_$2])])
-
-
-# old names
-AC_DEFUN([AM_PROG_LIBTOOL],   [AC_PROG_LIBTOOL])
-AC_DEFUN([AM_ENABLE_SHARED],  [AC_ENABLE_SHARED($@)])
-AC_DEFUN([AM_ENABLE_STATIC],  [AC_ENABLE_STATIC($@)])
-AC_DEFUN([AM_DISABLE_SHARED], [AC_DISABLE_SHARED($@)])
-AC_DEFUN([AM_DISABLE_STATIC], [AC_DISABLE_STATIC($@)])
-AC_DEFUN([AM_PROG_LD],        [AC_PROG_LD])
-AC_DEFUN([AM_PROG_NM],        [AC_PROG_NM])
-
-# This is just to silence aclocal about the macro not being used
-ifelse([AC_DISABLE_FAST_INSTALL])
-
-AC_DEFUN([LT_AC_PROG_GCJ],
-[AC_CHECK_TOOL(GCJ, gcj, no)
-  test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
-  AC_SUBST(GCJFLAGS)
-])
-
-AC_DEFUN([LT_AC_PROG_RC],
-[AC_CHECK_TOOL(RC, windres, no)
-])
-
-# NOTE: This macro has been submitted for inclusion into   #
-#  GNU Autoconf as AC_PROG_SED.  When it is available in   #
-#  a released version of Autoconf we should remove this    #
-#  macro and use it instead.                               #
-# LT_AC_PROG_SED
-# --------------
-# Check for a fully-functional sed program, that truncates
-# as few characters as possible.  Prefer GNU sed if found.
-AC_DEFUN([LT_AC_PROG_SED],
-[AC_MSG_CHECKING([for a sed that does not truncate output])
-AC_CACHE_VAL(lt_cv_path_SED,
-[# Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for lt_ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-      fi
-    done
-  done
-done
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && break
-  cat /dev/null > conftest.in
-  lt_ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-  # Check for GNU sed and select it if it is found.
-  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-    lt_cv_path_SED=$lt_ac_sed
-    break
-  fi
-  while true; do
-    cat conftest.in conftest.in >conftest.tmp
-    mv conftest.tmp conftest.in
-    cp conftest.in conftest.nl
-    echo >>conftest.nl
-    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-    cmp -s conftest.out conftest.nl || break
-    # 10000 chars as input seems more than enough
-    test $lt_ac_count -gt 10 && break
-    lt_ac_count=`expr $lt_ac_count + 1`
-    if test $lt_ac_count -gt $lt_ac_max; then
-      lt_ac_max=$lt_ac_count
-      lt_cv_path_SED=$lt_ac_sed
-    fi
-  done
-done
-SED=$lt_cv_path_SED
-])
-AC_MSG_RESULT([$SED])
-])
-
-# pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-# 
-# Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# PKG_PROG_PKG_CONFIG([MIN-VERSION])
-# ----------------------------------
-AC_DEFUN([PKG_PROG_PKG_CONFIG],
-[m4_pattern_forbid([^_?PKG_[A-Z_]+$])
-m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
-AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_ifval([$1], [$1], [0.9.0])
-	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		PKG_CONFIG=""
-	fi
-		
-fi[]dnl
-])# PKG_PROG_PKG_CONFIG
-
-# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND])
-#
-# Check to see whether a particular set of modules exists.  Similar
-# to PKG_CHECK_MODULES(), but does not set variables or print errors.
-#
-#
-# Similar to PKG_CHECK_MODULES, make sure that the first instance of
-# this or PKG_CHECK_MODULES is called, or make sure to call
-# PKG_CHECK_EXISTS manually
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_EXISTS],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-if test -n "$PKG_CONFIG" && \
-    AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then
-  m4_ifval([$2], [$2], [:])
-m4_ifvaln([$3], [else
-  $3])dnl
-fi])
-
-
-# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES])
-# ---------------------------------------------
-m4_define([_PKG_CONFIG],
-[if test -n "$PKG_CONFIG"; then
-        PKG_CHECK_EXISTS([$3],
-                         [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-			 [pkg_failed=yes])
-else
-	pkg_failed=untried
-fi[]dnl
-])# _PKG_CONFIG
-
-# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND],
-# [ACTION-IF-NOT-FOUND])
-#
-#
-# Note that if there is a possibility the first call to
-# PKG_CHECK_MODULES might not happen, you should be sure to include an
-# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac
-#
-#
-# --------------------------------------------------------------
-AC_DEFUN([PKG_CHECK_MODULES],
-[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl
-AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl
-AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl
-
-pkg_failed=no
-AC_MSG_CHECKING([for $1])
-
-_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2])
-_PKG_CONFIG([$1][_LIBS], [libs], [$2])
-
-if test $pkg_failed = yes; then
-	$1[]_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"`
-	# Put the nasty error message in config.log where it belongs
-	echo "$$1[]_PKG_ERRORS" 1>&AS_MESSAGE_LOG_FD
-
-	ifelse([$4], , [AC_MSG_ERROR(dnl
-[Package requirements ($2) were not met.
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables
-to avoid the need to call pkg-config.  See the pkg-config man page for
-more details.])],
-		[$4])
-elif test $pkg_failed = untried; then
-	ifelse([$4], , [AC_MSG_FAILURE(dnl
-[The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively you may set the $1_CFLAGS and $1_LIBS environment variables
-to avoid the need to call pkg-config.  See the pkg-config man page for
-more details.
-
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.])],
-		[$4])
-else
-	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
-        AC_MSG_RESULT([yes])
-	ifelse([$3], , :, [$3])
-fi[]dnl
-])# PKG_CHECK_MODULES
-
-# Copyright (C) 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_AUTOMAKE_VERSION(VERSION)
-# ----------------------------
-# Automake X.Y traces this macro to ensure aclocal.m4 has been
-# generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.9"])
-
-# AM_SET_CURRENT_AUTOMAKE_VERSION
-# -------------------------------
-# Call AM_AUTOMAKE_VERSION so it can be traced.
-# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
-AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.9.5])])
-
-# AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
-# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
-#
-# Of course, Automake must honor this variable whenever it calls a
-# tool from the auxiliary directory.  The problem is that $srcdir (and
-# therefore $ac_aux_dir as well) can be either absolute or relative,
-# depending on how configure is run.  This is pretty annoying, since
-# it makes $ac_aux_dir quite unusable in subdirectories: in the top
-# source directory, any form will work fine, but in subdirectories a
-# relative path needs to be adjusted first.
-#
-# $ac_aux_dir/missing
-#    fails when called from a subdirectory if $ac_aux_dir is relative
-# $top_srcdir/$ac_aux_dir/missing
-#    fails if $ac_aux_dir is absolute,
-#    fails when called from a subdirectory in a VPATH build with
-#          a relative $ac_aux_dir
-#
-# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
-# are both prefixed by $srcdir.  In an in-source build this is usually
-# harmless because $srcdir is `.', but things will broke when you
-# start a VPATH build or use an absolute $srcdir.
-#
-# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
-# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
-#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
-# and then we would define $MISSING as
-#   MISSING="\${SHELL} $am_aux_dir/missing"
-# This will work as long as MISSING is not called from configure, because
-# unfortunately $(top_srcdir) has no meaning in configure.
-# However there are other variables, like CC, which are often used in
-# configure, and could therefore not use this "fixed" $ac_aux_dir.
-#
-# Another solution, used here, is to always expand $ac_aux_dir to an
-# absolute PATH.  The drawback is that using absolute paths prevent a
-# configured tree to be moved without reconfiguration.
-
-AC_DEFUN([AM_AUX_DIR_EXPAND],
-[dnl Rely on autoconf to set up CDPATH properly.
-AC_PREREQ([2.50])dnl
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-])
-
-# AM_CONDITIONAL                                            -*- Autoconf -*-
-
-# Copyright (C) 1997, 2000, 2001, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 7
-
-# AM_CONDITIONAL(NAME, SHELL-CONDITION)
-# -------------------------------------
-# Define a conditional.
-AC_DEFUN([AM_CONDITIONAL],
-[AC_PREREQ(2.52)dnl
- ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
-	[$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
-AC_SUBST([$1_TRUE])
-AC_SUBST([$1_FALSE])
-if $2; then
-  $1_TRUE=
-  $1_FALSE='#'
-else
-  $1_TRUE='#'
-  $1_FALSE=
-fi
-AC_CONFIG_COMMANDS_PRE(
-[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([[conditional "$1" was never defined.
-Usually this means the macro was only invoked conditionally.]])
-fi])])
-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 8
-
-# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
-# written in clear, in which case automake, when reading aclocal.m4,
-# will think it sees a *use*, and therefore will trigger all it's
-# C support machinery.  Also note that it means that autoscan, seeing
-# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
-# _AM_DEPENDENCIES(NAME)
-# ----------------------
-# See how the compiler implements dependency checking.
-# NAME is "CC", "CXX", "GCJ", or "OBJC".
-# We try a few techniques and use that to set a single cache variable.
-#
-# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
-# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
-# dependency, and given that the user is not expected to run this macro,
-# just rely on AC_PROG_CC.
-AC_DEFUN([_AM_DEPENDENCIES],
-[AC_REQUIRE([AM_SET_DEPDIR])dnl
-AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
-AC_REQUIRE([AM_MAKE_INCLUDE])dnl
-AC_REQUIRE([AM_DEP_TRACK])dnl
-
-ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
-       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
-       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
-       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
-                   [depcc="$$1"   am_compiler_list=])
-
-AC_CACHE_CHECK([dependency style of $depcc],
-               [am_cv_$1_dependencies_compiler_type],
-[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_$1_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_$1_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_$1_dependencies_compiler_type=none
-fi
-])
-AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
-])
-
-
-# AM_SET_DEPDIR
-# -------------
-# Choose a directory name for dependency files.
-# This macro is AC_REQUIREd in _AM_DEPENDENCIES
-AC_DEFUN([AM_SET_DEPDIR],
-[AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl
-])
-
-
-# AM_DEP_TRACK
-# ------------
-AC_DEFUN([AM_DEP_TRACK],
-[AC_ARG_ENABLE(dependency-tracking,
-[  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors])
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
-AC_SUBST([AMDEPBACKSLASH])
-])
-
-# Generate code to set up dependency tracking.              -*- Autoconf -*-
-
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-#serial 3
-
-# _AM_OUTPUT_DEPENDENCY_COMMANDS
-# ------------------------------
-AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
-[for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-    dirpart=`AS_DIRNAME("$mf")`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`AS_DIRNAME(["$file"])`
-    AS_MKDIR_P([$dirpart/$fdir])
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
-])# _AM_OUTPUT_DEPENDENCY_COMMANDS
-
-
-# AM_OUTPUT_DEPENDENCY_COMMANDS
-# -----------------------------
-# This macro should only be invoked once -- use via AC_REQUIRE.
-#
-# This code is only required when automatic dependency tracking
-# is enabled.  FIXME.  This creates each `.P' file that we will
-# need in order to bootstrap the dependency handling code.
-AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
-[AC_CONFIG_COMMANDS([depfiles],
-     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
-     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
-])
-
-# Do all the work for Automake.                             -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 12
-
-# This macro actually does too much.  Some checks are only needed if
-# your package does certain things.  But this isn't really a big deal.
-
-# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
-# AM_INIT_AUTOMAKE([OPTIONS])
-# -----------------------------------------------
-# The call with PACKAGE and VERSION arguments is the old style
-# call (pre autoconf-2.50), which is being phased out.  PACKAGE
-# and VERSION should now be passed to AC_INIT and removed from
-# the call to AM_INIT_AUTOMAKE.
-# We support both call styles for the transition.  After
-# the next Automake release, Autoconf can make the AC_INIT
-# arguments mandatory, and then we can depend on a new Autoconf
-# release and drop the old call support.
-AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_PREREQ([2.58])dnl
-dnl Autoconf wants to disallow AM_ names.  We explicitly allow
-dnl the ones we care about.
-m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
-AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
-AC_REQUIRE([AC_PROG_INSTALL])dnl
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
-
-# Define the identity of the package.
-dnl Distinguish between old-style and new-style calls.
-m4_ifval([$2],
-[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
- AC_SUBST([PACKAGE], [$1])dnl
- AC_SUBST([VERSION], [$2])],
-[_AM_SET_OPTIONS([$1])dnl
- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl
- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl
-
-_AM_IF_OPTION([no-define],,
-[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
-
-# Some tools Automake needs.
-AC_REQUIRE([AM_SANITY_CHECK])dnl
-AC_REQUIRE([AC_ARG_PROGRAM])dnl
-AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
-AM_MISSING_PROG(AUTOCONF, autoconf)
-AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
-AM_MISSING_PROG(AUTOHEADER, autoheader)
-AM_MISSING_PROG(MAKEINFO, makeinfo)
-AM_PROG_INSTALL_SH
-AM_PROG_INSTALL_STRIP
-AC_REQUIRE([AM_PROG_MKDIR_P])dnl
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-AC_REQUIRE([AC_PROG_AWK])dnl
-AC_REQUIRE([AC_PROG_MAKE_SET])dnl
-AC_REQUIRE([AM_SET_LEADING_DOT])dnl
-_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])],
-              [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])],
-	      		     [_AM_PROG_TAR([v7])])])
-_AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
-                  [_AM_DEPENDENCIES(CC)],
-                  [define([AC_PROG_CC],
-                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
-                  [_AM_DEPENDENCIES(CXX)],
-                  [define([AC_PROG_CXX],
-                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
-])
-])
-
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[# Compute $1's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $1 | $1:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_SH
-# ------------------
-# Define $install_sh.
-AC_DEFUN([AM_PROG_INSTALL_SH],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-AC_SUBST(install_sh)])
-
-# Copyright (C) 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# Check whether the underlying file-system supports filenames
-# with a leading dot.  For instance MS-DOS doesn't.
-AC_DEFUN([AM_SET_LEADING_DOT],
-[rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-AC_SUBST([am__leading_dot])])
-
-# Add --enable-maintainer-mode option to configure.         -*- Autoconf -*-
-# From Jim Meyering
-
-# Copyright (C) 1996, 1998, 2000, 2001, 2002, 2003, 2004, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-AC_DEFUN([AM_MAINTAINER_MODE],
-[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles])
-  dnl maintainer-mode is disabled by default
-  AC_ARG_ENABLE(maintainer-mode,
-[  --enable-maintainer-mode  enable make rules and dependencies not useful
-			  (and sometimes confusing) to the casual installer],
-      USE_MAINTAINER_MODE=$enableval,
-      USE_MAINTAINER_MODE=no)
-  AC_MSG_RESULT([$USE_MAINTAINER_MODE])
-  AM_CONDITIONAL(MAINTAINER_MODE, [test $USE_MAINTAINER_MODE = yes])
-  MAINT=$MAINTAINER_MODE_TRUE
-  AC_SUBST(MAINT)dnl
-]
-)
-
-AU_DEFUN([jm_MAINTAINER_MODE], [AM_MAINTAINER_MODE])
-
-# Check to see how 'make' treats includes.	            -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# AM_MAKE_INCLUDE()
-# -----------------
-# Check to see how make treats includes.
-AC_DEFUN([AM_MAKE_INCLUDE],
-[am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-AC_MSG_CHECKING([for style of include used by $am_make])
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-AC_SUBST([am__include])
-AC_SUBST([am__quote])
-AC_MSG_RESULT([$_am_result])
-rm -f confinc confmf
-])
-
-# Fake the existence of programs that GNU maintainers use.  -*- Autoconf -*-
-
-# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# AM_MISSING_PROG(NAME, PROGRAM)
-# ------------------------------
-AC_DEFUN([AM_MISSING_PROG],
-[AC_REQUIRE([AM_MISSING_HAS_RUN])
-$1=${$1-"${am_missing_run}$2"}
-AC_SUBST($1)])
-
-
-# AM_MISSING_HAS_RUN
-# ------------------
-# Define MISSING if not defined so far and test if it supports --run.
-# If it does, set am_missing_run to use it, otherwise, to nothing.
-AC_DEFUN([AM_MISSING_HAS_RUN],
-[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  AC_MSG_WARN([`missing' script is too old or missing])
-fi
-])
-
-# Copyright (C) 2003, 2004, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_MKDIR_P
-# ---------------
-# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise.
-#
-# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories
-# created by `make install' are always world readable, even if the
-# installer happens to have an overly restrictive umask (e.g. 077).
-# This was a mistake.  There are at least two reasons why we must not
-# use `-m 0755':
-#   - it causes special bits like SGID to be ignored,
-#   - it may be too restrictive (some setups expect 775 directories).
-#
-# Do not use -m 0755 and let people choose whatever they expect by
-# setting umask.
-#
-# We cannot accept any implementation of `mkdir' that recognizes `-p'.
-# Some implementations (such as Solaris 8's) are not thread-safe: if a
-# parallel make tries to run `mkdir -p a/b' and `mkdir -p a/c'
-# concurrently, both version can detect that a/ is missing, but only
-# one can create it and the other will error out.  Consequently we
-# restrict ourselves to GNU make (using the --version option ensures
-# this.)
-AC_DEFUN([AM_PROG_MKDIR_P],
-[if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(install_sh) -d'
-  fi
-fi
-AC_SUBST([mkdir_p])])
-
-# Helper functions for option handling.                     -*- Autoconf -*-
-
-# Copyright (C) 2001, 2002, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 3
-
-# _AM_MANGLE_OPTION(NAME)
-# -----------------------
-AC_DEFUN([_AM_MANGLE_OPTION],
-[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
-
-# _AM_SET_OPTION(NAME)
-# ------------------------------
-# Set option NAME.  Presently that only means defining a flag for this option.
-AC_DEFUN([_AM_SET_OPTION],
-[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
-
-# _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
-# OPTIONS is a space-separated list of Automake options.
-AC_DEFUN([_AM_SET_OPTIONS],
-[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
-
-# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
-# -------------------------------------------
-# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
-AC_DEFUN([_AM_IF_OPTION],
-[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
-
-# Check to make sure that the build environment is sane.    -*- Autoconf -*-
-
-# Copyright (C) 1996, 1997, 2000, 2001, 2003, 2005
-# Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 4
-
-# AM_SANITY_CHECK
-# ---------------
-AC_DEFUN([AM_SANITY_CHECK],
-[AC_MSG_CHECKING([whether build environment is sane])
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$[*]" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$[*]" != "X $srcdir/configure conftest.file" \
-      && test "$[*]" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      AC_MSG_ERROR([ls -t appears to fail.  Make sure there is not a broken
-alias in your environment])
-   fi
-
-   test "$[2]" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   AC_MSG_ERROR([newly created file is older than distributed files!
-Check your system clock])
-fi
-AC_MSG_RESULT(yes)])
-
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# AM_PROG_INSTALL_STRIP
-# ---------------------
-# One issue with vendor `install' (even GNU) is that you can't
-# specify the program used to strip binaries.  This is especially
-# annoying in cross-compiling environments, where the build's strip
-# is unlikely to handle the host's binaries.
-# Fortunately install-sh will honor a STRIPPROG variable, so we
-# always use install-sh in `make install-strip', and initialize
-# STRIPPROG with the value of the STRIP variable (set by the user).
-AC_DEFUN([AM_PROG_INSTALL_STRIP],
-[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
-if test "$cross_compiling" != no; then
-  AC_CHECK_TOOL([STRIP], [strip], :)
-fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-AC_SUBST([INSTALL_STRIP_PROGRAM])])
-
-# Check how to create a tarball.                            -*- Autoconf -*-
-
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
-#
-# This file is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# serial 2
-
-# _AM_PROG_TAR(FORMAT)
-# --------------------
-# Check how to create a tarball in format FORMAT.
-# FORMAT should be one of `v7', `ustar', or `pax'.
-#
-# Substitute a variable $(am__tar) that is a command
-# writing to stdout a FORMAT-tarball containing the directory
-# $tardir.
-#     tardir=directory && $(am__tar) > result.tar
-#
-# Substitute a variable $(am__untar) that extract such
-# a tarball read from stdin.
-#     $(am__untar) < result.tar
-AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
-m4_if([$1], [v7],
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
-     [m4_case([$1], [ustar],, [pax],,
-              [m4_fatal([Unknown tar format])])
-AC_MSG_CHECKING([how to create a $1 tar archive])
-# Loop over all known methods to create a tar archive until one works.
-_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none'
-_am_tools=${am_cv_prog_tar_$1-$_am_tools}
-# Do not fold the above two line into one, because Tru64 sh and
-# Solaris sh will not grok spaces in the rhs of `-'.
-for _am_tool in $_am_tools
-do
-  case $_am_tool in
-  gnutar)
-    for _am_tar in tar gnutar gtar;
-    do
-      AM_RUN_LOG([$_am_tar --version]) && break
-    done
-    am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"'
-    am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"'
-    am__untar="$_am_tar -xf -"
-    ;;
-  plaintar)
-    # Must skip GNU tar: if it does not support --format= it doesn't create
-    # ustar tarball either.
-    (tar --version) >/dev/null 2>&1 && continue
-    am__tar='tar chf - "$$tardir"'
-    am__tar_='tar chf - "$tardir"'
-    am__untar='tar xf -'
-    ;;
-  pax)
-    am__tar='pax -L -x $1 -w "$$tardir"'
-    am__tar_='pax -L -x $1 -w "$tardir"'
-    am__untar='pax -r'
-    ;;
-  cpio)
-    am__tar='find "$$tardir" -print | cpio -o -H $1 -L'
-    am__tar_='find "$tardir" -print | cpio -o -H $1 -L'
-    am__untar='cpio -i -H $1 -d'
-    ;;
-  none)
-    am__tar=false
-    am__tar_=false
-    am__untar=false
-    ;;
-  esac
-
-  # If the value was cached, stop now.  We just wanted to have am__tar
-  # and am__untar set.
-  test -n "${am_cv_prog_tar_$1}" && break
-
-  # tar/untar a dummy directory, and stop if the command works
-  rm -rf conftest.dir
-  mkdir conftest.dir
-  echo GrepMe > conftest.dir/file
-  AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar])
-  rm -rf conftest.dir
-  if test -s conftest.tar; then
-    AM_RUN_LOG([$am__untar <conftest.tar])
-    grep GrepMe conftest.dir/file >/dev/null 2>&1 && break
-  fi
-done
-rm -rf conftest.dir
-
-AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool])
-AC_MSG_RESULT([$am_cv_prog_tar_$1])])
-AC_SUBST([am__tar])
-AC_SUBST([am__untar])
-]) # _AM_PROG_TAR
-
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/config.guess b/abs/mv-core/ghosd/ghosd-0.0.1/config.guess
deleted file mode 100755
index 45bee13..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/config.guess
+++ /dev/null
@@ -1,1465 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-
-timestamp='2005-04-22'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-	        os=netbsd
-		;;
-	esac
-	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
-	    Debian*)
-		release='-gnu'
-		;;
-	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-		;;
-	esac
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit 0 ;;
-    amd64:OpenBSD:*:*)
-	echo x86_64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    amiga:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    cats:OpenBSD:*:*)
-	echo arm-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    hp300:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    luna88k:OpenBSD:*:*)
-    	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mac68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    macppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme68k:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvme88k:OpenBSD:*:*)
-	echo m88k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    mvmeppc:OpenBSD:*:*)
-	echo powerpc-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sgi:OpenBSD:*:*)
-	echo mips64-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    sun3:OpenBSD:*:*)
-	echo m68k-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    *:OpenBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-openbsd${UNAME_RELEASE}
-	exit 0 ;;
-    *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit 0 ;;
-    macppc:MirBSD:*:*)
-	echo powerppc-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
-    *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit 0 ;;
-    alpha:OSF1:*:*)
-	case $UNAME_RELEASE in
-	*4.0)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-		;;
-	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-		;;
-	esac
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-	# covers most systems running today.  This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
-	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
-	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
-	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
-	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
-	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
-	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
-	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
-	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
-	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
-	esac
-	# A Pn.n version is a patched version.
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit 0 ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit 0 ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit 0 ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit 0;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit 0 ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit 0 ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit 0 ;;
-    *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit 0 ;;
-    *:OS400:*:*)
-        echo powerpc-ibm-os400
-	exit 0 ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit 0;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit 0;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit 0 ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit 0 ;;
-    DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit 0 ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7 && exit 0 ;;
-	esac ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    i86pc:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit 0 ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit 0 ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit 0 ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-        exit 0 ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit 0 ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit 0 ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit 0 ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit 0 ;;
-    m68k:machten:*:*)
-	echo m68k-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit 0 ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit 0 ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit 0 ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit 0 ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c \
-	  && $dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-	  && exit 0
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit 0 ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit 0 ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit 0 ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit 0 ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit 0 ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit 0 ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit 0 ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
- 	exit 0 ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit 0 ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit 0 ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit 0 ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit 0 ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit 0 ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix      # uname -m gives an 8 hex-code CPU id
-	exit 0 ;;              # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit 0 ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit 0 ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-		echo rs6000-ibm-aix3.2.5
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit 0 ;;
-    *:AIX:*:[45])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit 0 ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit 0 ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit 0 ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit 0 ;;                           # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit 0 ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit 0 ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit 0 ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit 0 ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
-
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
-EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    test -z "$HP_ARCH" && HP_ARCH=hppa
-		fi ;;
-	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
-	then
-	    # avoid double evaluation of $set_cc_for_build
-	    test -n "$CC_FOR_BUILD" || eval $set_cc_for_build
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E -) | grep __LP64__ >/dev/null
-	    then
-		HP_ARCH="hppa2.0w"
-	    else
-		HP_ARCH="hppa64"
-	    fi
-	fi
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit 0 ;;
-    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && $dummy && exit 0
-	echo unknown-hitachi-hiuxwe2
-	exit 0 ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit 0 ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit 0 ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit 0 ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit 0 ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit 0 ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit 0 ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit 0 ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-        exit 0 ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-        exit 0 ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-        exit 0 ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-        exit 0 ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-        exit 0 ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    *:UNICOS/mp:*:*)
-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit 0 ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit 0 ;;
-    5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit 0 ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit 0 ;;
-    *:FreeBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit 0 ;;
-    i*:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit 0 ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit 0 ;;
-    x86:Interix*:[34]*)
-	echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
-	exit 0 ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit 0 ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit 0 ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit 0 ;;
-    amd64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
-	exit 0 ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit 0 ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit 0 ;;
-    *:GNU:*:*)
-	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit 0 ;;
-    *:GNU/*:*:*)
-	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit 0 ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit 0 ;;
-    arm*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    cris:Linux:*:*)
-	echo cris-axis-linux-gnu
-	exit 0 ;;
-    crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
-	exit 0 ;;
-    frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
-	exit 0 ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-	;;
-    mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips64
-	#undef mips64el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
-	test x"${CPU}" != x && echo "${CPU}-unknown-linux-gnu" && exit 0
-	;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit 0 ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit 0 ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit 0 ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
-	esac
-	exit 0 ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit 0 ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit 0 ;;
-    sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit 0 ;;
-    x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
-	exit 0 ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit 0 ;;
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit 0 ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit 0 ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#ifdef __INTEL_COMPILER
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
-	test x"${LIBC}" != x && echo "${UNAME_MACHINE}-pc-linux-${LIBC}" && exit 0
-	test x"${TENTATIVE}" != x && echo "${TENTATIVE}" && exit 0
-	;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit 0 ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit 0 ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit 0 ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit 0 ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit 0 ;;
-	i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	exit 0 ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit 0 ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit 0 ;;
-    i*86:*:5:[78]*)
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit 0 ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit 0 ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
-        exit 0 ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit 0 ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit 0 ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit 0 ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit 0 ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit 0 ;;
-    M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit 0 ;;
-    M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && echo i486-ncr-sysv4.3${OS_REL} && exit 0
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && echo i486-ncr-sysv4 && exit 0 ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit 0 ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit 0 ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit 0 ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit 0 ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit 0 ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit 0 ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit 0 ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit 0 ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit 0 ;;
-    i*86:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo ${UNAME_MACHINE}-stratus-vos
-	exit 0 ;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit 0 ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit 0 ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit 0 ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
-	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-        exit 0 ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit 0 ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit 0 ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit 0 ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit 0 ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit 0 ;;
-    *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    *86) UNAME_PROCESSOR=i686 ;;
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit 0 ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
-	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit 0 ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit 0 ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit 0 ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit 0 ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit 0 ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit 0 ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit 0 ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit 0 ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit 0 ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit 0 ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit 0 ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit 0 ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit 0 ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit 0 ;;
-    SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
-	exit 0 ;;
-    *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit 0 ;;
-    *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms && exit 0 ;;
-	    I*) echo ia64-dec-vms && exit 0 ;;
-	    V*) echo vax-dec-vms && exit 0 ;;
-	esac ;;
-    *:XENIX:*:SysV)
-	echo i386-pc-xenix
-	exit 0 ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-          "4"
-#else
-	  ""
-#endif
-         ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && $dummy && exit 0
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit 0; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit 0 ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit 0 ;;
-    c34*)
-	echo c34-convex-bsd
-	exit 0 ;;
-    c38*)
-	echo c38-convex-bsd
-	exit 0 ;;
-    c4*)
-	echo c4-convex-bsd
-	exit 0 ;;
-    esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.guess
-and
-  http://savannah.gnu.org/cgi-bin/viewcvs/*checkout*/config/config/config.sub
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/config.h b/abs/mv-core/ghosd/ghosd-0.0.1/config.h
deleted file mode 100644
index 3011a45..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/config.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* config.h.  Generated by configure.  */
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* we have pangocairo */
-#define HAVE_PANGO 
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Name of package */
-#define PACKAGE "ghosd"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "martine@danga.com"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "ghosd"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "ghosd 0.0.1"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "ghosd"
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "0.0.1"
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Version number of package */
-#define VERSION "0.0.1"
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/config.h.in b/abs/mv-core/ghosd/ghosd-0.0.1/config.h.in
deleted file mode 100644
index 6ba4f00..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/config.h.in
+++ /dev/null
@@ -1,58 +0,0 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* we have pangocairo */
-#undef HAVE_PANGO
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/config.log b/abs/mv-core/ghosd/ghosd-0.0.1/config.log
deleted file mode 100644
index 65c685e..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/config.log
+++ /dev/null
@@ -1,965 +0,0 @@
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by ghosd configure 0.0.1, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  $ ./configure 
-
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = supertower.lan
-uname -m = i686
-uname -r = 2.6.22-ARCH
-uname -s = Linux
-uname -v = #1 SMP PREEMPT Thu Sep 20 19:43:47 CEST 2007
-
-/usr/bin/uname -p = unknown
-/bin/uname -X     = unknown
-
-/bin/arch              = i686
-/usr/bin/arch -k       = unknown
-/usr/convex/getsysinfo = unknown
-hostinfo               = unknown
-/bin/machine           = unknown
-/usr/bin/oslevel       = unknown
-/bin/universe          = unknown
-
-PATH: /bin
-PATH: /usr/bin
-PATH: /sbin
-PATH: /usr/sbin
-PATH: /usr/X11R6/bin
-PATH: /opt/bin
-PATH: /usr/local/bin
-PATH: /opt/e17/bin
-PATH: /opt/kde/bin
-PATH: /opt/qt/bin
-PATH: /data/local/jams/bin
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-configure:1587: checking for a BSD-compatible install
-configure:1642: result: /bin/install -c
-configure:1653: checking whether build environment is sane
-configure:1696: result: yes
-configure:1761: checking for gawk
-configure:1777: found /bin/gawk
-configure:1787: result: gawk
-configure:1797: checking whether make sets $(MAKE)
-configure:1817: result: yes
-configure:1995: checking whether to enable maintainer-specific portions of Makefiles
-configure:2004: result: no
-configure:2066: checking for gcc
-configure:2082: found /usr/bin/gcc
-configure:2092: result: gcc
-configure:2336: checking for C compiler version
-configure:2339: gcc --version </dev/null >&5
-gcc (GCC) 4.2.1
-Copyright (C) 2007 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-configure:2342: $? = 0
-configure:2344: gcc -v </dev/null >&5
-Using built-in specs.
-Target: i686-pc-linux-gnu
-Configured with: ../configure --prefix=/usr --enable-shared --enable-languages=c,c++ --enable-threads=posix --enable-__cxa_atexit --disable-multilib --libdir=/usr/lib --libexecdir=/usr/lib --enable-clocale=gnu --disable-libstdcxx-pch --with-tune=generic
-Thread model: posix
-gcc version 4.2.1
-configure:2347: $? = 0
-configure:2349: gcc -V </dev/null >&5
-gcc: '-V' option must have argument
-configure:2352: $? = 1
-configure:2375: checking for C compiler default output file name
-configure:2378: gcc    conftest.c  >&5
-configure:2381: $? = 0
-configure:2427: result: a.out
-configure:2432: checking whether the C compiler works
-configure:2438: ./a.out
-configure:2441: $? = 0
-configure:2458: result: yes
-configure:2465: checking whether we are cross compiling
-configure:2467: result: no
-configure:2470: checking for suffix of executables
-configure:2472: gcc -o conftest    conftest.c  >&5
-configure:2475: $? = 0
-configure:2500: result: 
-configure:2506: checking for suffix of object files
-configure:2527: gcc -c   conftest.c >&5
-configure:2530: $? = 0
-configure:2552: result: o
-configure:2556: checking whether we are using the GNU C compiler
-configure:2580: gcc -c   conftest.c >&5
-configure:2586: $? = 0
-configure:2589: test -z 			 || test ! -s conftest.err
-configure:2592: $? = 0
-configure:2595: test -s conftest.o
-configure:2598: $? = 0
-configure:2611: result: yes
-configure:2617: checking whether gcc accepts -g
-configure:2638: gcc -c -g  conftest.c >&5
-configure:2644: $? = 0
-configure:2647: test -z 			 || test ! -s conftest.err
-configure:2650: $? = 0
-configure:2653: test -s conftest.o
-configure:2656: $? = 0
-configure:2667: result: yes
-configure:2684: checking for gcc option to accept ANSI C
-configure:2754: gcc  -c -g -O2  conftest.c >&5
-configure:2760: $? = 0
-configure:2763: test -z 			 || test ! -s conftest.err
-configure:2766: $? = 0
-configure:2769: test -s conftest.o
-configure:2772: $? = 0
-configure:2790: result: none needed
-configure:2808: gcc -c -g -O2  conftest.c >&5
-conftest.c:2: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'me'
-configure:2814: $? = 1
-configure: failed program was:
-| #ifndef __cplusplus
-|   choke me
-| #endif
-configure:2955: checking for style of include used by make
-configure:2983: result: GNU
-configure:3011: checking dependency style of gcc
-configure:3101: result: gcc3
-configure:3196: checking build system type
-configure:3214: result: i686-pc-linux-gnu
-configure:3222: checking host system type
-configure:3236: result: i686-pc-linux-gnu
-configure:3244: checking for a sed that does not truncate output
-configure:3298: result: /bin/sed
-configure:3301: checking for egrep
-configure:3311: result: grep -E
-configure:3327: checking for ld used by gcc
-configure:3394: result: /usr/bin/ld
-configure:3403: checking if the linker (/usr/bin/ld) is GNU ld
-configure:3418: result: yes
-configure:3423: checking for /usr/bin/ld option to reload object files
-configure:3430: result: -r
-configure:3439: checking for BSD-compatible nm
-configure:3481: result: /usr/bin/nm -B
-configure:3485: checking whether ln -s works
-configure:3489: result: yes
-configure:3496: checking how to recognise dependent libraries
-configure:3670: result: pass_all
-configure:3883: checking how to run the C preprocessor
-configure:3918: gcc -E  conftest.c
-configure:3924: $? = 0
-configure:3956: gcc -E  conftest.c
-conftest.c:11:28: error: ac_nonexistent.h: No such file or directory
-configure:3962: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "ghosd"
-| #define PACKAGE_TARNAME "ghosd"
-| #define PACKAGE_VERSION "0.0.1"
-| #define PACKAGE_STRING "ghosd 0.0.1"
-| #define PACKAGE_BUGREPORT "martine@danga.com"
-| #define PACKAGE "ghosd"
-| #define VERSION "0.0.1"
-| /* end confdefs.h.  */
-| #include <ac_nonexistent.h>
-configure:4001: result: gcc -E
-configure:4025: gcc -E  conftest.c
-configure:4031: $? = 0
-configure:4063: gcc -E  conftest.c
-conftest.c:11:28: error: ac_nonexistent.h: No such file or directory
-configure:4069: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "ghosd"
-| #define PACKAGE_TARNAME "ghosd"
-| #define PACKAGE_VERSION "0.0.1"
-| #define PACKAGE_STRING "ghosd 0.0.1"
-| #define PACKAGE_BUGREPORT "martine@danga.com"
-| #define PACKAGE "ghosd"
-| #define VERSION "0.0.1"
-| /* end confdefs.h.  */
-| #include <ac_nonexistent.h>
-configure:4113: checking for ANSI C header files
-configure:4138: gcc -c -g -O2  conftest.c >&5
-configure:4144: $? = 0
-configure:4147: test -z 			 || test ! -s conftest.err
-configure:4150: $? = 0
-configure:4153: test -s conftest.o
-configure:4156: $? = 0
-configure:4245: gcc -o conftest -g -O2   conftest.c  >&5
-conftest.c: In function 'main':
-conftest.c:28: warning: incompatible implicit declaration of built-in function 'exit'
-configure:4248: $? = 0
-configure:4250: ./conftest
-configure:4253: $? = 0
-configure:4268: result: yes
-configure:4292: checking for sys/types.h
-configure:4308: gcc -c -g -O2  conftest.c >&5
-configure:4314: $? = 0
-configure:4317: test -z 			 || test ! -s conftest.err
-configure:4320: $? = 0
-configure:4323: test -s conftest.o
-configure:4326: $? = 0
-configure:4337: result: yes
-configure:4292: checking for sys/stat.h
-configure:4308: gcc -c -g -O2  conftest.c >&5
-configure:4314: $? = 0
-configure:4317: test -z 			 || test ! -s conftest.err
-configure:4320: $? = 0
-configure:4323: test -s conftest.o
-configure:4326: $? = 0
-configure:4337: result: yes
-configure:4292: checking for stdlib.h
-configure:4308: gcc -c -g -O2  conftest.c >&5
-configure:4314: $? = 0
-configure:4317: test -z 			 || test ! -s conftest.err
-configure:4320: $? = 0
-configure:4323: test -s conftest.o
-configure:4326: $? = 0
-configure:4337: result: yes
-configure:4292: checking for string.h
-configure:4308: gcc -c -g -O2  conftest.c >&5
-configure:4314: $? = 0
-configure:4317: test -z 			 || test ! -s conftest.err
-configure:4320: $? = 0
-configure:4323: test -s conftest.o
-configure:4326: $? = 0
-configure:4337: result: yes
-configure:4292: checking for memory.h
-configure:4308: gcc -c -g -O2  conftest.c >&5
-configure:4314: $? = 0
-configure:4317: test -z 			 || test ! -s conftest.err
-configure:4320: $? = 0
-configure:4323: test -s conftest.o
-configure:4326: $? = 0
-configure:4337: result: yes
-configure:4292: checking for strings.h
-configure:4308: gcc -c -g -O2  conftest.c >&5
-configure:4314: $? = 0
-configure:4317: test -z 			 || test ! -s conftest.err
-configure:4320: $? = 0
-configure:4323: test -s conftest.o
-configure:4326: $? = 0
-configure:4337: result: yes
-configure:4292: checking for inttypes.h
-configure:4308: gcc -c -g -O2  conftest.c >&5
-configure:4314: $? = 0
-configure:4317: test -z 			 || test ! -s conftest.err
-configure:4320: $? = 0
-configure:4323: test -s conftest.o
-configure:4326: $? = 0
-configure:4337: result: yes
-configure:4292: checking for stdint.h
-configure:4308: gcc -c -g -O2  conftest.c >&5
-configure:4314: $? = 0
-configure:4317: test -z 			 || test ! -s conftest.err
-configure:4320: $? = 0
-configure:4323: test -s conftest.o
-configure:4326: $? = 0
-configure:4337: result: yes
-configure:4292: checking for unistd.h
-configure:4308: gcc -c -g -O2  conftest.c >&5
-configure:4314: $? = 0
-configure:4317: test -z 			 || test ! -s conftest.err
-configure:4320: $? = 0
-configure:4323: test -s conftest.o
-configure:4326: $? = 0
-configure:4337: result: yes
-configure:4363: checking dlfcn.h usability
-configure:4375: gcc -c -g -O2  conftest.c >&5
-configure:4381: $? = 0
-configure:4384: test -z 			 || test ! -s conftest.err
-configure:4387: $? = 0
-configure:4390: test -s conftest.o
-configure:4393: $? = 0
-configure:4403: result: yes
-configure:4407: checking dlfcn.h presence
-configure:4417: gcc -E  conftest.c
-configure:4423: $? = 0
-configure:4443: result: yes
-configure:4478: checking for dlfcn.h
-configure:4485: result: yes
-configure:4550: checking for g++
-configure:4566: found /usr/bin/g++
-configure:4576: result: g++
-configure:4592: checking for C++ compiler version
-configure:4595: g++ --version </dev/null >&5
-g++ (GCC) 4.2.1
-Copyright (C) 2007 Free Software Foundation, Inc.
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-
-configure:4598: $? = 0
-configure:4600: g++ -v </dev/null >&5
-Using built-in specs.
-Target: i686-pc-linux-gnu
-Configured with: ../configure --prefix=/usr --enable-shared --enable-languages=c,c++ --enable-threads=posix --enable-__cxa_atexit --disable-multilib --libdir=/usr/lib --libexecdir=/usr/lib --enable-clocale=gnu --disable-libstdcxx-pch --with-tune=generic
-Thread model: posix
-gcc version 4.2.1
-configure:4603: $? = 0
-configure:4605: g++ -V </dev/null >&5
-g++: '-V' option must have argument
-configure:4608: $? = 1
-configure:4611: checking whether we are using the GNU C++ compiler
-configure:4635: g++ -c   conftest.cc >&5
-configure:4641: $? = 0
-configure:4644: test -z 			 || test ! -s conftest.err
-configure:4647: $? = 0
-configure:4650: test -s conftest.o
-configure:4653: $? = 0
-configure:4666: result: yes
-configure:4672: checking whether g++ accepts -g
-configure:4693: g++ -c -g  conftest.cc >&5
-configure:4699: $? = 0
-configure:4702: test -z 			 || test ! -s conftest.err
-configure:4705: $? = 0
-configure:4708: test -s conftest.o
-configure:4711: $? = 0
-configure:4722: result: yes
-configure:4764: g++ -c -g -O2  conftest.cc >&5
-configure:4770: $? = 0
-configure:4773: test -z 			 || test ! -s conftest.err
-configure:4776: $? = 0
-configure:4779: test -s conftest.o
-configure:4782: $? = 0
-configure:4808: g++ -c -g -O2  conftest.cc >&5
-conftest.cc: In function 'int main()':
-conftest.cc:26: error: 'exit' was not declared in this scope
-configure:4814: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "ghosd"
-| #define PACKAGE_TARNAME "ghosd"
-| #define PACKAGE_VERSION "0.0.1"
-| #define PACKAGE_STRING "ghosd 0.0.1"
-| #define PACKAGE_BUGREPORT "martine@danga.com"
-| #define PACKAGE "ghosd"
-| #define VERSION "0.0.1"
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_DLFCN_H 1
-| /* end confdefs.h.  */
-| 
-| int
-| main ()
-| {
-| exit (42);
-|   ;
-|   return 0;
-| }
-configure:4764: g++ -c -g -O2  conftest.cc >&5
-conftest.cc:22: error: 'void std::exit(int)' should have been declared inside 'std'
-configure:4770: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "ghosd"
-| #define PACKAGE_TARNAME "ghosd"
-| #define PACKAGE_VERSION "0.0.1"
-| #define PACKAGE_STRING "ghosd 0.0.1"
-| #define PACKAGE_BUGREPORT "martine@danga.com"
-| #define PACKAGE "ghosd"
-| #define VERSION "0.0.1"
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_DLFCN_H 1
-| /* end confdefs.h.  */
-| extern "C" void std::exit (int) throw (); using std::exit;
-| #include <stdlib.h>
-| int
-| main ()
-| {
-| exit (42);
-|   ;
-|   return 0;
-| }
-configure:4764: g++ -c -g -O2  conftest.cc >&5
-conftest.cc:22: error: 'void std::exit(int)' should have been declared inside 'std'
-In file included from conftest.cc:23:
-/usr/include/stdlib.h:646: error: declaration of 'void std::exit(int) throw ()' throws different exceptions
-conftest.cc:22: error: from previous declaration 'void std::exit(int)'
-configure:4770: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "ghosd"
-| #define PACKAGE_TARNAME "ghosd"
-| #define PACKAGE_VERSION "0.0.1"
-| #define PACKAGE_STRING "ghosd 0.0.1"
-| #define PACKAGE_BUGREPORT "martine@danga.com"
-| #define PACKAGE "ghosd"
-| #define VERSION "0.0.1"
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_DLFCN_H 1
-| /* end confdefs.h.  */
-| extern "C" void std::exit (int); using std::exit;
-| #include <stdlib.h>
-| int
-| main ()
-| {
-| exit (42);
-|   ;
-|   return 0;
-| }
-configure:4764: g++ -c -g -O2  conftest.cc >&5
-configure:4770: $? = 0
-configure:4773: test -z 			 || test ! -s conftest.err
-configure:4776: $? = 0
-configure:4779: test -s conftest.o
-configure:4782: $? = 0
-configure:4808: g++ -c -g -O2  conftest.cc >&5
-configure:4814: $? = 0
-configure:4817: test -z 			 || test ! -s conftest.err
-configure:4820: $? = 0
-configure:4823: test -s conftest.o
-configure:4826: $? = 0
-configure:4851: checking dependency style of g++
-configure:4941: result: gcc3
-configure:4963: checking how to run the C++ preprocessor
-configure:4994: g++ -E  conftest.cc
-configure:5000: $? = 0
-configure:5032: g++ -E  conftest.cc
-conftest.cc:25:28: error: ac_nonexistent.h: No such file or directory
-configure:5038: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "ghosd"
-| #define PACKAGE_TARNAME "ghosd"
-| #define PACKAGE_VERSION "0.0.1"
-| #define PACKAGE_STRING "ghosd 0.0.1"
-| #define PACKAGE_BUGREPORT "martine@danga.com"
-| #define PACKAGE "ghosd"
-| #define VERSION "0.0.1"
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_DLFCN_H 1
-| #ifdef __cplusplus
-| extern "C" void exit (int) throw ();
-| #endif
-| /* end confdefs.h.  */
-| #include <ac_nonexistent.h>
-configure:5077: result: g++ -E
-configure:5101: g++ -E  conftest.cc
-configure:5107: $? = 0
-configure:5139: g++ -E  conftest.cc
-conftest.cc:25:28: error: ac_nonexistent.h: No such file or directory
-configure:5145: $? = 1
-configure: failed program was:
-| /* confdefs.h.  */
-| 
-| #define PACKAGE_NAME "ghosd"
-| #define PACKAGE_TARNAME "ghosd"
-| #define PACKAGE_VERSION "0.0.1"
-| #define PACKAGE_STRING "ghosd 0.0.1"
-| #define PACKAGE_BUGREPORT "martine@danga.com"
-| #define PACKAGE "ghosd"
-| #define VERSION "0.0.1"
-| #define STDC_HEADERS 1
-| #define HAVE_SYS_TYPES_H 1
-| #define HAVE_SYS_STAT_H 1
-| #define HAVE_STDLIB_H 1
-| #define HAVE_STRING_H 1
-| #define HAVE_MEMORY_H 1
-| #define HAVE_STRINGS_H 1
-| #define HAVE_INTTYPES_H 1
-| #define HAVE_STDINT_H 1
-| #define HAVE_UNISTD_H 1
-| #define HAVE_DLFCN_H 1
-| #ifdef __cplusplus
-| extern "C" void exit (int) throw ();
-| #endif
-| /* end confdefs.h.  */
-| #include <ac_nonexistent.h>
-configure:5240: checking for g77
-configure:5269: result: no
-configure:5240: checking for f77
-configure:5269: result: no
-configure:5240: checking for xlf
-configure:5269: result: no
-configure:5240: checking for frt
-configure:5269: result: no
-configure:5240: checking for pgf77
-configure:5269: result: no
-configure:5240: checking for fort77
-configure:5269: result: no
-configure:5240: checking for fl32
-configure:5269: result: no
-configure:5240: checking for af77
-configure:5269: result: no
-configure:5240: checking for f90
-configure:5269: result: no
-configure:5240: checking for xlf90
-configure:5269: result: no
-configure:5240: checking for pgf90
-configure:5269: result: no
-configure:5240: checking for epcf90
-configure:5269: result: no
-configure:5240: checking for f95
-configure:5269: result: no
-configure:5240: checking for fort
-configure:5269: result: no
-configure:5240: checking for xlf95
-configure:5269: result: no
-configure:5240: checking for ifc
-configure:5269: result: no
-configure:5240: checking for efc
-configure:5269: result: no
-configure:5240: checking for pgf95
-configure:5269: result: no
-configure:5240: checking for lf95
-configure:5269: result: no
-configure:5240: checking for gfortran
-configure:5269: result: no
-configure:5281: checking for Fortran 77 compiler version
-configure:5284:  --version </dev/null >&5
-./configure: line 5285: --version: command not found
-configure:5287: $? = 127
-configure:5289:  -v </dev/null >&5
-./configure: line 5290: -v: command not found
-configure:5292: $? = 127
-configure:5294:  -V </dev/null >&5
-./configure: line 5295: -V: command not found
-configure:5297: $? = 127
-configure:5305: checking whether we are using the GNU Fortran 77 compiler
-configure:5319:  -c  conftest.F >&5
-./configure: line 5320: -c: command not found
-configure:5325: $? = 127
-configure: failed program was:
-|       program main
-| #ifndef __GNUC__
-|        choke me
-| #endif
-| 
-|       end
-configure:5350: result: no
-configure:5356: checking whether  accepts -g
-configure:5368:  -c -g conftest.f >&5
-./configure: line 5369: -c: command not found
-configure:5374: $? = 127
-configure: failed program was:
-|       program main
-| 
-|       end
-configure:5398: result: no
-configure:5428: checking the maximum length of command line arguments
-configure:5493: result: 32768
-configure:5504: checking command to parse /usr/bin/nm -B output from gcc object
-configure:5593: gcc -c -g -O2  conftest.c >&5
-configure:5596: $? = 0
-configure:5600: /usr/bin/nm -B conftest.o \| sed -n -e 's/^.*[ 	]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ 	][ 	]*\(\)\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2\3 \3/p' \> conftest.nm
-configure:5603: $? = 0
-configure:5655: gcc -o conftest -g -O2   conftest.c conftstm.o >&5
-configure:5658: $? = 0
-configure:5696: result: ok
-configure:5700: checking for objdir
-configure:5715: result: .libs
-configure:5805: checking for ar
-configure:5821: found /usr/bin/ar
-configure:5832: result: ar
-configure:5885: checking for ranlib
-configure:5901: found /usr/bin/ranlib
-configure:5912: result: ranlib
-configure:5965: checking for strip
-configure:5981: found /usr/bin/strip
-configure:5992: result: strip
-configure:6254: checking if gcc static flag  works
-configure:6277: result: yes
-configure:6295: checking if gcc supports -fno-rtti -fno-exceptions
-configure:6313: gcc -c -g -O2  -fno-rtti -fno-exceptions conftest.c >&5
-cc1: warning: command line option "-fno-rtti" is valid for C++/ObjC++ but not for C
-configure:6317: $? = 0
-configure:6328: result: no
-configure:6343: checking for gcc option to produce PIC
-configure:6520: result: -fPIC
-configure:6528: checking if gcc PIC flag -fPIC works
-configure:6546: gcc -c -g -O2  -fPIC -DPIC conftest.c >&5
-configure:6550: $? = 0
-configure:6561: result: yes
-configure:6585: checking if gcc supports -c -o file.o
-configure:6606: gcc -c -g -O2  -o out/conftest2.o conftest.c >&5
-configure:6610: $? = 0
-configure:6630: result: yes
-configure:6656: checking whether the gcc linker (/usr/bin/ld) supports shared libraries
-configure:7503: result: yes
-configure:7529: checking whether -lc should be explicitly linked in
-configure:7534: gcc -c -g -O2  conftest.c >&5
-configure:7537: $? = 0
-configure:7551: gcc -shared conftest.o  -v -Wl,-soname -Wl,conftest -o conftest 2\>\&1 \| grep  -lc  \>/dev/null 2\>\&1
-configure:7554: $? = 0
-configure:7566: result: no
-configure:7574: checking dynamic linker characteristics
-configure:8126: result: GNU/Linux ld.so
-configure:8130: checking how to hardcode library paths into programs
-configure:8155: result: immediate
-configure:8169: checking whether stripping libraries is possible
-configure:8174: result: yes
-configure:8997: checking if libtool supports shared libraries
-configure:8999: result: yes
-configure:9002: checking whether to build shared libraries
-configure:9060: result: yes
-configure:9063: checking whether to build static libraries
-configure:9067: result: yes
-configure:9159: creating libtool
-configure:9706: checking for ld used by g++
-configure:9773: result: /usr/bin/ld
-configure:9782: checking if the linker (/usr/bin/ld) is GNU ld
-configure:9797: result: yes
-configure:9848: checking whether the g++ linker (/usr/bin/ld) supports shared libraries
-configure:10674: result: yes
-configure:10692: g++ -c -g -O2  conftest.cc >&5
-configure:10695: $? = 0
-configure:10791: checking for g++ option to produce PIC
-configure:11043: result: -fPIC
-configure:11051: checking if g++ PIC flag -fPIC works
-configure:11069: g++ -c -g -O2  -fPIC -DPIC conftest.cc >&5
-configure:11073: $? = 0
-configure:11084: result: yes
-configure:11108: checking if g++ supports -c -o file.o
-configure:11129: g++ -c -g -O2  -o out/conftest2.o conftest.cc >&5
-configure:11133: $? = 0
-configure:11153: result: yes
-configure:11179: checking whether the g++ linker (/usr/bin/ld) supports shared libraries
-configure:11207: result: yes
-configure:11278: checking dynamic linker characteristics
-configure:11830: result: GNU/Linux ld.so
-configure:11834: checking how to hardcode library paths into programs
-configure:11859: result: immediate
-configure:11873: checking whether stripping libraries is possible
-configure:11878: result: yes
-configure:19206: checking for pkg-config
-configure:19224: found /usr/bin/pkg-config
-configure:19236: result: /usr/bin/pkg-config
-configure:19251: checking pkg-config is at least version 0.9.0
-configure:19254: result: yes
-configure:19265: checking for GHOSD
-configure:19270: $PKG_CONFIG --exists --print-errors "$GHOSD_PACKAGES"
-configure:19273: $? = 0
-configure:19284: $PKG_CONFIG --exists --print-errors "$GHOSD_PACKAGES"
-configure:19287: $? = 0
-configure:19342: result: yes
-configure:19352: checking for GHOSD_EXAMPLE
-configure:19357: $PKG_CONFIG --exists --print-errors "$GHOSD_PACKAGES glib-2.0 >= 2.6"
-configure:19360: $? = 0
-configure:19371: $PKG_CONFIG --exists --print-errors "$GHOSD_PACKAGES glib-2.0 >= 2.6"
-configure:19374: $? = 0
-configure:19429: result: yes
-configure:19690: creating ./config.status
-
-## ---------------------- ##
-## Running config.status. ##
-## ---------------------- ##
-
-This file was extended by ghosd config.status 0.0.1, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  CONFIG_FILES    = 
-  CONFIG_HEADERS  = 
-  CONFIG_LINKS    = 
-  CONFIG_COMMANDS = 
-  $ ./config.status 
-
-on supertower.lan
-
-config.status:775: creating Makefile
-config.status:775: creating ghosd.pc
-config.status:775: creating ghosd/Makefile
-config.status:775: creating examples/Makefile
-config.status:775: creating doc/Makefile
-config.status:841: creating config.h
-config.status:1131: executing depfiles commands
-
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-
-ac_cv_build=i686-pc-linux-gnu
-ac_cv_build_alias=i686-pc-linux-gnu
-ac_cv_c_compiler_gnu=yes
-ac_cv_cxx_compiler_gnu=yes
-ac_cv_env_CC_set=
-ac_cv_env_CC_value=
-ac_cv_env_CFLAGS_set=
-ac_cv_env_CFLAGS_value=
-ac_cv_env_CPPFLAGS_set=
-ac_cv_env_CPPFLAGS_value=
-ac_cv_env_CPP_set=
-ac_cv_env_CPP_value=
-ac_cv_env_CXXCPP_set=
-ac_cv_env_CXXCPP_value=
-ac_cv_env_CXXFLAGS_set=
-ac_cv_env_CXXFLAGS_value=
-ac_cv_env_CXX_set=
-ac_cv_env_CXX_value=
-ac_cv_env_F77_set=
-ac_cv_env_F77_value=
-ac_cv_env_FFLAGS_set=
-ac_cv_env_FFLAGS_value=
-ac_cv_env_GHOSD_CFLAGS_set=
-ac_cv_env_GHOSD_CFLAGS_value=
-ac_cv_env_GHOSD_EXAMPLE_CFLAGS_set=
-ac_cv_env_GHOSD_EXAMPLE_CFLAGS_value=
-ac_cv_env_GHOSD_EXAMPLE_LIBS_set=
-ac_cv_env_GHOSD_EXAMPLE_LIBS_value=
-ac_cv_env_GHOSD_LIBS_set=
-ac_cv_env_GHOSD_LIBS_value=
-ac_cv_env_LDFLAGS_set=
-ac_cv_env_LDFLAGS_value=
-ac_cv_env_PKG_CONFIG_set=
-ac_cv_env_PKG_CONFIG_value=
-ac_cv_env_build_alias_set=
-ac_cv_env_build_alias_value=
-ac_cv_env_host_alias_set=
-ac_cv_env_host_alias_value=
-ac_cv_env_target_alias_set=
-ac_cv_env_target_alias_value=
-ac_cv_exeext=
-ac_cv_f77_compiler_gnu=no
-ac_cv_header_dlfcn_h=yes
-ac_cv_header_inttypes_h=yes
-ac_cv_header_memory_h=yes
-ac_cv_header_stdc=yes
-ac_cv_header_stdint_h=yes
-ac_cv_header_stdlib_h=yes
-ac_cv_header_string_h=yes
-ac_cv_header_strings_h=yes
-ac_cv_header_sys_stat_h=yes
-ac_cv_header_sys_types_h=yes
-ac_cv_header_unistd_h=yes
-ac_cv_host=i686-pc-linux-gnu
-ac_cv_host_alias=i686-pc-linux-gnu
-ac_cv_objext=o
-ac_cv_path_ac_pt_PKG_CONFIG=/usr/bin/pkg-config
-ac_cv_path_install='/bin/install -c'
-ac_cv_prog_AWK=gawk
-ac_cv_prog_CPP='gcc -E'
-ac_cv_prog_CXXCPP='g++ -E'
-ac_cv_prog_ac_ct_AR=ar
-ac_cv_prog_ac_ct_CC=gcc
-ac_cv_prog_ac_ct_CXX=g++
-ac_cv_prog_ac_ct_RANLIB=ranlib
-ac_cv_prog_ac_ct_STRIP=strip
-ac_cv_prog_cc_g=yes
-ac_cv_prog_cc_stdc=
-ac_cv_prog_cxx_g=yes
-ac_cv_prog_egrep='grep -E'
-ac_cv_prog_f77_g=no
-ac_cv_prog_make_make_set=yes
-am_cv_CC_dependencies_compiler_type=gcc3
-am_cv_CXX_dependencies_compiler_type=gcc3
-lt_cv_deplibs_check_method=pass_all
-lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_ld_reload_flag=-r
-lt_cv_objdir=.libs
-lt_cv_path_LD=/usr/bin/ld
-lt_cv_path_LDCXX=/usr/bin/ld
-lt_cv_path_NM='/usr/bin/nm -B'
-lt_cv_path_SED=/bin/sed
-lt_cv_prog_compiler_c_o=yes
-lt_cv_prog_compiler_c_o_CXX=yes
-lt_cv_prog_compiler_rtti_exceptions=no
-lt_cv_prog_gnu_ld=yes
-lt_cv_prog_gnu_ldcxx=yes
-lt_cv_sys_global_symbol_pipe='sed -n -e '\''s/^.*[ 	]\([ABCDGIRSTW][ABCDGIRSTW]*\)[ 	][ 	]*\(\)\([_A-Za-z][_A-Za-z0-9]*\)$/\1 \2\3 \3/p'\'''
-lt_cv_sys_global_symbol_to_c_name_address='sed -n -e '\''s/^: \([^ ]*\) $/  {\"\1\", (lt_ptr) 0},/p'\'' -e '\''s/^[BCDEGRST] \([^ ]*\) \([^ ]*\)$/  {"\2", (lt_ptr) \&\2},/p'\'''
-lt_cv_sys_global_symbol_to_cdecl='sed -n -e '\''s/^. .* \(.*\)$/extern int \1;/p'\'''
-lt_cv_sys_max_cmd_len=32768
-lt_lt_cv_prog_compiler_c_o='"yes"'
-lt_lt_cv_prog_compiler_c_o_CXX='"yes"'
-lt_lt_cv_sys_global_symbol_pipe='"sed -n -e '\''s/^.*[ 	]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ 	][ 	]*\\(\\)\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2\\3 \\3/p'\''"'
-lt_lt_cv_sys_global_symbol_to_c_name_address='"sed -n -e '\''s/^: \\([^ ]*\\) \$/  {\\\"\\1\\\", (lt_ptr) 0},/p'\'' -e '\''s/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/  {\"\\2\", (lt_ptr) \\&\\2},/p'\''"'
-lt_lt_cv_sys_global_symbol_to_cdecl='"sed -n -e '\''s/^. .* \\(.*\\)\$/extern int \\1;/p'\''"'
-pkg_cv_GHOSD_CFLAGS='-I/usr/include/cairo -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  '
-pkg_cv_GHOSD_EXAMPLE_CFLAGS='-I/usr/include/cairo -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  '
-pkg_cv_GHOSD_EXAMPLE_LIBS='-lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  '
-pkg_cv_GHOSD_LIBS='-lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  '
-
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-
-ACLOCAL='${SHELL} /data/local/jams/ghosd-0.0.1/missing --run aclocal-1.9'
-AMDEPBACKSLASH='\'
-AMDEP_FALSE='#'
-AMDEP_TRUE=''
-AMTAR='${SHELL} /data/local/jams/ghosd-0.0.1/missing --run tar'
-AR='ar'
-AUTOCONF='${SHELL} /data/local/jams/ghosd-0.0.1/missing --run autoconf'
-AUTOHEADER='${SHELL} /data/local/jams/ghosd-0.0.1/missing --run autoheader'
-AUTOMAKE='${SHELL} /data/local/jams/ghosd-0.0.1/missing --run automake-1.9'
-AWK='gawk'
-CC='gcc'
-CCDEPMODE='depmode=gcc3'
-CFLAGS='-g -O2 -Wall -Wpointer-arith -Wstrict-prototypes                -Wmissing-prototypes -Wmissing-declarations                -Wnested-externs -fno-strict-aliasing'
-CPP='gcc -E'
-CPPFLAGS=''
-CXX='g++'
-CXXCPP='g++ -E'
-CXXDEPMODE='depmode=gcc3'
-CXXFLAGS='-g -O2'
-CYGPATH_W='echo'
-DEFS='-DHAVE_CONFIG_H'
-DEPDIR='.deps'
-ECHO='echo'
-ECHO_C=''
-ECHO_N='-n'
-ECHO_T=''
-EGREP='grep -E'
-ENABLE_GTK_DOC_FALSE=''
-ENABLE_GTK_DOC_TRUE='#'
-EXEEXT=''
-F77=''
-FFLAGS=''
-GHOSD_CFLAGS='-I/usr/include/cairo -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  '
-GHOSD_EXAMPLE_CFLAGS='-I/usr/include/cairo -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  '
-GHOSD_EXAMPLE_LIBS='-lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  '
-GHOSD_LIBS='-lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  '
-GHOSD_PACKAGES='cairo pangocairo'
-GTK_DOC_USE_LIBTOOL_FALSE='#'
-GTK_DOC_USE_LIBTOOL_TRUE=''
-HTML_DIR='${datadir}/gtk-doc/html'
-INSTALL_DATA='${INSTALL} -m 644'
-INSTALL_PROGRAM='${INSTALL}'
-INSTALL_SCRIPT='${INSTALL}'
-INSTALL_STRIP_PROGRAM='${SHELL} $(install_sh) -c -s'
-LDFLAGS=''
-LIBOBJS=''
-LIBS=''
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-LN_S='ln -s'
-LTLIBOBJS=''
-MAINT='#'
-MAINTAINER_MODE_FALSE=''
-MAINTAINER_MODE_TRUE='#'
-MAKEINFO='${SHELL} /data/local/jams/ghosd-0.0.1/missing --run makeinfo'
-OBJEXT='o'
-PACKAGE='ghosd'
-PACKAGE_BUGREPORT='martine@danga.com'
-PACKAGE_NAME='ghosd'
-PACKAGE_STRING='ghosd 0.0.1'
-PACKAGE_TARNAME='ghosd'
-PACKAGE_VERSION='0.0.1'
-PANGO_FALSE='#'
-PANGO_TRUE=''
-PATH_SEPARATOR=':'
-PKG_CONFIG='/usr/bin/pkg-config'
-RANLIB='ranlib'
-SET_MAKE=''
-SHELL='/bin/sh'
-STRIP='strip'
-VERSION='0.0.1'
-VERSION_INFO='0:0:0'
-ac_ct_AR='ar'
-ac_ct_CC='gcc'
-ac_ct_CXX='g++'
-ac_ct_F77=''
-ac_ct_RANLIB='ranlib'
-ac_ct_STRIP='strip'
-ac_pt_PKG_CONFIG='/usr/bin/pkg-config'
-am__fastdepCC_FALSE='#'
-am__fastdepCC_TRUE=''
-am__fastdepCXX_FALSE='#'
-am__fastdepCXX_TRUE=''
-am__include='include'
-am__leading_dot='.'
-am__quote=''
-am__tar='${AMTAR} chof - "$$tardir"'
-am__untar='${AMTAR} xf -'
-bindir='${exec_prefix}/bin'
-build='i686-pc-linux-gnu'
-build_alias=''
-build_cpu='i686'
-build_os='linux-gnu'
-build_vendor='pc'
-datadir='${prefix}/share'
-exec_prefix='${prefix}'
-host='i686-pc-linux-gnu'
-host_alias=''
-host_cpu='i686'
-host_os='linux-gnu'
-host_vendor='pc'
-includedir='${prefix}/include'
-infodir='${prefix}/info'
-install_sh='/data/local/jams/ghosd-0.0.1/install-sh'
-libdir='${exec_prefix}/lib'
-libexecdir='${exec_prefix}/libexec'
-localstatedir='${prefix}/var'
-mandir='${prefix}/man'
-mkdir_p='mkdir -p --'
-oldincludedir='/usr/include'
-prefix='/usr/local'
-program_transform_name='s,x,x,'
-sbindir='${exec_prefix}/sbin'
-sharedstatedir='${prefix}/com'
-sysconfdir='${prefix}/etc'
-target_alias=''
-
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-
-#define HAVE_DLFCN_H 1
-#define HAVE_INTTYPES_H 1
-#define HAVE_MEMORY_H 1
-#define HAVE_PANGO
-#define HAVE_STDINT_H 1
-#define HAVE_STDLIB_H 1
-#define HAVE_STRINGS_H 1
-#define HAVE_STRING_H 1
-#define HAVE_SYS_STAT_H 1
-#define HAVE_SYS_TYPES_H 1
-#define HAVE_UNISTD_H 1
-#define PACKAGE "ghosd"
-#define PACKAGE_BUGREPORT "martine@danga.com"
-#define PACKAGE_NAME "ghosd"
-#define PACKAGE_STRING "ghosd 0.0.1"
-#define PACKAGE_TARNAME "ghosd"
-#define PACKAGE_VERSION "0.0.1"
-#define STDC_HEADERS 1
-#define VERSION "0.0.1"
-#endif
-#ifdef __cplusplus
-extern "C" void exit (int) throw ();
-
-configure: exit 0
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/config.status b/abs/mv-core/ghosd/ghosd-0.0.1/config.status
deleted file mode 100755
index 527b77a..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/config.status
+++ /dev/null
@@ -1,1222 +0,0 @@
-#! /bin/sh
-# Generated by configure.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=${CONFIG_SHELL-/bin/sh}
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-exec 6>&1
-
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
-This file was extended by ghosd $as_me 0.0.1, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
-config_files=" Makefile ghosd.pc ghosd/Makefile examples/Makefile doc/Makefile"
-config_headers=" config.h"
-config_commands=" depfiles"
-
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-  --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration commands:
-$config_commands
-
-Report bugs to <bug-autoconf@gnu.org>."
-ac_cs_version="\
-ghosd config.status 0.0.1
-configured by ./configure, generated by GNU Autoconf 2.59,
-  with options \"\"
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-srcdir=.
-INSTALL="/bin/install -c"
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  -*)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_option=$1
-     ac_need_defaults=false;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1" ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-if $ac_cs_recheck; then
-  echo "running /bin/sh ./configure "  $ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec /bin/sh ./configure  $ac_configure_extra_args --no-create --no-recursion
-fi
-
-#
-# INIT-COMMANDS section.
-#
-
-AMDEP_TRUE="" ac_aux_dir="."
-
-for ac_config_target in $ac_config_targets
-do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  "ghosd.pc" ) CONFIG_FILES="$CONFIG_FILES ghosd.pc" ;;
-  "ghosd/Makefile" ) CONFIG_FILES="$CONFIG_FILES ghosd/Makefile" ;;
-  "examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
-  "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
-  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
-$debug ||
-{
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-
-#
-# CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t$/@;t t/; /@;t t$/s/[\\&,]/\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t$/,;t t/' >$tmp/subs.sed <<\CEOF
-s,@SHELL@,/bin/sh,;t t
-s,@PATH_SEPARATOR@,:,;t t
-s,@PACKAGE_NAME@,ghosd,;t t
-s,@PACKAGE_TARNAME@,ghosd,;t t
-s,@PACKAGE_VERSION@,0.0.1,;t t
-s,@PACKAGE_STRING@,ghosd 0.0.1,;t t
-s,@PACKAGE_BUGREPORT@,martine@danga.com,;t t
-s,@exec_prefix@,${prefix},;t t
-s,@prefix@,/usr/local,;t t
-s,@program_transform_name@,s,x,x,,;t t
-s,@bindir@,${exec_prefix}/bin,;t t
-s,@sbindir@,${exec_prefix}/sbin,;t t
-s,@libexecdir@,${exec_prefix}/libexec,;t t
-s,@datadir@,${prefix}/share,;t t
-s,@sysconfdir@,${prefix}/etc,;t t
-s,@sharedstatedir@,${prefix}/com,;t t
-s,@localstatedir@,${prefix}/var,;t t
-s,@libdir@,${exec_prefix}/lib,;t t
-s,@includedir@,${prefix}/include,;t t
-s,@oldincludedir@,/usr/include,;t t
-s,@infodir@,${prefix}/info,;t t
-s,@mandir@,${prefix}/man,;t t
-s,@build_alias@,,;t t
-s,@host_alias@,,;t t
-s,@target_alias@,,;t t
-s,@DEFS@,-DHAVE_CONFIG_H,;t t
-s,@ECHO_C@,,;t t
-s,@ECHO_N@,-n,;t t
-s,@ECHO_T@,,;t t
-s,@LIBS@,,;t t
-s,@INSTALL_PROGRAM@,${INSTALL},;t t
-s,@INSTALL_SCRIPT@,${INSTALL},;t t
-s,@INSTALL_DATA@,${INSTALL} -m 644,;t t
-s,@CYGPATH_W@,echo,;t t
-s,@PACKAGE@,ghosd,;t t
-s,@VERSION@,0.0.1,;t t
-s,@ACLOCAL@,${SHELL} /data/local/jams/ghosd-0.0.1/missing --run aclocal-1.9,;t t
-s,@AUTOCONF@,${SHELL} /data/local/jams/ghosd-0.0.1/missing --run autoconf,;t t
-s,@AUTOMAKE@,${SHELL} /data/local/jams/ghosd-0.0.1/missing --run automake-1.9,;t t
-s,@AUTOHEADER@,${SHELL} /data/local/jams/ghosd-0.0.1/missing --run autoheader,;t t
-s,@MAKEINFO@,${SHELL} /data/local/jams/ghosd-0.0.1/missing --run makeinfo,;t t
-s,@install_sh@,/data/local/jams/ghosd-0.0.1/install-sh,;t t
-s,@STRIP@,strip,;t t
-s,@ac_ct_STRIP@,strip,;t t
-s,@INSTALL_STRIP_PROGRAM@,${SHELL} $(install_sh) -c -s,;t t
-s,@mkdir_p@,mkdir -p --,;t t
-s,@AWK@,gawk,;t t
-s,@SET_MAKE@,,;t t
-s,@am__leading_dot@,.,;t t
-s,@AMTAR@,${SHELL} /data/local/jams/ghosd-0.0.1/missing --run tar,;t t
-s,@am__tar@,${AMTAR} chof - "$$tardir",;t t
-s,@am__untar@,${AMTAR} xf -,;t t
-s,@VERSION_INFO@,0:0:0,;t t
-s,@MAINTAINER_MODE_TRUE@,#,;t t
-s,@MAINTAINER_MODE_FALSE@,,;t t
-s,@MAINT@,#,;t t
-s,@CC@,gcc,;t t
-s,@CFLAGS@,-g -O2 -Wall -Wpointer-arith -Wstrict-prototypes                -Wmissing-prototypes -Wmissing-declarations                -Wnested-externs -fno-strict-aliasing,;t t
-s,@LDFLAGS@,,;t t
-s,@CPPFLAGS@,,;t t
-s,@ac_ct_CC@,gcc,;t t
-s,@EXEEXT@,,;t t
-s,@OBJEXT@,o,;t t
-s,@DEPDIR@,.deps,;t t
-s,@am__include@,include,;t t
-s,@am__quote@,,;t t
-s,@AMDEP_TRUE@,,;t t
-s,@AMDEP_FALSE@,#,;t t
-s,@AMDEPBACKSLASH@,\,;t t
-s,@CCDEPMODE@,depmode=gcc3,;t t
-s,@am__fastdepCC_TRUE@,,;t t
-s,@am__fastdepCC_FALSE@,#,;t t
-s,@build@,i686-pc-linux-gnu,;t t
-s,@build_cpu@,i686,;t t
-s,@build_vendor@,pc,;t t
-s,@build_os@,linux-gnu,;t t
-s,@host@,i686-pc-linux-gnu,;t t
-s,@host_cpu@,i686,;t t
-s,@host_vendor@,pc,;t t
-s,@host_os@,linux-gnu,;t t
-s,@EGREP@,grep -E,;t t
-s,@LN_S@,ln -s,;t t
-s,@ECHO@,echo,;t t
-s,@AR@,ar,;t t
-s,@ac_ct_AR@,ar,;t t
-s,@RANLIB@,ranlib,;t t
-s,@ac_ct_RANLIB@,ranlib,;t t
-s,@CPP@,gcc -E,;t t
-s,@CXX@,g++,;t t
-s,@CXXFLAGS@,-g -O2,;t t
-s,@ac_ct_CXX@,g++,;t t
-s,@CXXDEPMODE@,depmode=gcc3,;t t
-s,@am__fastdepCXX_TRUE@,,;t t
-s,@am__fastdepCXX_FALSE@,#,;t t
-s,@CXXCPP@,g++ -E,;t t
-s,@F77@,,;t t
-s,@FFLAGS@,,;t t
-s,@ac_ct_F77@,,;t t
-s,@LIBTOOL@,$(SHELL) $(top_builddir)/libtool,;t t
-s,@PANGO_TRUE@,,;t t
-s,@PANGO_FALSE@,#,;t t
-s,@PKG_CONFIG@,/usr/bin/pkg-config,;t t
-s,@ac_pt_PKG_CONFIG@,/usr/bin/pkg-config,;t t
-s,@GHOSD_CFLAGS@,-I/usr/include/cairo -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  ,;t t
-s,@GHOSD_LIBS@,-lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  ,;t t
-s,@GHOSD_PACKAGES@,cairo pangocairo,;t t
-s,@GHOSD_EXAMPLE_CFLAGS@,-I/usr/include/cairo -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  ,;t t
-s,@GHOSD_EXAMPLE_LIBS@,-lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  ,;t t
-s,@HTML_DIR@,${datadir}/gtk-doc/html,;t t
-s,@ENABLE_GTK_DOC_TRUE@,#,;t t
-s,@ENABLE_GTK_DOC_FALSE@,,;t t
-s,@GTK_DOC_USE_LIBTOOL_TRUE@,,;t t
-s,@GTK_DOC_USE_LIBTOOL_FALSE@,#,;t t
-s,@LIBOBJS@,,;t t
-s,@LTLIBOBJS@,,;t t
-CEOF
-
-  # Split the substitutions into bite-sized pieces for seds with
-  # small command number limits, like on Digital OSF/1 and HP-UX.
-  ac_max_sed_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # Line after last line for current file.
-  ac_more_lines=:
-  ac_sed_cmds=
-  while $ac_more_lines; do
-    if test $ac_beg -gt 1; then
-      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
-    fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
-  fi
-fi # test -n "$CONFIG_FILES"
-
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-  esac
-
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-  sed "/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[	 ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[	 ]*$//;
-}
-
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-s,@INSTALL@,$ac_INSTALL,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
-
-done
-
-#
-# CONFIG_HEADER section.
-#
-
-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-# NAME is the cpp macro being defined and VALUE is the value it is being given.
-#
-# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
-ac_dB='[	 ].*$,\1#\2'
-ac_dC=' '
-ac_dD=',;t'
-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
-ac_uB='$,\1#\2define\3'
-ac_uC=' '
-ac_uD=',;t'
-
-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 # Do quote $f, to prevent DOS paths from being IFS'd.
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-  # Remove the trailing spaces.
-  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
-
-  # Handle all the #define templates only if necessary.
-  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then
-  # If there are no defines, we may have an empty if/fi
-  :
-  cat >$tmp/defines.sed <<CEOF
-/^[	 ]*#[	 ]*define/!b
-t clr
-: clr
-${ac_dA}PACKAGE_NAME${ac_dB}PACKAGE_NAME${ac_dC}"ghosd"${ac_dD}
-${ac_dA}PACKAGE_TARNAME${ac_dB}PACKAGE_TARNAME${ac_dC}"ghosd"${ac_dD}
-${ac_dA}PACKAGE_VERSION${ac_dB}PACKAGE_VERSION${ac_dC}"0.0.1"${ac_dD}
-${ac_dA}PACKAGE_STRING${ac_dB}PACKAGE_STRING${ac_dC}"ghosd 0.0.1"${ac_dD}
-${ac_dA}PACKAGE_BUGREPORT${ac_dB}PACKAGE_BUGREPORT${ac_dC}"martine@danga.com"${ac_dD}
-${ac_dA}PACKAGE${ac_dB}PACKAGE${ac_dC}"ghosd"${ac_dD}
-${ac_dA}VERSION${ac_dB}VERSION${ac_dC}"0.0.1"${ac_dD}
-${ac_dA}STDC_HEADERS${ac_dB}STDC_HEADERS${ac_dC}1${ac_dD}
-${ac_dA}HAVE_SYS_TYPES_H${ac_dB}HAVE_SYS_TYPES_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_SYS_STAT_H${ac_dB}HAVE_SYS_STAT_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_STDLIB_H${ac_dB}HAVE_STDLIB_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_STRING_H${ac_dB}HAVE_STRING_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_MEMORY_H${ac_dB}HAVE_MEMORY_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_STRINGS_H${ac_dB}HAVE_STRINGS_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_INTTYPES_H${ac_dB}HAVE_INTTYPES_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_STDINT_H${ac_dB}HAVE_STDINT_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_UNISTD_H${ac_dB}HAVE_UNISTD_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_DLFCN_H${ac_dB}HAVE_DLFCN_H${ac_dC}1${ac_dD}
-${ac_dA}HAVE_PANGO${ac_dB}HAVE_PANGO${ac_dC}${ac_dD}
-CEOF
-  sed -f $tmp/defines.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-
-  fi # grep
-
-  # Handle all the #undef templates
-  cat >$tmp/undefs.sed <<CEOF
-/^[	 ]*#[	 ]*undef/!b
-t clr
-: clr
-${ac_uA}PACKAGE_NAME${ac_uB}PACKAGE_NAME${ac_uC}"ghosd"${ac_uD}
-${ac_uA}PACKAGE_TARNAME${ac_uB}PACKAGE_TARNAME${ac_uC}"ghosd"${ac_uD}
-${ac_uA}PACKAGE_VERSION${ac_uB}PACKAGE_VERSION${ac_uC}"0.0.1"${ac_uD}
-${ac_uA}PACKAGE_STRING${ac_uB}PACKAGE_STRING${ac_uC}"ghosd 0.0.1"${ac_uD}
-${ac_uA}PACKAGE_BUGREPORT${ac_uB}PACKAGE_BUGREPORT${ac_uC}"martine@danga.com"${ac_uD}
-${ac_uA}PACKAGE${ac_uB}PACKAGE${ac_uC}"ghosd"${ac_uD}
-${ac_uA}VERSION${ac_uB}VERSION${ac_uC}"0.0.1"${ac_uD}
-${ac_uA}STDC_HEADERS${ac_uB}STDC_HEADERS${ac_uC}1${ac_uD}
-${ac_uA}HAVE_SYS_TYPES_H${ac_uB}HAVE_SYS_TYPES_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_SYS_STAT_H${ac_uB}HAVE_SYS_STAT_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_STDLIB_H${ac_uB}HAVE_STDLIB_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_STRING_H${ac_uB}HAVE_STRING_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_MEMORY_H${ac_uB}HAVE_MEMORY_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_STRINGS_H${ac_uB}HAVE_STRINGS_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_INTTYPES_H${ac_uB}HAVE_INTTYPES_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_STDINT_H${ac_uB}HAVE_STDINT_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_UNISTD_H${ac_uB}HAVE_UNISTD_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_DLFCN_H${ac_uB}HAVE_DLFCN_H${ac_uC}1${ac_uD}
-${ac_uA}HAVE_PANGO${ac_uB}HAVE_PANGO${ac_uC}${ac_uD}
-s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
-CEOF
-  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    echo "/* Generated by configure.  */" >$tmp/config.h
-  else
-    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
-  fi
-  cat $tmp/in >>$tmp/config.h
-  rm -f $tmp/in
-  if test x"$ac_file" != x-; then
-    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-      { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-      rm -f $ac_file
-      mv $tmp/config.h $ac_file
-    fi
-  else
-    cat $tmp/config.h
-    rm -f $tmp/config.h
-  fi
-# Compute $ac_file's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $ac_file | $ac_file:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X$ac_file : 'X\(//\)[^/]' \| \
-	 X$ac_file : 'X\(//\)$' \| \
-	 X$ac_file : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X$ac_file |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`/stamp-h$_am_stamp_count
-done
-
-#
-# CONFIG_COMMANDS section.
-#
-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
-  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
-  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
-  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
-$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_dest" : 'X\(//\)[^/]' \| \
-	 X"$ac_dest" : 'X\(//\)$' \| \
-	 X"$ac_dest" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_dest" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
-echo "$as_me: executing $ac_dest commands" >&6;}
-  case $ac_dest in
-    depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-    dirpart=`(dirname "$mf") 2>/dev/null ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`(dirname "$file") 2>/dev/null ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    { if $as_mkdir_p; then
-    mkdir -p $dirpart/$fdir
-  else
-    as_dir=$dirpart/$fdir
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
-echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
- ;;
-  esac
-done
-
-{ (exit 0); exit 0; }
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/config.sub b/abs/mv-core/ghosd/ghosd-0.0.1/config.sub
deleted file mode 100755
index 87a1ee4..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/config.sub
+++ /dev/null
@@ -1,1569 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-
-timestamp='2005-04-22'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005
-Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit 0 ;;
-    --version | -v )
-       echo "$version" ; exit 0 ;;
-    --help | --h* | -h )
-       echo "$usage"; exit 0 ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit 0;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
-		os=
-		basic_machine=$1
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
- 	-chorusrdb)
- 		os=-chorusrdb
-		basic_machine=$1
- 		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
-	| bfin \
-	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| fr30 | frv \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
-	| mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| msp430 \
-	| ns16k | ns32k \
-	| openrisc | or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-	| pyramid \
-	| sh | sh[1234] | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b \
-	| strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
-	| v850 | v850e \
-	| we32k \
-	| x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k)
-		basic_machine=$basic_machine-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* \
-	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | craynv-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| m32r-* | m32rle-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| msp430-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-	| pyramid-* \
-	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[23]e-* | sh[34]eb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tron-* \
-	| v850-* | v850e-* | vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa-* \
-	| ymp-* \
-	| z8k-*)
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-    	abacus)
-		basic_machine=abacus-unknown
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16c)
-		basic_machine=cr16c-unknown
-		os=-elf
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	or32 | or32-*)
-		basic_machine=or32-unknown
-		os=-coff
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc)	basic_machine=powerpc-unknown
-		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	mmix)
-		basic_machine=mmix-knuth
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh3 | sh4 | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b)
-		basic_machine=sparc-sun
-		;;
-	cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
-	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto-qnx*)
-		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-        -os400*)
-		os=-os400
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-syllable*)
-		os=-syllable
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-        -tpf*)
-		os=-tpf
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-kaos*)
-		os=-kaos
-		;;
-	-zvmoe)
-		os=-zvmoe
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-ibm)
-		os=-aix
-		;;
-    	*-knuth)
-		os=-mmixware
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-	*-gould)
-		os=-sysv
-		;;
-	*-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-	*-sgi)
-		os=-irix
-		;;
-	*-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-os400*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-tpf*)
-				vendor=ibm
-				;;
-			-vxsim* | -vxworks* | -windiss*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/configure b/abs/mv-core/ghosd/ghosd-0.0.1/configure
deleted file mode 100755
index 9c2fd6a..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/configure
+++ /dev/null
@@ -1,21024 +0,0 @@
-#! /bin/sh
-# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for ghosd 0.0.1.
-#
-# Report bugs to <martine@danga.com>.
-#
-# Copyright (C) 2003 Free Software Foundation, Inc.
-# This configure script is free software; the Free Software Foundation
-# gives unlimited permission to copy, distribute and modify it.
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-
-
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$ECHO" | sed 's,\\\\\$\\$0,'$0','`
-  ;;
-esac
-
-echo=${ECHO-echo}
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell.
-  exec $SHELL "$0" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-
-if test -z "$ECHO"; then
-if test "X${echo_test_string+set}" != Xset; then
-# find a string as large as possible, as long as the shell can cope with it
-  for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
-    # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-    if (echo_test_string="`eval $cmd`") 2>/dev/null &&
-       echo_test_string="`eval $cmd`" &&
-       (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
-    then
-      break
-    fi
-  done
-fi
-
-if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-   echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-   test "X$echo_testing_string" = "X$echo_test_string"; then
-  :
-else
-  # The Solaris, AIX, and Digital Unix default echo programs unquote
-  # backslashes.  This makes it impossible to quote backslashes using
-  #   echo "$something" | sed 's/\\/\\\\/g'
-  #
-  # So, first we look for a working echo in the user's PATH.
-
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for dir in $PATH /usr/ucb; do
-    IFS="$lt_save_ifs"
-    if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-       test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      echo="$dir/echo"
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-
-  if test "X$echo" = Xecho; then
-    # We didn't find a better echo, so look for alternatives.
-    if test "X`(print -r '\t') 2>/dev/null`" = 'X\t' &&
-       echo_testing_string=`(print -r "$echo_test_string") 2>/dev/null` &&
-       test "X$echo_testing_string" = "X$echo_test_string"; then
-      # This shell has a builtin print -r that does the trick.
-      echo='print -r'
-    elif (test -f /bin/ksh || test -f /bin/ksh$ac_exeext) &&
-	 test "X$CONFIG_SHELL" != X/bin/ksh; then
-      # If we have ksh, try running configure again with it.
-      ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-      export ORIGINAL_CONFIG_SHELL
-      CONFIG_SHELL=/bin/ksh
-      export CONFIG_SHELL
-      exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
-    else
-      # Try using printf.
-      echo='printf %s\n'
-      if test "X`($echo '\t') 2>/dev/null`" = 'X\t' &&
-	 echo_testing_string=`($echo "$echo_test_string") 2>/dev/null` &&
-	 test "X$echo_testing_string" = "X$echo_test_string"; then
-	# Cool, printf works
-	:
-      elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	export CONFIG_SHELL
-	SHELL="$CONFIG_SHELL"
-	export SHELL
-	echo="$CONFIG_SHELL $0 --fallback-echo"
-      elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	   test "X$echo_testing_string" = 'X\t' &&
-	   echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	echo="$CONFIG_SHELL $0 --fallback-echo"
-      else
-	# maybe with a smaller string...
-	prev=:
-
-	for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
-	  if (test "X$echo_test_string" = "X`eval $cmd`") 2>/dev/null
-	  then
-	    break
-	  fi
-	  prev="$cmd"
-	done
-
-	if test "$prev" != 'sed 50q "$0"'; then
-	  echo_test_string=`eval $prev`
-	  export echo_test_string
-	  exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
-	else
-	  # Oops.  We lost completely, so just stick with echo.
-	  echo=echo
-	fi
-      fi
-    fi
-  fi
-fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-ECHO=$echo
-if test "X$ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
-   ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
-fi
-
-
-
-
-tagnames=${tagnames+${tagnames},}CXX
-
-tagnames=${tagnames+${tagnames},}F77
-
-# Name of the host.
-# hostname on some systems (SVR3.2, Linux) returns a bogus exit status,
-# so uname gets run too.
-ac_hostname=`(hostname || uname -n) 2>/dev/null | sed 1q`
-
-exec 6>&1
-
-#
-# Initializations.
-#
-ac_default_prefix=/usr/local
-ac_config_libobj_dir=.
-cross_compiling=no
-subdirs=
-MFLAGS=
-MAKEFLAGS=
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-# Maximum number of lines to put in a shell here document.
-# This variable seems obsolete.  It should probably be removed, and
-# only ac_max_sed_lines should be used.
-: ${ac_max_here_lines=38}
-
-# Identity of this package.
-PACKAGE_NAME='ghosd'
-PACKAGE_TARNAME='ghosd'
-PACKAGE_VERSION='0.0.1'
-PACKAGE_STRING='ghosd 0.0.1'
-PACKAGE_BUGREPORT='martine@danga.com'
-
-ac_unique_file="ghosd/ghosd.c"
-# Factoring default headers for most tests.
-ac_includes_default="\
-#include <stdio.h>
-#if HAVE_SYS_TYPES_H
-# include <sys/types.h>
-#endif
-#if HAVE_SYS_STAT_H
-# include <sys/stat.h>
-#endif
-#if STDC_HEADERS
-# include <stdlib.h>
-# include <stddef.h>
-#else
-# if HAVE_STDLIB_H
-#  include <stdlib.h>
-# endif
-#endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
-#  include <memory.h>
-# endif
-# include <string.h>
-#endif
-#if HAVE_STRINGS_H
-# include <strings.h>
-#endif
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-#  include <stdint.h>
-# endif
-#endif
-#if HAVE_UNISTD_H
-# include <unistd.h>
-#endif"
-
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar VERSION_INFO MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE build build_cpu build_vendor build_os host host_cpu host_vendor host_os EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PANGO_TRUE PANGO_FALSE PKG_CONFIG ac_pt_PKG_CONFIG GHOSD_CFLAGS GHOSD_LIBS GHOSD_PACKAGES GHOSD_EXAMPLE_CFLAGS GHOSD_EXAMPLE_LIBS HTML_DIR ENABLE_GTK_DOC_TRUE ENABLE_GTK_DOC_FALSE GTK_DOC_USE_LIBTOOL_TRUE GTK_DOC_USE_LIBTOOL_FALSE LIBOBJS LTLIBOBJS'
-ac_subst_files=''
-
-# Initialize some variables set by options.
-ac_init_help=
-ac_init_version=false
-# The variables have the same names as the options, with
-# dashes changed to underlines.
-cache_file=/dev/null
-exec_prefix=NONE
-no_create=
-no_recursion=
-prefix=NONE
-program_prefix=NONE
-program_suffix=NONE
-program_transform_name=s,x,x,
-silent=
-site=
-srcdir=
-verbose=
-x_includes=NONE
-x_libraries=NONE
-
-# Installation directory options.
-# These are left unexpanded so users can "make install exec_prefix=/foo"
-# and all the variables that are supposed to be based on exec_prefix
-# by default will actually change.
-# Use braces instead of parens because sh, perl, etc. also accept them.
-bindir='${exec_prefix}/bin'
-sbindir='${exec_prefix}/sbin'
-libexecdir='${exec_prefix}/libexec'
-datadir='${prefix}/share'
-sysconfdir='${prefix}/etc'
-sharedstatedir='${prefix}/com'
-localstatedir='${prefix}/var'
-libdir='${exec_prefix}/lib'
-includedir='${prefix}/include'
-oldincludedir='/usr/include'
-infodir='${prefix}/info'
-mandir='${prefix}/man'
-
-ac_prev=
-for ac_option
-do
-  # If the previous option needs an argument, assign it.
-  if test -n "$ac_prev"; then
-    eval "$ac_prev=\$ac_option"
-    ac_prev=
-    continue
-  fi
-
-  ac_optarg=`expr "x$ac_option" : 'x[^=]*=\(.*\)'`
-
-  # Accept the important Cygnus configure options, so we can diagnose typos.
-
-  case $ac_option in
-
-  -bindir | --bindir | --bindi | --bind | --bin | --bi)
-    ac_prev=bindir ;;
-  -bindir=* | --bindir=* | --bindi=* | --bind=* | --bin=* | --bi=*)
-    bindir=$ac_optarg ;;
-
-  -build | --build | --buil | --bui | --bu)
-    ac_prev=build_alias ;;
-  -build=* | --build=* | --buil=* | --bui=* | --bu=*)
-    build_alias=$ac_optarg ;;
-
-  -cache-file | --cache-file | --cache-fil | --cache-fi \
-  | --cache-f | --cache- | --cache | --cach | --cac | --ca | --c)
-    ac_prev=cache_file ;;
-  -cache-file=* | --cache-file=* | --cache-fil=* | --cache-fi=* \
-  | --cache-f=* | --cache-=* | --cache=* | --cach=* | --cac=* | --ca=* | --c=*)
-    cache_file=$ac_optarg ;;
-
-  --config-cache | -C)
-    cache_file=config.cache ;;
-
-  -datadir | --datadir | --datadi | --datad | --data | --dat | --da)
-    ac_prev=datadir ;;
-  -datadir=* | --datadir=* | --datadi=* | --datad=* | --data=* | --dat=* \
-  | --da=*)
-    datadir=$ac_optarg ;;
-
-  -disable-* | --disable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    eval "enable_$ac_feature=no" ;;
-
-  -enable-* | --enable-*)
-    ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-   { (exit 1); exit 1; }; }
-    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "enable_$ac_feature='$ac_optarg'" ;;
-
-  -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-  | --exec-pref | --exec-pre | --exec-pr | --exec-p | --exec- \
-  | --exec | --exe | --ex)
-    ac_prev=exec_prefix ;;
-  -exec-prefix=* | --exec_prefix=* | --exec-prefix=* | --exec-prefi=* \
-  | --exec-pref=* | --exec-pre=* | --exec-pr=* | --exec-p=* | --exec-=* \
-  | --exec=* | --exe=* | --ex=*)
-    exec_prefix=$ac_optarg ;;
-
-  -gas | --gas | --ga | --g)
-    # Obsolete; use --with-gas.
-    with_gas=yes ;;
-
-  -help | --help | --hel | --he | -h)
-    ac_init_help=long ;;
-  -help=r* | --help=r* | --hel=r* | --he=r* | -hr*)
-    ac_init_help=recursive ;;
-  -help=s* | --help=s* | --hel=s* | --he=s* | -hs*)
-    ac_init_help=short ;;
-
-  -host | --host | --hos | --ho)
-    ac_prev=host_alias ;;
-  -host=* | --host=* | --hos=* | --ho=*)
-    host_alias=$ac_optarg ;;
-
-  -includedir | --includedir | --includedi | --included | --include \
-  | --includ | --inclu | --incl | --inc)
-    ac_prev=includedir ;;
-  -includedir=* | --includedir=* | --includedi=* | --included=* | --include=* \
-  | --includ=* | --inclu=* | --incl=* | --inc=*)
-    includedir=$ac_optarg ;;
-
-  -infodir | --infodir | --infodi | --infod | --info | --inf)
-    ac_prev=infodir ;;
-  -infodir=* | --infodir=* | --infodi=* | --infod=* | --info=* | --inf=*)
-    infodir=$ac_optarg ;;
-
-  -libdir | --libdir | --libdi | --libd)
-    ac_prev=libdir ;;
-  -libdir=* | --libdir=* | --libdi=* | --libd=*)
-    libdir=$ac_optarg ;;
-
-  -libexecdir | --libexecdir | --libexecdi | --libexecd | --libexec \
-  | --libexe | --libex | --libe)
-    ac_prev=libexecdir ;;
-  -libexecdir=* | --libexecdir=* | --libexecdi=* | --libexecd=* | --libexec=* \
-  | --libexe=* | --libex=* | --libe=*)
-    libexecdir=$ac_optarg ;;
-
-  -localstatedir | --localstatedir | --localstatedi | --localstated \
-  | --localstate | --localstat | --localsta | --localst \
-  | --locals | --local | --loca | --loc | --lo)
-    ac_prev=localstatedir ;;
-  -localstatedir=* | --localstatedir=* | --localstatedi=* | --localstated=* \
-  | --localstate=* | --localstat=* | --localsta=* | --localst=* \
-  | --locals=* | --local=* | --loca=* | --loc=* | --lo=*)
-    localstatedir=$ac_optarg ;;
-
-  -mandir | --mandir | --mandi | --mand | --man | --ma | --m)
-    ac_prev=mandir ;;
-  -mandir=* | --mandir=* | --mandi=* | --mand=* | --man=* | --ma=* | --m=*)
-    mandir=$ac_optarg ;;
-
-  -nfp | --nfp | --nf)
-    # Obsolete; use --without-fp.
-    with_fp=no ;;
-
-  -no-create | --no-create | --no-creat | --no-crea | --no-cre \
-  | --no-cr | --no-c | -n)
-    no_create=yes ;;
-
-  -no-recursion | --no-recursion | --no-recursio | --no-recursi \
-  | --no-recurs | --no-recur | --no-recu | --no-rec | --no-re | --no-r)
-    no_recursion=yes ;;
-
-  -oldincludedir | --oldincludedir | --oldincludedi | --oldincluded \
-  | --oldinclude | --oldinclud | --oldinclu | --oldincl | --oldinc \
-  | --oldin | --oldi | --old | --ol | --o)
-    ac_prev=oldincludedir ;;
-  -oldincludedir=* | --oldincludedir=* | --oldincludedi=* | --oldincluded=* \
-  | --oldinclude=* | --oldinclud=* | --oldinclu=* | --oldincl=* | --oldinc=* \
-  | --oldin=* | --oldi=* | --old=* | --ol=* | --o=*)
-    oldincludedir=$ac_optarg ;;
-
-  -prefix | --prefix | --prefi | --pref | --pre | --pr | --p)
-    ac_prev=prefix ;;
-  -prefix=* | --prefix=* | --prefi=* | --pref=* | --pre=* | --pr=* | --p=*)
-    prefix=$ac_optarg ;;
-
-  -program-prefix | --program-prefix | --program-prefi | --program-pref \
-  | --program-pre | --program-pr | --program-p)
-    ac_prev=program_prefix ;;
-  -program-prefix=* | --program-prefix=* | --program-prefi=* \
-  | --program-pref=* | --program-pre=* | --program-pr=* | --program-p=*)
-    program_prefix=$ac_optarg ;;
-
-  -program-suffix | --program-suffix | --program-suffi | --program-suff \
-  | --program-suf | --program-su | --program-s)
-    ac_prev=program_suffix ;;
-  -program-suffix=* | --program-suffix=* | --program-suffi=* \
-  | --program-suff=* | --program-suf=* | --program-su=* | --program-s=*)
-    program_suffix=$ac_optarg ;;
-
-  -program-transform-name | --program-transform-name \
-  | --program-transform-nam | --program-transform-na \
-  | --program-transform-n | --program-transform- \
-  | --program-transform | --program-transfor \
-  | --program-transfo | --program-transf \
-  | --program-trans | --program-tran \
-  | --progr-tra | --program-tr | --program-t)
-    ac_prev=program_transform_name ;;
-  -program-transform-name=* | --program-transform-name=* \
-  | --program-transform-nam=* | --program-transform-na=* \
-  | --program-transform-n=* | --program-transform-=* \
-  | --program-transform=* | --program-transfor=* \
-  | --program-transfo=* | --program-transf=* \
-  | --program-trans=* | --program-tran=* \
-  | --progr-tra=* | --program-tr=* | --program-t=*)
-    program_transform_name=$ac_optarg ;;
-
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil)
-    silent=yes ;;
-
-  -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
-    ac_prev=sbindir ;;
-  -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
-  | --sbi=* | --sb=*)
-    sbindir=$ac_optarg ;;
-
-  -sharedstatedir | --sharedstatedir | --sharedstatedi \
-  | --sharedstated | --sharedstate | --sharedstat | --sharedsta \
-  | --sharedst | --shareds | --shared | --share | --shar \
-  | --sha | --sh)
-    ac_prev=sharedstatedir ;;
-  -sharedstatedir=* | --sharedstatedir=* | --sharedstatedi=* \
-  | --sharedstated=* | --sharedstate=* | --sharedstat=* | --sharedsta=* \
-  | --sharedst=* | --shareds=* | --shared=* | --share=* | --shar=* \
-  | --sha=* | --sh=*)
-    sharedstatedir=$ac_optarg ;;
-
-  -site | --site | --sit)
-    ac_prev=site ;;
-  -site=* | --site=* | --sit=*)
-    site=$ac_optarg ;;
-
-  -srcdir | --srcdir | --srcdi | --srcd | --src | --sr)
-    ac_prev=srcdir ;;
-  -srcdir=* | --srcdir=* | --srcdi=* | --srcd=* | --src=* | --sr=*)
-    srcdir=$ac_optarg ;;
-
-  -sysconfdir | --sysconfdir | --sysconfdi | --sysconfd | --sysconf \
-  | --syscon | --sysco | --sysc | --sys | --sy)
-    ac_prev=sysconfdir ;;
-  -sysconfdir=* | --sysconfdir=* | --sysconfdi=* | --sysconfd=* | --sysconf=* \
-  | --syscon=* | --sysco=* | --sysc=* | --sys=* | --sy=*)
-    sysconfdir=$ac_optarg ;;
-
-  -target | --target | --targe | --targ | --tar | --ta | --t)
-    ac_prev=target_alias ;;
-  -target=* | --target=* | --targe=* | --targ=* | --tar=* | --ta=* | --t=*)
-    target_alias=$ac_optarg ;;
-
-  -v | -verbose | --verbose | --verbos | --verbo | --verb)
-    verbose=yes ;;
-
-  -version | --version | --versio | --versi | --vers | -V)
-    ac_init_version=: ;;
-
-  -with-* | --with-*)
-    ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package| sed 's/-/_/g'`
-    case $ac_option in
-      *=*) ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`;;
-      *) ac_optarg=yes ;;
-    esac
-    eval "with_$ac_package='$ac_optarg'" ;;
-
-  -without-* | --without-*)
-    ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid package name: $ac_package" >&2
-   { (exit 1); exit 1; }; }
-    ac_package=`echo $ac_package | sed 's/-/_/g'`
-    eval "with_$ac_package=no" ;;
-
-  --x)
-    # Obsolete; use --with-x.
-    with_x=yes ;;
-
-  -x-includes | --x-includes | --x-include | --x-includ | --x-inclu \
-  | --x-incl | --x-inc | --x-in | --x-i)
-    ac_prev=x_includes ;;
-  -x-includes=* | --x-includes=* | --x-include=* | --x-includ=* | --x-inclu=* \
-  | --x-incl=* | --x-inc=* | --x-in=* | --x-i=*)
-    x_includes=$ac_optarg ;;
-
-  -x-libraries | --x-libraries | --x-librarie | --x-librari \
-  | --x-librar | --x-libra | --x-libr | --x-lib | --x-li | --x-l)
-    ac_prev=x_libraries ;;
-  -x-libraries=* | --x-libraries=* | --x-librarie=* | --x-librari=* \
-  | --x-librar=* | --x-libra=* | --x-libr=* | --x-lib=* | --x-li=* | --x-l=*)
-    x_libraries=$ac_optarg ;;
-
-  -*) { echo "$as_me: error: unrecognized option: $ac_option
-Try \`$0 --help' for more information." >&2
-   { (exit 1); exit 1; }; }
-    ;;
-
-  *=*)
-    ac_envvar=`expr "x$ac_option" : 'x\([^=]*\)='`
-    # Reject names that are not valid shell variable names.
-    expr "x$ac_envvar" : ".*[^_$as_cr_alnum]" >/dev/null &&
-      { echo "$as_me: error: invalid variable name: $ac_envvar" >&2
-   { (exit 1); exit 1; }; }
-    ac_optarg=`echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"`
-    eval "$ac_envvar='$ac_optarg'"
-    export $ac_envvar ;;
-
-  *)
-    # FIXME: should be removed in autoconf 3.0.
-    echo "$as_me: WARNING: you should use --build, --host, --target" >&2
-    expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-      echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
-    ;;
-
-  esac
-done
-
-if test -n "$ac_prev"; then
-  ac_option=--`echo $ac_prev | sed 's/_/-/g'`
-  { echo "$as_me: error: missing argument to $ac_option" >&2
-   { (exit 1); exit 1; }; }
-fi
-
-# Be sure to have absolute paths.
-for ac_var in exec_prefix prefix
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* | NONE | '' ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# Be sure to have absolute paths.
-for ac_var in bindir sbindir libexecdir datadir sysconfdir sharedstatedir \
-	      localstatedir libdir includedir oldincludedir infodir mandir
-do
-  eval ac_val=$`echo $ac_var`
-  case $ac_val in
-    [\\/$]* | ?:[\\/]* ) ;;
-    *)  { echo "$as_me: error: expected an absolute directory name for --$ac_var: $ac_val" >&2
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# There might be people who depend on the old broken behavior: `$host'
-# used to hold the argument of --host etc.
-# FIXME: To remove some day.
-build=$build_alias
-host=$host_alias
-target=$target_alias
-
-# FIXME: To remove some day.
-if test "x$host_alias" != x; then
-  if test "x$build_alias" = x; then
-    cross_compiling=maybe
-    echo "$as_me: WARNING: If you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used." >&2
-  elif test "x$build_alias" != "x$host_alias"; then
-    cross_compiling=yes
-  fi
-fi
-
-ac_tool_prefix=
-test -n "$host_alias" && ac_tool_prefix=$host_alias-
-
-test "$silent" = yes && exec 6>/dev/null
-
-
-# Find the source files, if location was not specified.
-if test -z "$srcdir"; then
-  ac_srcdir_defaulted=yes
-  # Try the directory containing this script, then its parent.
-  ac_confdir=`(dirname "$0") 2>/dev/null ||
-$as_expr X"$0" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$0" : 'X\(//\)[^/]' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$0" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  srcdir=$ac_confdir
-  if test ! -r $srcdir/$ac_unique_file; then
-    srcdir=..
-  fi
-else
-  ac_srcdir_defaulted=no
-fi
-if test ! -r $srcdir/$ac_unique_file; then
-  if test "$ac_srcdir_defaulted" = yes; then
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $ac_confdir or .." >&2
-   { (exit 1); exit 1; }; }
-  else
-    { echo "$as_me: error: cannot find sources ($ac_unique_file) in $srcdir" >&2
-   { (exit 1); exit 1; }; }
-  fi
-fi
-(cd $srcdir && test -r ./$ac_unique_file) 2>/dev/null ||
-  { echo "$as_me: error: sources are in $srcdir, but \`cd $srcdir' does not work" >&2
-   { (exit 1); exit 1; }; }
-srcdir=`echo "$srcdir" | sed 's%\([^\\/]\)[\\/]*$%\1%'`
-ac_env_build_alias_set=${build_alias+set}
-ac_env_build_alias_value=$build_alias
-ac_cv_env_build_alias_set=${build_alias+set}
-ac_cv_env_build_alias_value=$build_alias
-ac_env_host_alias_set=${host_alias+set}
-ac_env_host_alias_value=$host_alias
-ac_cv_env_host_alias_set=${host_alias+set}
-ac_cv_env_host_alias_value=$host_alias
-ac_env_target_alias_set=${target_alias+set}
-ac_env_target_alias_value=$target_alias
-ac_cv_env_target_alias_set=${target_alias+set}
-ac_cv_env_target_alias_value=$target_alias
-ac_env_CC_set=${CC+set}
-ac_env_CC_value=$CC
-ac_cv_env_CC_set=${CC+set}
-ac_cv_env_CC_value=$CC
-ac_env_CFLAGS_set=${CFLAGS+set}
-ac_env_CFLAGS_value=$CFLAGS
-ac_cv_env_CFLAGS_set=${CFLAGS+set}
-ac_cv_env_CFLAGS_value=$CFLAGS
-ac_env_LDFLAGS_set=${LDFLAGS+set}
-ac_env_LDFLAGS_value=$LDFLAGS
-ac_cv_env_LDFLAGS_set=${LDFLAGS+set}
-ac_cv_env_LDFLAGS_value=$LDFLAGS
-ac_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_env_CPPFLAGS_value=$CPPFLAGS
-ac_cv_env_CPPFLAGS_set=${CPPFLAGS+set}
-ac_cv_env_CPPFLAGS_value=$CPPFLAGS
-ac_env_CPP_set=${CPP+set}
-ac_env_CPP_value=$CPP
-ac_cv_env_CPP_set=${CPP+set}
-ac_cv_env_CPP_value=$CPP
-ac_env_CXX_set=${CXX+set}
-ac_env_CXX_value=$CXX
-ac_cv_env_CXX_set=${CXX+set}
-ac_cv_env_CXX_value=$CXX
-ac_env_CXXFLAGS_set=${CXXFLAGS+set}
-ac_env_CXXFLAGS_value=$CXXFLAGS
-ac_cv_env_CXXFLAGS_set=${CXXFLAGS+set}
-ac_cv_env_CXXFLAGS_value=$CXXFLAGS
-ac_env_CXXCPP_set=${CXXCPP+set}
-ac_env_CXXCPP_value=$CXXCPP
-ac_cv_env_CXXCPP_set=${CXXCPP+set}
-ac_cv_env_CXXCPP_value=$CXXCPP
-ac_env_F77_set=${F77+set}
-ac_env_F77_value=$F77
-ac_cv_env_F77_set=${F77+set}
-ac_cv_env_F77_value=$F77
-ac_env_FFLAGS_set=${FFLAGS+set}
-ac_env_FFLAGS_value=$FFLAGS
-ac_cv_env_FFLAGS_set=${FFLAGS+set}
-ac_cv_env_FFLAGS_value=$FFLAGS
-ac_env_PKG_CONFIG_set=${PKG_CONFIG+set}
-ac_env_PKG_CONFIG_value=$PKG_CONFIG
-ac_cv_env_PKG_CONFIG_set=${PKG_CONFIG+set}
-ac_cv_env_PKG_CONFIG_value=$PKG_CONFIG
-ac_env_GHOSD_CFLAGS_set=${GHOSD_CFLAGS+set}
-ac_env_GHOSD_CFLAGS_value=$GHOSD_CFLAGS
-ac_cv_env_GHOSD_CFLAGS_set=${GHOSD_CFLAGS+set}
-ac_cv_env_GHOSD_CFLAGS_value=$GHOSD_CFLAGS
-ac_env_GHOSD_LIBS_set=${GHOSD_LIBS+set}
-ac_env_GHOSD_LIBS_value=$GHOSD_LIBS
-ac_cv_env_GHOSD_LIBS_set=${GHOSD_LIBS+set}
-ac_cv_env_GHOSD_LIBS_value=$GHOSD_LIBS
-ac_env_GHOSD_EXAMPLE_CFLAGS_set=${GHOSD_EXAMPLE_CFLAGS+set}
-ac_env_GHOSD_EXAMPLE_CFLAGS_value=$GHOSD_EXAMPLE_CFLAGS
-ac_cv_env_GHOSD_EXAMPLE_CFLAGS_set=${GHOSD_EXAMPLE_CFLAGS+set}
-ac_cv_env_GHOSD_EXAMPLE_CFLAGS_value=$GHOSD_EXAMPLE_CFLAGS
-ac_env_GHOSD_EXAMPLE_LIBS_set=${GHOSD_EXAMPLE_LIBS+set}
-ac_env_GHOSD_EXAMPLE_LIBS_value=$GHOSD_EXAMPLE_LIBS
-ac_cv_env_GHOSD_EXAMPLE_LIBS_set=${GHOSD_EXAMPLE_LIBS+set}
-ac_cv_env_GHOSD_EXAMPLE_LIBS_value=$GHOSD_EXAMPLE_LIBS
-
-#
-# Report the --help message.
-#
-if test "$ac_init_help" = "long"; then
-  # Omit some internal or obsolete options to make the list less imposing.
-  # This message is too long to be a string in the A/UX 3.1 sh.
-  cat <<_ACEOF
-\`configure' configures ghosd 0.0.1 to adapt to many kinds of systems.
-
-Usage: $0 [OPTION]... [VAR=VALUE]...
-
-To assign environment variables (e.g., CC, CFLAGS...), specify them as
-VAR=VALUE.  See below for descriptions of some of the useful variables.
-
-Defaults for the options are specified in brackets.
-
-Configuration:
-  -h, --help              display this help and exit
-      --help=short        display options specific to this package
-      --help=recursive    display the short help of all the included packages
-  -V, --version           display version information and exit
-  -q, --quiet, --silent   do not print \`checking...' messages
-      --cache-file=FILE   cache test results in FILE [disabled]
-  -C, --config-cache      alias for \`--cache-file=config.cache'
-  -n, --no-create         do not create output files
-      --srcdir=DIR        find the sources in DIR [configure dir or \`..']
-
-_ACEOF
-
-  cat <<_ACEOF
-Installation directories:
-  --prefix=PREFIX         install architecture-independent files in PREFIX
-			  [$ac_default_prefix]
-  --exec-prefix=EPREFIX   install architecture-dependent files in EPREFIX
-			  [PREFIX]
-
-By default, \`make install' will install all the files in
-\`$ac_default_prefix/bin', \`$ac_default_prefix/lib' etc.  You can specify
-an installation prefix other than \`$ac_default_prefix' using \`--prefix',
-for instance \`--prefix=\$HOME'.
-
-For better control, use the options below.
-
-Fine tuning of the installation directories:
-  --bindir=DIR           user executables [EPREFIX/bin]
-  --sbindir=DIR          system admin executables [EPREFIX/sbin]
-  --libexecdir=DIR       program executables [EPREFIX/libexec]
-  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
-  --sysconfdir=DIR       read-only single-machine data [PREFIX/etc]
-  --sharedstatedir=DIR   modifiable architecture-independent data [PREFIX/com]
-  --localstatedir=DIR    modifiable single-machine data [PREFIX/var]
-  --libdir=DIR           object code libraries [EPREFIX/lib]
-  --includedir=DIR       C header files [PREFIX/include]
-  --oldincludedir=DIR    C header files for non-gcc [/usr/include]
-  --infodir=DIR          info documentation [PREFIX/info]
-  --mandir=DIR           man documentation [PREFIX/man]
-_ACEOF
-
-  cat <<\_ACEOF
-
-Program names:
-  --program-prefix=PREFIX            prepend PREFIX to installed program names
-  --program-suffix=SUFFIX            append SUFFIX to installed program names
-  --program-transform-name=PROGRAM   run sed PROGRAM on installed program names
-
-System types:
-  --build=BUILD     configure for building on BUILD [guessed]
-  --host=HOST       cross-compile to build programs to run on HOST [BUILD]
-_ACEOF
-fi
-
-if test -n "$ac_init_help"; then
-  case $ac_init_help in
-     short | recursive ) echo "Configuration of ghosd 0.0.1:";;
-   esac
-  cat <<\_ACEOF
-
-Optional Features:
-  --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
-  --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-maintainer-mode  enable make rules and dependencies not useful
-			  (and sometimes confusing) to the casual installer
-  --disable-dependency-tracking  speeds up one-time build
-  --enable-dependency-tracking   do not reject slow dependency extractors
-  --enable-shared[=PKGS]
-                          build shared libraries [default=yes]
-  --enable-static[=PKGS]
-                          build static libraries [default=yes]
-  --enable-fast-install[=PKGS]
-                          optimize for fast installation [default=yes]
-  --disable-libtool-lock  avoid locking (might break parallel builds)
-  --enable-pango          use pango (default on)
-  --enable-gtk-doc        use gtk-doc to build documentation default=no
-
-Optional Packages:
-  --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
-  --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-  --with-pic              try to use only PIC/non-PIC objects [default=use
-                          both]
-  --with-tags[=TAGS]
-                          include additional configurations [automatic]
-  --with-html-dir=PATH    path to installed docs
-
-Some influential environment variables:
-  CC          C compiler command
-  CFLAGS      C compiler flags
-  LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-              nonstandard directory <lib dir>
-  CPPFLAGS    C/C++ preprocessor flags, e.g. -I<include dir> if you have
-              headers in a nonstandard directory <include dir>
-  CPP         C preprocessor
-  CXX         C++ compiler command
-  CXXFLAGS    C++ compiler flags
-  CXXCPP      C++ preprocessor
-  F77         Fortran 77 compiler command
-  FFLAGS      Fortran 77 compiler flags
-  PKG_CONFIG  path to pkg-config utility
-  GHOSD_CFLAGS
-              C compiler flags for GHOSD, overriding pkg-config
-  GHOSD_LIBS  linker flags for GHOSD, overriding pkg-config
-  GHOSD_EXAMPLE_CFLAGS
-              C compiler flags for GHOSD_EXAMPLE, overriding pkg-config
-  GHOSD_EXAMPLE_LIBS
-              linker flags for GHOSD_EXAMPLE, overriding pkg-config
-
-Use these variables to override the choices made by `configure' or to help
-it to find libraries and programs with nonstandard names/locations.
-
-Report bugs to <martine@danga.com>.
-_ACEOF
-fi
-
-if test "$ac_init_help" = "recursive"; then
-  # If there are subdirs, report their specific --help.
-  ac_popdir=`pwd`
-  for ac_dir in : $ac_subdirs_all; do test "x$ac_dir" = x: && continue
-    test -d $ac_dir || continue
-    ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-    cd $ac_dir
-    # Check for guested configure; otherwise get Cygnus style configure.
-    if test -f $ac_srcdir/configure.gnu; then
-      echo
-      $SHELL $ac_srcdir/configure.gnu  --help=recursive
-    elif test -f $ac_srcdir/configure; then
-      echo
-      $SHELL $ac_srcdir/configure  --help=recursive
-    elif test -f $ac_srcdir/configure.ac ||
-	   test -f $ac_srcdir/configure.in; then
-      echo
-      $ac_configure --help
-    else
-      echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
-    fi
-    cd "$ac_popdir"
-  done
-fi
-
-test -n "$ac_init_help" && exit 0
-if $ac_init_version; then
-  cat <<\_ACEOF
-ghosd configure 0.0.1
-generated by GNU Autoconf 2.59
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This configure script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it.
-_ACEOF
-  exit 0
-fi
-exec 5>config.log
-cat >&5 <<_ACEOF
-This file contains any messages produced by compilers while
-running configure, to aid debugging if configure makes a mistake.
-
-It was created by ghosd $as_me 0.0.1, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  $ $0 $@
-
-_ACEOF
-{
-cat <<_ASUNAME
-## --------- ##
-## Platform. ##
-## --------- ##
-
-hostname = `(hostname || uname -n) 2>/dev/null | sed 1q`
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null || echo unknown`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null     || echo unknown`
-
-/bin/arch              = `(/bin/arch) 2>/dev/null              || echo unknown`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null       || echo unknown`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null || echo unknown`
-hostinfo               = `(hostinfo) 2>/dev/null               || echo unknown`
-/bin/machine           = `(/bin/machine) 2>/dev/null           || echo unknown`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null       || echo unknown`
-/bin/universe          = `(/bin/universe) 2>/dev/null          || echo unknown`
-
-_ASUNAME
-
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  echo "PATH: $as_dir"
-done
-
-} >&5
-
-cat >&5 <<_ACEOF
-
-
-## ----------- ##
-## Core tests. ##
-## ----------- ##
-
-_ACEOF
-
-
-# Keep a trace of the command line.
-# Strip out --no-create and --no-recursion so they do not pile up.
-# Strip out --silent because we don't want to record it for future runs.
-# Also quote any args containing shell meta-characters.
-# Make two passes to allow for proper duplicate-argument suppression.
-ac_configure_args=
-ac_configure_args0=
-ac_configure_args1=
-ac_sep=
-ac_must_keep_next=false
-for ac_pass in 1 2
-do
-  for ac_arg
-  do
-    case $ac_arg in
-    -no-create | --no-c* | -n | -no-recursion | --no-r*) continue ;;
-    -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-    | -silent | --silent | --silen | --sile | --sil)
-      continue ;;
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=`echo "$ac_arg" | sed "s/'/'\\\\\\\\''/g"` ;;
-    esac
-    case $ac_pass in
-    1) ac_configure_args0="$ac_configure_args0 '$ac_arg'" ;;
-    2)
-      ac_configure_args1="$ac_configure_args1 '$ac_arg'"
-      if test $ac_must_keep_next = true; then
-	ac_must_keep_next=false # Got value, back to normal.
-      else
-	case $ac_arg in
-	  *=* | --config-cache | -C | -disable-* | --disable-* \
-	  | -enable-* | --enable-* | -gas | --g* | -nfp | --nf* \
-	  | -q | -quiet | --q* | -silent | --sil* | -v | -verb* \
-	  | -with-* | --with-* | -without-* | --without-* | --x)
-	    case "$ac_configure_args0 " in
-	      "$ac_configure_args1"*" '$ac_arg' "* ) continue ;;
-	    esac
-	    ;;
-	  -* ) ac_must_keep_next=true ;;
-	esac
-      fi
-      ac_configure_args="$ac_configure_args$ac_sep'$ac_arg'"
-      # Get rid of the leading space.
-      ac_sep=" "
-      ;;
-    esac
-  done
-done
-$as_unset ac_configure_args0 || test "${ac_configure_args0+set}" != set || { ac_configure_args0=; export ac_configure_args0; }
-$as_unset ac_configure_args1 || test "${ac_configure_args1+set}" != set || { ac_configure_args1=; export ac_configure_args1; }
-
-# When interrupted or exit'd, cleanup temporary files, and complete
-# config.log.  We remove comments because anyway the quotes in there
-# would cause problems or look ugly.
-# WARNING: Be sure not to use single quotes in there, as some shells,
-# such as our DU 5.0 friend, will then `close' the trap.
-trap 'exit_status=$?
-  # Save into config.log some information that might help in debugging.
-  {
-    echo
-
-    cat <<\_ASBOX
-## ---------------- ##
-## Cache variables. ##
-## ---------------- ##
-_ASBOX
-    echo
-    # The following way of writing the cache mishandles newlines in values,
-{
-  (set) 2>&1 |
-    case `(ac_space='"'"' '"'"'; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      sed -n \
-	"s/'"'"'/'"'"'\\\\'"'"''"'"'/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='"'"'\\2'"'"'/p"
-      ;;
-    *)
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-}
-    echo
-
-    cat <<\_ASBOX
-## ----------------- ##
-## Output variables. ##
-## ----------------- ##
-_ASBOX
-    echo
-    for ac_var in $ac_subst_vars
-    do
-      eval ac_val=$`echo $ac_var`
-      echo "$ac_var='"'"'$ac_val'"'"'"
-    done | sort
-    echo
-
-    if test -n "$ac_subst_files"; then
-      cat <<\_ASBOX
-## ------------- ##
-## Output files. ##
-## ------------- ##
-_ASBOX
-      echo
-      for ac_var in $ac_subst_files
-      do
-	eval ac_val=$`echo $ac_var`
-	echo "$ac_var='"'"'$ac_val'"'"'"
-      done | sort
-      echo
-    fi
-
-    if test -s confdefs.h; then
-      cat <<\_ASBOX
-## ----------- ##
-## confdefs.h. ##
-## ----------- ##
-_ASBOX
-      echo
-      sed "/^$/d" confdefs.h | sort
-      echo
-    fi
-    test "$ac_signal" != 0 &&
-      echo "$as_me: caught signal $ac_signal"
-    echo "$as_me: exit $exit_status"
-  } >&5
-  rm -f core *.core &&
-  rm -rf conftest* confdefs* conf$$* $ac_clean_files &&
-    exit $exit_status
-     ' 0
-for ac_signal in 1 2 13 15; do
-  trap 'ac_signal='$ac_signal'; { (exit 1); exit 1; }' $ac_signal
-done
-ac_signal=0
-
-# confdefs.h avoids OS command line length limits that DEFS can exceed.
-rm -rf conftest* confdefs.h
-# AIX cpp loses on an empty file, so make sure it contains at least a newline.
-echo >confdefs.h
-
-# Predefined preprocessor variables.
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_NAME "$PACKAGE_NAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_TARNAME "$PACKAGE_TARNAME"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_VERSION "$PACKAGE_VERSION"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_STRING "$PACKAGE_STRING"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE_BUGREPORT "$PACKAGE_BUGREPORT"
-_ACEOF
-
-
-# Let the site file select an alternate cache file if it wants to.
-# Prefer explicitly selected file to automatically selected ones.
-if test -z "$CONFIG_SITE"; then
-  if test "x$prefix" != xNONE; then
-    CONFIG_SITE="$prefix/share/config.site $prefix/etc/config.site"
-  else
-    CONFIG_SITE="$ac_default_prefix/share/config.site $ac_default_prefix/etc/config.site"
-  fi
-fi
-for ac_site_file in $CONFIG_SITE; do
-  if test -r "$ac_site_file"; then
-    { echo "$as_me:$LINENO: loading site script $ac_site_file" >&5
-echo "$as_me: loading site script $ac_site_file" >&6;}
-    sed 's/^/| /' "$ac_site_file" >&5
-    . "$ac_site_file"
-  fi
-done
-
-if test -r "$cache_file"; then
-  # Some versions of bash will fail to source /dev/null (special
-  # files actually), so we avoid doing that.
-  if test -f "$cache_file"; then
-    { echo "$as_me:$LINENO: loading cache $cache_file" >&5
-echo "$as_me: loading cache $cache_file" >&6;}
-    case $cache_file in
-      [\\/]* | ?:[\\/]* ) . $cache_file;;
-      *)                      . ./$cache_file;;
-    esac
-  fi
-else
-  { echo "$as_me:$LINENO: creating cache $cache_file" >&5
-echo "$as_me: creating cache $cache_file" >&6;}
-  >$cache_file
-fi
-
-# Check that the precious variables saved in the cache have kept the same
-# value.
-ac_cache_corrupted=false
-for ac_var in `(set) 2>&1 |
-	       sed -n 's/^ac_env_\([a-zA-Z_0-9]*\)_set=.*/\1/p'`; do
-  eval ac_old_set=\$ac_cv_env_${ac_var}_set
-  eval ac_new_set=\$ac_env_${ac_var}_set
-  eval ac_old_val="\$ac_cv_env_${ac_var}_value"
-  eval ac_new_val="\$ac_env_${ac_var}_value"
-  case $ac_old_set,$ac_new_set in
-    set,)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,set)
-      { echo "$as_me:$LINENO: error: \`$ac_var' was not set in the previous run" >&5
-echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
-      ac_cache_corrupted=: ;;
-    ,);;
-    *)
-      if test "x$ac_old_val" != "x$ac_new_val"; then
-	{ echo "$as_me:$LINENO: error: \`$ac_var' has changed since the previous run:" >&5
-echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-	{ echo "$as_me:$LINENO:   former value:  $ac_old_val" >&5
-echo "$as_me:   former value:  $ac_old_val" >&2;}
-	{ echo "$as_me:$LINENO:   current value: $ac_new_val" >&5
-echo "$as_me:   current value: $ac_new_val" >&2;}
-	ac_cache_corrupted=:
-      fi;;
-  esac
-  # Pass precious variables to config.status.
-  if test "$ac_new_set" = set; then
-    case $ac_new_val in
-    *" "*|*"	"*|*[\[\]\~\#\$\^\&\*\(\)\{\}\\\|\;\<\>\?\"\']*)
-      ac_arg=$ac_var=`echo "$ac_new_val" | sed "s/'/'\\\\\\\\''/g"` ;;
-    *) ac_arg=$ac_var=$ac_new_val ;;
-    esac
-    case " $ac_configure_args " in
-      *" '$ac_arg' "*) ;; # Avoid dups.  Use of quotes ensures accuracy.
-      *) ac_configure_args="$ac_configure_args '$ac_arg'" ;;
-    esac
-  fi
-done
-if $ac_cache_corrupted; then
-  { echo "$as_me:$LINENO: error: changes in the environment can compromise the build" >&5
-echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:$LINENO: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
-echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-          ac_config_headers="$ac_config_headers config.h"
-
-am__api_version="1.9"
-ac_aux_dir=
-for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-  if test -f $ac_dir/install-sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install-sh -c"
-    break
-  elif test -f $ac_dir/install.sh; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/install.sh -c"
-    break
-  elif test -f $ac_dir/shtool; then
-    ac_aux_dir=$ac_dir
-    ac_install_sh="$ac_aux_dir/shtool install -c"
-    break
-  fi
-done
-if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
-echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-ac_config_guess="$SHELL $ac_aux_dir/config.guess"
-ac_config_sub="$SHELL $ac_aux_dir/config.sub"
-ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
-
-# Find a good install program.  We prefer a C program (faster),
-# so one script is as good as another.  But avoid the broken or
-# incompatible versions:
-# SysV /etc/install, /usr/sbin/install
-# SunOS /usr/etc/install
-# IRIX /sbin/install
-# AIX /bin/install
-# AmigaOS /C/install, which installs bootblocks on floppy discs
-# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
-# AFS /usr/afsws/bin/install, which mishandles nonexistent args
-# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
-# OS/2's system install, which has a completely different semantic
-# ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:$LINENO: checking for a BSD-compatible install" >&5
-echo $ECHO_N "checking for a BSD-compatible install... $ECHO_C" >&6
-if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  # Account for people who put trailing slashes in PATH elements.
-case $as_dir/ in
-  ./ | .// | /cC/* | \
-  /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
-  ?:\\/os2\\/install\\/* | ?:\\/OS2\\/INSTALL\\/* | \
-  /usr/ucb/* ) ;;
-  *)
-    # OSF1 and SCO ODT 3.0 have their own names for install.
-    # Don't use installbsd from OSF since it installs stuff as root
-    # by default.
-    for ac_prog in ginstall scoinst install; do
-      for ac_exec_ext in '' $ac_executable_extensions; do
-	if $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
-	  if test $ac_prog = install &&
-	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # AIX install.  It has an incompatible calling convention.
-	    :
-	  elif test $ac_prog = install &&
-	    grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
-	    # program-specific install script used by HP pwplus--don't use.
-	    :
-	  else
-	    ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
-	    break 3
-	  fi
-	fi
-      done
-    done
-    ;;
-esac
-done
-
-
-fi
-  if test "${ac_cv_path_install+set}" = set; then
-    INSTALL=$ac_cv_path_install
-  else
-    # As a last resort, use the slow shell script.  We don't cache a
-    # path for INSTALL within a source directory, because that will
-    # break other packages using the cache if that directory is
-    # removed, or if the path is relative.
-    INSTALL=$ac_install_sh
-  fi
-fi
-echo "$as_me:$LINENO: result: $INSTALL" >&5
-echo "${ECHO_T}$INSTALL" >&6
-
-# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
-# It thinks the first close brace ends the variable substitution.
-test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
-
-test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
-
-test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
-
-echo "$as_me:$LINENO: checking whether build environment is sane" >&5
-echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
-# Just in case
-sleep 1
-echo timestamp > conftest.file
-# Do `set' in a subshell so we don't clobber the current shell's
-# arguments.  Must try -L first in case configure is actually a
-# symlink; some systems play weird games with the mod time of symlinks
-# (eg FreeBSD returns the mod time of the symlink's containing
-# directory).
-if (
-   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
-   if test "$*" = "X"; then
-      # -L didn't work.
-      set X `ls -t $srcdir/configure conftest.file`
-   fi
-   rm -f conftest.file
-   if test "$*" != "X $srcdir/configure conftest.file" \
-      && test "$*" != "X conftest.file $srcdir/configure"; then
-
-      # If neither matched, then we have a broken ls.  This can happen
-      # if, for instance, CONFIG_SHELL is bash and it inherits a
-      # broken ls alias from the environment.  This has actually
-      # happened.  Such a system could not be considered "sane".
-      { { echo "$as_me:$LINENO: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&5
-echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
-alias in your environment" >&2;}
-   { (exit 1); exit 1; }; }
-   fi
-
-   test "$2" = conftest.file
-   )
-then
-   # Ok.
-   :
-else
-   { { echo "$as_me:$LINENO: error: newly created file is older than distributed files!
-Check your system clock" >&5
-echo "$as_me: error: newly created file is older than distributed files!
-Check your system clock" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-test "$program_prefix" != NONE &&
-  program_transform_name="s,^,$program_prefix,;$program_transform_name"
-# Use a double $ so make ignores it.
-test "$program_suffix" != NONE &&
-  program_transform_name="s,\$,$program_suffix,;$program_transform_name"
-# Double any \ or $.  echo might interpret backslashes.
-# By default was `s,x,x', remove it if useless.
-cat <<\_ACEOF >conftest.sed
-s/[\\$]/&&/g;s/;s,x,x,$//
-_ACEOF
-program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
-rm conftest.sed
-
-# expand $ac_aux_dir to an absolute path
-am_aux_dir=`cd $ac_aux_dir && pwd`
-
-test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
-# Use eval to expand $SHELL
-if eval "$MISSING --run true"; then
-  am_missing_run="$MISSING --run "
-else
-  am_missing_run=
-  { echo "$as_me:$LINENO: WARNING: \`missing' script is too old or missing" >&5
-echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
-fi
-
-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
-  # We used to keeping the `.' as first argument, in order to
-  # allow $(mkdir_p) to be used without argument.  As in
-  #   $(mkdir_p) $(somedir)
-  # where $(somedir) is conditionally defined.  However this is wrong
-  # for two reasons:
-  #  1. if the package is installed by a user who cannot write `.'
-  #     make install will fail,
-  #  2. the above comment should most certainly read
-  #     $(mkdir_p) $(DESTDIR)$(somedir)
-  #     so it does not work when $(somedir) is undefined and
-  #     $(DESTDIR) is not.
-  #  To support the latter case, we have to write
-  #     test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
-  #  so the `.' trick is pointless.
-  mkdir_p='mkdir -p --'
-else
-  # On NextStep and OpenStep, the `mkdir' command does not
-  # recognize any option.  It will interpret all options as
-  # directories to create, and then abort because `.' already
-  # exists.
-  for d in ./-p ./--version;
-  do
-    test -d $d && rmdir $d
-  done
-  # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
-  if test -f "$ac_aux_dir/mkinstalldirs"; then
-    mkdir_p='$(mkinstalldirs)'
-  else
-    mkdir_p='$(install_sh) -d'
-  fi
-fi
-
-for ac_prog in gawk mawk nawk awk
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_AWK+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$AWK"; then
-  ac_cv_prog_AWK="$AWK" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AWK="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-AWK=$ac_cv_prog_AWK
-if test -n "$AWK"; then
-  echo "$as_me:$LINENO: result: $AWK" >&5
-echo "${ECHO_T}$AWK" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$AWK" && break
-done
-
-echo "$as_me:$LINENO: checking whether ${MAKE-make} sets \$(MAKE)" >&5
-echo $ECHO_N "checking whether ${MAKE-make} sets \$(MAKE)... $ECHO_C" >&6
-set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,:./+-,___p_,'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.make <<\_ACEOF
-all:
-	@echo 'ac_maketemp="$(MAKE)"'
-_ACEOF
-# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
-eval `${MAKE-make} -f conftest.make 2>/dev/null | grep temp=`
-if test -n "$ac_maketemp"; then
-  eval ac_cv_prog_make_${ac_make}_set=yes
-else
-  eval ac_cv_prog_make_${ac_make}_set=no
-fi
-rm -f conftest.make
-fi
-if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-  SET_MAKE=
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-  SET_MAKE="MAKE=${MAKE-make}"
-fi
-
-rm -rf .tst 2>/dev/null
-mkdir .tst 2>/dev/null
-if test -d .tst; then
-  am__leading_dot=.
-else
-  am__leading_dot=_
-fi
-rmdir .tst 2>/dev/null
-
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
-   test -f $srcdir/config.status; then
-  { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-
-
-# Define the identity of the package.
- PACKAGE='ghosd'
- VERSION='0.0.1'
-
-
-cat >>confdefs.h <<_ACEOF
-#define PACKAGE "$PACKAGE"
-_ACEOF
-
-
-cat >>confdefs.h <<_ACEOF
-#define VERSION "$VERSION"
-_ACEOF
-
-# Some tools Automake needs.
-
-ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
-
-
-AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
-
-
-AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
-
-
-AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
-
-
-MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
-
-# Installed binaries are usually stripped using `strip' when the user
-# run `make install-strip'.  However `strip' might not be the right
-# tool to use in cross-compilation environments, therefore Automake
-# will honor the `STRIP' environment variable to overrule this program.
-if test "$cross_compiling" != no; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  STRIP=$ac_ct_STRIP
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
-
-# We need awk for the "check" target.  The system "awk" is bad on
-# some platforms.
-# Always define AMTAR for backward compatibility.
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
-
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-
-
-
-
-
-
-# libtool versioning information.
-# we're gonna break this API regularly until the first release, though.
-LT_CURRENT=0
-LT_REVISION=0
-LT_AGE=0
-
-VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
-
-
-echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
-echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
-    # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
-if test "${enable_maintainer_mode+set}" = set; then
-  enableval="$enable_maintainer_mode"
-  USE_MAINTAINER_MODE=$enableval
-else
-  USE_MAINTAINER_MODE=no
-fi;
-  echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
-echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
-
-
-if test $USE_MAINTAINER_MODE = yes; then
-  MAINTAINER_MODE_TRUE=
-  MAINTAINER_MODE_FALSE='#'
-else
-  MAINTAINER_MODE_TRUE='#'
-  MAINTAINER_MODE_FALSE=
-fi
-
-  MAINT=$MAINTAINER_MODE_TRUE
-
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="gcc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="${ac_tool_prefix}cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_CC"; then
-  ac_ct_CC=$CC
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  CC=$ac_ct_CC
-else
-  CC="$ac_cv_prog_CC"
-fi
-
-fi
-if test -z "$CC"; then
-  # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-  ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-       ac_prog_rejected=yes
-       continue
-     fi
-    ac_cv_prog_CC="cc"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-if test $ac_prog_rejected = yes; then
-  # We found a bogon in the path, so make sure we never use it.
-  set dummy $ac_cv_prog_CC
-  shift
-  if test $# != 0; then
-    # We chose a different compiler from the bogus one.
-    # However, it has the same basename, so the bogon will be chosen
-    # first if we set CC to just the basename; use the full file name.
-    shift
-    ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
-  fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$CC"; then
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in cl
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CC"; then
-  ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
-  echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-    test -n "$CC" && break
-  done
-fi
-if test -z "$CC"; then
-  ac_ct_CC=$CC
-  for ac_prog in cl
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CC"; then
-  ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CC="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$ac_ct_CC" && break
-done
-
-  CC=$ac_ct_CC
-fi
-
-fi
-
-
-test -z "$CC" && { { echo "$as_me:$LINENO: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&5
-echo "$as_me: error: no acceptable C compiler found in \$PATH
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-
-# Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for C compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files a.out a.exe b.out"
-# Try to create an executable without -o first, disregard a.out.
-# It will help us diagnose broken compilers, and finding out an intuition
-# of exeext.
-echo "$as_me:$LINENO: checking for C compiler default output file name" >&5
-echo $ECHO_N "checking for C compiler default output file name... $ECHO_C" >&6
-ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:$LINENO: \"$ac_link_default\"") >&5
-  (eval $ac_link_default) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Find the output, starting from the most likely.  This scheme is
-# not robust to junk in `.', hence go to wildcards (a.*) only as a last
-# resort.
-
-# Be careful to initialize this variable, since it used to be cached.
-# Otherwise an old cache value of `no' led to `EXEEXT = no' in a Makefile.
-ac_cv_exeext=
-# b.out is created by i960 compilers.
-for ac_file in a_out.exe a.exe conftest.exe a.out conftest a.* conftest.* b.out
-do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj )
-	;;
-    conftest.$ac_ext )
-	# This is the source file.
-	;;
-    [ab].out )
-	# We found the default executable, but exeext='' is most
-	# certainly right.
-	break;;
-    *.* )
-	ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	# FIXME: I believe we export ac_cv_exeext for Libtool,
-	# but it would be cool to find out if it's true.  Does anybody
-	# maintain Libtool? --akim.
-	export ac_cv_exeext
-	break;;
-    * )
-	break;;
-  esac
-done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: C compiler cannot create executables
-See \`config.log' for more details." >&5
-echo "$as_me: error: C compiler cannot create executables
-See \`config.log' for more details." >&2;}
-   { (exit 77); exit 77; }; }
-fi
-
-ac_exeext=$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6
-
-# Check the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether the C compiler works" >&5
-echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
-# FIXME: These cross compiler hacks should be removed for Autoconf 3.0
-# If not cross compiling, check that we can run a simple program.
-if test "$cross_compiling" != yes; then
-  if { ac_try='./$ac_file'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-    cross_compiling=no
-  else
-    if test "$cross_compiling" = maybe; then
-	cross_compiling=yes
-    else
-	{ { echo "$as_me:$LINENO: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot run C compiled programs.
-If you meant to cross compile, use \`--host'.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-  fi
-fi
-echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-
-rm -f a.out a.exe conftest$ac_cv_exeext b.out
-ac_clean_files=$ac_clean_files_save
-# Check the compiler produces executables we can run.  If not, either
-# the compiler is broken, or we cross compile.
-echo "$as_me:$LINENO: checking whether we are cross compiling" >&5
-echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $cross_compiling" >&5
-echo "${ECHO_T}$cross_compiling" >&6
-
-echo "$as_me:$LINENO: checking for suffix of executables" >&5
-echo $ECHO_N "checking for suffix of executables... $ECHO_C" >&6
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # If both `conftest.exe' and `conftest' are `present' (well, observable)
-# catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
-# work properly (i.e., refer to `conftest.exe'), while it won't with
-# `rm'.
-for ac_file in conftest.exe conftest conftest.*; do
-  test -f "$ac_file" || continue
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg | *.o | *.obj ) ;;
-    *.* ) ac_cv_exeext=`expr "$ac_file" : '[^.]*\(\..*\)'`
-	  export ac_cv_exeext
-	  break;;
-    * ) break;;
-  esac
-done
-else
-  { { echo "$as_me:$LINENO: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of executables: cannot compile and link
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest$ac_cv_exeext
-echo "$as_me:$LINENO: result: $ac_cv_exeext" >&5
-echo "${ECHO_T}$ac_cv_exeext" >&6
-
-rm -f conftest.$ac_ext
-EXEEXT=$ac_cv_exeext
-ac_exeext=$EXEEXT
-echo "$as_me:$LINENO: checking for suffix of object files" >&5
-echo $ECHO_N "checking for suffix of object files... $ECHO_C" >&6
-if test "${ac_cv_objext+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
-  case $ac_file in
-    *.$ac_ext | *.xcoff | *.tds | *.d | *.pdb | *.xSYM | *.bb | *.bbg ) ;;
-    *) ac_cv_objext=`expr "$ac_file" : '.*\.\(.*\)'`
-       break;;
-  esac
-done
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-{ { echo "$as_me:$LINENO: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&5
-echo "$as_me: error: cannot compute suffix of object files: cannot compile
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-rm -f conftest.$ac_cv_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_objext" >&5
-echo "${ECHO_T}$ac_cv_objext" >&6
-OBJEXT=$ac_cv_objext
-ac_objext=$OBJEXT
-echo "$as_me:$LINENO: checking whether we are using the GNU C compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
-if test "${ac_cv_c_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_compiler_gnu=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_c_compiler_gnu=$ac_compiler_gnu
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_c_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
-GCC=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CFLAGS=${CFLAGS+set}
-ac_save_CFLAGS=$CFLAGS
-CFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CC accepts -g" >&5
-echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_cc_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_prog_cc_g=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cc_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
-if test "$ac_test_CFLAGS" = set; then
-  CFLAGS=$ac_save_CFLAGS
-elif test $ac_cv_prog_cc_g = yes; then
-  if test "$GCC" = yes; then
-    CFLAGS="-g -O2"
-  else
-    CFLAGS="-g"
-  fi
-else
-  if test "$GCC" = yes; then
-    CFLAGS="-O2"
-  else
-    CFLAGS=
-  fi
-fi
-echo "$as_me:$LINENO: checking for $CC option to accept ANSI C" >&5
-echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
-if test "${ac_cv_prog_cc_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_prog_cc_stdc=no
-ac_save_CC=$CC
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdarg.h>
-#include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-/* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
-struct buf { int x; };
-FILE * (*rcsopen) (struct buf *, struct stat *, int);
-static char *e (p, i)
-     char **p;
-     int i;
-{
-  return p[i];
-}
-static char *f (char * (*g) (char **, int), char **p, ...)
-{
-  char *s;
-  va_list v;
-  va_start (v,p);
-  s = g (p, va_arg (v,int));
-  va_end (v);
-  return s;
-}
-
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default.  It has
-   function prototypes and stuff, but not '\xHH' hex character constants.
-   These don't provoke an error unfortunately, instead are silently treated
-   as 'x'.  The following induces an error, until -std1 is added to get
-   proper ANSI mode.  Curiously '\x00'!='x' always comes out true, for an
-   array size at least.  It's necessary to write '\x00'==0 to get something
-   that's true only with -std1.  */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
-
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
-int
-main ()
-{
-return f (e, argv, 0) != argv[0]  ||  f (e, argv, 1) != argv[1];
-  ;
-  return 0;
-}
-_ACEOF
-# Don't try gcc -ansi; that turns off useful extensions and
-# breaks some systems' header files.
-# AIX			-qlanglvl=ansi
-# Ultrix and OSF/1	-std1
-# HP-UX 10.20 and later	-Ae
-# HP-UX older versions	-Aa -D_HPUX_SOURCE
-# SVR4			-Xc -D__EXTENSIONS__
-for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
-  CC="$ac_save_CC $ac_arg"
-  rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_cc_stdc=$ac_arg
-break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext
-done
-rm -f conftest.$ac_ext conftest.$ac_objext
-CC=$ac_save_CC
-
-fi
-
-case "x$ac_cv_prog_cc_stdc" in
-  x|xno)
-    echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6 ;;
-  *)
-    echo "$as_me:$LINENO: result: $ac_cv_prog_cc_stdc" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
-    CC="$CC $ac_cv_prog_cc_stdc" ;;
-esac
-
-# Some people use a C++ compiler to compile C.  Since we use `exit',
-# in C++ we need to declare it.  In case someone uses the same compiler
-# for both compiling C and C++ we need to have the C++ compiler decide
-# the declaration of exit, since it's the most demanding environment.
-cat >conftest.$ac_ext <<_ACEOF
-#ifndef __cplusplus
-  choke me
-#endif
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  for ac_declaration in \
-   '' \
-   'extern "C" void std::exit (int) throw (); using std::exit;' \
-   'extern "C" void std::exit (int); using std::exit;' \
-   'extern "C" void exit (int) throw ();' \
-   'extern "C" void exit (int);' \
-   'void exit (int);'
-do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-#include <stdlib.h>
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
-fi
-
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-DEPDIR="${am__leading_dot}deps"
-
-          ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
-	@echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
-   am__include=include
-   am__quote=
-   _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
-   echo '.include "confinc"' > confmf
-   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
-      am__include=.include
-      am__quote="\""
-      _am_result=BSD
-   fi
-fi
-
-
-echo "$as_me:$LINENO: result: $_am_result" >&5
-echo "${ECHO_T}$_am_result" >&6
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then
-  enableval="$enable_dependency_tracking"
-
-fi;
-if test "x$enable_dependency_tracking" != xno; then
-  am_depcomp="$ac_aux_dir/depcomp"
-  AMDEPBACKSLASH='\'
-fi
-
-
-if test "x$enable_dependency_tracking" != xno; then
-  AMDEP_TRUE=
-  AMDEP_FALSE='#'
-else
-  AMDEP_TRUE='#'
-  AMDEP_FALSE=
-fi
-
-
-
-
-depcc="$CC"   am_compiler_list=
-
-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CC_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CC_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CC_dependencies_compiler_type=none
-fi
-
-fi
-echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-
-
-
-if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
-# Check whether --enable-shared or --disable-shared was given.
-if test "${enable_shared+set}" = set; then
-  enableval="$enable_shared"
-  p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_shared=yes ;;
-    no) enable_shared=no ;;
-    *)
-      enable_shared=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_shared=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_shared=yes
-fi;
-
-# Check whether --enable-static or --disable-static was given.
-if test "${enable_static+set}" = set; then
-  enableval="$enable_static"
-  p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_static=yes ;;
-    no) enable_static=no ;;
-    *)
-     enable_static=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_static=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_static=yes
-fi;
-
-# Check whether --enable-fast-install or --disable-fast-install was given.
-if test "${enable_fast_install+set}" = set; then
-  enableval="$enable_fast_install"
-  p=${PACKAGE-default}
-    case $enableval in
-    yes) enable_fast_install=yes ;;
-    no) enable_fast_install=no ;;
-    *)
-      enable_fast_install=no
-      # Look at the argument we got.  We use all the common list separators.
-      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-      for pkg in $enableval; do
-	IFS="$lt_save_ifs"
-	if test "X$pkg" = "X$p"; then
-	  enable_fast_install=yes
-	fi
-      done
-      IFS="$lt_save_ifs"
-      ;;
-    esac
-else
-  enable_fast_install=yes
-fi;
-
-# Make sure we can run config.sub.
-$ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:$LINENO: error: cannot run $ac_config_sub" >&5
-echo "$as_me: error: cannot run $ac_config_sub" >&2;}
-   { (exit 1); exit 1; }; }
-
-echo "$as_me:$LINENO: checking build system type" >&5
-echo $ECHO_N "checking build system type... $ECHO_C" >&6
-if test "${ac_cv_build+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_build_alias=$build_alias
-test -z "$ac_cv_build_alias" &&
-  ac_cv_build_alias=`$ac_config_guess`
-test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:$LINENO: error: cannot guess build type; you must specify one" >&5
-echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
-   { (exit 1); exit 1; }; }
-ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_build_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_build" >&5
-echo "${ECHO_T}$ac_cv_build" >&6
-build=$ac_cv_build
-build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking host system type" >&5
-echo $ECHO_N "checking host system type... $ECHO_C" >&6
-if test "${ac_cv_host+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_host_alias=$host_alias
-test -z "$ac_cv_host_alias" &&
-  ac_cv_host_alias=$ac_cv_build_alias
-ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:$LINENO: error: $ac_config_sub $ac_cv_host_alias failed" >&5
-echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
-   { (exit 1); exit 1; }; }
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_host" >&5
-echo "${ECHO_T}$ac_cv_host" >&6
-host=$ac_cv_host
-host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
-host_vendor=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-host_os=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
-
-
-echo "$as_me:$LINENO: checking for a sed that does not truncate output" >&5
-echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
-if test "${lt_cv_path_SED+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # Loop through the user's path and test for sed and gsed.
-# Then use that list of sed's as ones to test for truncation.
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for lt_ac_prog in sed gsed; do
-    for ac_exec_ext in '' $ac_executable_extensions; do
-      if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
-        lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
-      fi
-    done
-  done
-done
-lt_ac_max=0
-lt_ac_count=0
-# Add /usr/xpg4/bin/sed as it is typically found on Solaris
-# along with /bin/sed that truncates output.
-for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
-  test ! -f $lt_ac_sed && break
-  cat /dev/null > conftest.in
-  lt_ac_count=0
-  echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-  # Check for GNU sed and select it if it is found.
-  if "$lt_ac_sed" --version 2>&1 < /dev/null | grep 'GNU' > /dev/null; then
-    lt_cv_path_SED=$lt_ac_sed
-    break
-  fi
-  while true; do
-    cat conftest.in conftest.in >conftest.tmp
-    mv conftest.tmp conftest.in
-    cp conftest.in conftest.nl
-    echo >>conftest.nl
-    $lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
-    cmp -s conftest.out conftest.nl || break
-    # 10000 chars as input seems more than enough
-    test $lt_ac_count -gt 10 && break
-    lt_ac_count=`expr $lt_ac_count + 1`
-    if test $lt_ac_count -gt $lt_ac_max; then
-      lt_ac_max=$lt_ac_count
-      lt_cv_path_SED=$lt_ac_sed
-    fi
-  done
-done
-SED=$lt_cv_path_SED
-
-fi
-
-echo "$as_me:$LINENO: result: $SED" >&5
-echo "${ECHO_T}$SED" >&6
-
-echo "$as_me:$LINENO: checking for egrep" >&5
-echo $ECHO_N "checking for egrep... $ECHO_C" >&6
-if test "${ac_cv_prog_egrep+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if echo a | (grep -E '(a|b)') >/dev/null 2>&1
-    then ac_cv_prog_egrep='grep -E'
-    else ac_cv_prog_egrep='egrep'
-    fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_egrep" >&5
-echo "${ECHO_T}$ac_cv_prog_egrep" >&6
- EGREP=$ac_cv_prog_egrep
-
-
-
-# Check whether --with-gnu-ld or --without-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
-  withval="$with_gnu_ld"
-  test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi;
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | ?:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
-else
-  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
-fi
-if test "${lt_cv_path_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
-      *)
-	test "$with_gnu_ld" != yes && break
-	;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-   { (exit 1); exit 1; }; }
-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
-if test "${lt_cv_prog_gnu_ld+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac
-fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-echo "$as_me:$LINENO: checking for $LD option to reload object files" >&5
-echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
-if test "${lt_cv_ld_reload_flag+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_ld_reload_flag='-r'
-fi
-echo "$as_me:$LINENO: result: $lt_cv_ld_reload_flag" >&5
-echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
-reload_flag=$lt_cv_ld_reload_flag
-case $reload_flag in
-"" | " "*) ;;
-*) reload_flag=" $reload_flag" ;;
-esac
-reload_cmds='$LD$reload_flag -o $output$reload_objs'
-
-echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
-echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-if test "${lt_cv_path_NM+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$NM"; then
-  # Let the user override the test.
-  lt_cv_path_NM="$NM"
-else
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    tmp_nm="$ac_dir/${ac_tool_prefix}nm"
-    if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
-      # Check to see if the nm accepts a BSD-compat flag.
-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
-      #   nm: unknown option "B" ignored
-      # Tru64's nm complains that /dev/null is an invalid object file
-      case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
-      */dev/null* | *'Invalid file or object type'*)
-	lt_cv_path_NM="$tmp_nm -B"
-	break
-        ;;
-      *)
-	case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
-	*/dev/null*)
-	  lt_cv_path_NM="$tmp_nm -p"
-	  break
-	  ;;
-	*)
-	  lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
-	  continue # so that we can try to find one that supports BSD flags
-	  ;;
-	esac
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-  test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
-fi
-fi
-echo "$as_me:$LINENO: result: $lt_cv_path_NM" >&5
-echo "${ECHO_T}$lt_cv_path_NM" >&6
-NM="$lt_cv_path_NM"
-
-echo "$as_me:$LINENO: checking whether ln -s works" >&5
-echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
-LN_S=$as_ln_s
-if test "$LN_S" = "ln -s"; then
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-  echo "$as_me:$LINENO: result: no, using $LN_S" >&5
-echo "${ECHO_T}no, using $LN_S" >&6
-fi
-
-echo "$as_me:$LINENO: checking how to recognise dependent libraries" >&5
-echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6
-if test "${lt_cv_deplibs_check_method+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_file_magic_cmd='$MAGIC_CMD'
-lt_cv_file_magic_test_file=
-lt_cv_deplibs_check_method='unknown'
-# Need to set the preceding variable on all platforms that support
-# interlibrary dependencies.
-# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
-# 'pass_all' -- all dependencies passed with no checks.
-# 'test_compile' -- check by making test program.
-# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
-
-case $host_os in
-aix4* | aix5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-beos*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-bsdi4*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib)'
-  lt_cv_file_magic_cmd='/usr/bin/file -L'
-  lt_cv_file_magic_test_file=/shlib/libc.so
-  ;;
-
-cygwin*)
-  # func_win32_libid is a shell function defined in ltmain.sh
-  lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
-  lt_cv_file_magic_cmd='func_win32_libid'
-  ;;
-
-mingw* | pw32*)
-  # Base MSYS/MinGW do not provide the 'file' command needed by
-  # func_win32_libid shell function, so use a weaker test based on 'objdump'.
-  lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
-  lt_cv_file_magic_cmd='$OBJDUMP -f'
-  ;;
-
-darwin* | rhapsody*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-freebsd* | kfreebsd*-gnu)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    case $host_cpu in
-    i*86 )
-      # Not sure whether the presence of OpenBSD here was a mistake.
-      # Let's accept both of them until this is cleared up.
-      lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[3-9]86 (compact )?demand paged shared library'
-      lt_cv_file_magic_cmd=/usr/bin/file
-      lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-      ;;
-    esac
-  else
-    lt_cv_deplibs_check_method=pass_all
-  fi
-  ;;
-
-gnu*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-hpux10.20* | hpux11*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  case "$host_cpu" in
-  ia64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - IA64'
-    lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
-    ;;
-  hppa*64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
-    lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
-    ;;
-  *)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
-    lt_cv_file_magic_test_file=/usr/lib/libc.sl
-    ;;
-  esac
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $LD in
-  *-32|*"-32 ") libmagic=32-bit;;
-  *-n32|*"-n32 ") libmagic=N32;;
-  *-64|*"-64 ") libmagic=64-bit;;
-  *) libmagic=never-match;;
-  esac
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-# This must be Linux ELF.
-linux*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
-  else
-    lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so|_pic\.a)$'
-  fi
-  ;;
-
-newos6*)
-  lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (executable|dynamic lib)'
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=/usr/lib/libnls.so
-  ;;
-
-nto-qnx*)
-  lt_cv_deplibs_check_method=unknown
-  ;;
-
-openbsd*)
-  lt_cv_file_magic_cmd=/usr/bin/file
-  lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
-  else
-    lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
-  fi
-  ;;
-
-osf3* | osf4* | osf5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sco3.2v5*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-solaris*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  case $host_vendor in
-  motorola)
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [ML]SB (shared object|dynamic lib) M[0-9][0-9]* Version [0-9]'
-    lt_cv_file_magic_test_file=`echo /usr/lib/libc.so*`
-    ;;
-  ncr)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  sequent)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )'
-    ;;
-  sni)
-    lt_cv_file_magic_cmd='/bin/file'
-    lt_cv_deplibs_check_method="file_magic ELF [0-9][0-9]*-bit [LM]SB dynamic lib"
-    lt_cv_file_magic_test_file=/lib/libc.so
-    ;;
-  siemens)
-    lt_cv_deplibs_check_method=pass_all
-    ;;
-  esac
-  ;;
-
-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7* | sysv4*uw2*)
-  lt_cv_deplibs_check_method=pass_all
-  ;;
-esac
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_deplibs_check_method" >&5
-echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
-file_magic_cmd=$lt_cv_file_magic_cmd
-deplibs_check_method=$lt_cv_deplibs_check_method
-test -z "$deplibs_check_method" && deplibs_check_method=unknown
-
-
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then
-  enableval="$enable_libtool_lock"
-
-fi;
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-# Some flags need to be propagated to the compiler or linker for good
-# libtool support.
-case $host in
-ia64-*-hpux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *ELF-32*)
-      HPUX_IA64_MODE="32"
-      ;;
-    *ELF-64*)
-      HPUX_IA64_MODE="64"
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-*-*-irix6*)
-  # Find out which ABI we are using.
-  echo '#line 3717 "configure"' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-   if test "$lt_cv_prog_gnu_ld" = yes; then
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -melf32bsmip"
-      ;;
-    *N32*)
-      LD="${LD-ld} -melf32bmipn32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -melf64bmip"
-      ;;
-    esac
-   else
-    case `/usr/bin/file conftest.$ac_objext` in
-    *32-bit*)
-      LD="${LD-ld} -32"
-      ;;
-    *N32*)
-      LD="${LD-ld} -n32"
-      ;;
-    *64-bit*)
-      LD="${LD-ld} -64"
-      ;;
-    esac
-   fi
-  fi
-  rm -rf conftest*
-  ;;
-
-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
-  # Find out which ABI we are using.
-  echo 'int i;' > conftest.$ac_ext
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-    case "`/usr/bin/file conftest.o`" in
-    *32-bit*)
-      case $host in
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_i386"
-          ;;
-        ppc64-*linux*|powerpc64-*linux*)
-          LD="${LD-ld} -m elf32ppclinux"
-          ;;
-        s390x-*linux*)
-          LD="${LD-ld} -m elf_s390"
-          ;;
-        sparc64-*linux*)
-          LD="${LD-ld} -m elf32_sparc"
-          ;;
-      esac
-      ;;
-    *64-bit*)
-      case $host in
-        x86_64-*linux*)
-          LD="${LD-ld} -m elf_x86_64"
-          ;;
-        ppc*-*linux*|powerpc*-*linux*)
-          LD="${LD-ld} -m elf64ppc"
-          ;;
-        s390*-*linux*)
-          LD="${LD-ld} -m elf64_s390"
-          ;;
-        sparc*-*linux*)
-          LD="${LD-ld} -m elf64_sparc"
-          ;;
-      esac
-      ;;
-    esac
-  fi
-  rm -rf conftest*
-  ;;
-
-*-*-sco3.2v5*)
-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
-  SAVE_CFLAGS="$CFLAGS"
-  CFLAGS="$CFLAGS -belf"
-  echo "$as_me:$LINENO: checking whether the C compiler needs -belf" >&5
-echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
-if test "${lt_cv_cc_needs_belf+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-     cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  lt_cv_cc_needs_belf=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-lt_cv_cc_needs_belf=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-     ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_cc_needs_belf" >&5
-echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
-    CFLAGS="$SAVE_CFLAGS"
-  fi
-  ;;
-
-esac
-
-need_locks="$enable_libtool_lock"
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:$LINENO: checking how to run the C preprocessor" >&5
-echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
-# On Suns, sometimes $CPP names a directory.
-if test -n "$CPP" && test -d "$CPP"; then
-  CPP=
-fi
-if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-      # Double quotes because CPP needs to be expanded
-    for CPP in "$CC -E" "$CC -E -traditional-cpp" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
-
-    done
-    ac_cv_prog_CPP=$CPP
-
-fi
-  CPP=$ac_cv_prog_CPP
-else
-  ac_cv_prog_CPP=$CPP
-fi
-echo "$as_me:$LINENO: result: $CPP" >&5
-echo "${ECHO_T}$CPP" >&6
-ac_preproc_ok=false
-for ac_c_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-echo "$as_me:$LINENO: checking for ANSI C header files" >&5
-echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
-if test "${ac_cv_header_stdc+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-#include <stdarg.h>
-#include <string.h>
-#include <float.h>
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_header_stdc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_header_stdc=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-if test $ac_cv_header_stdc = yes; then
-  # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <string.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "memchr" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <stdlib.h>
-
-_ACEOF
-if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
-  $EGREP "free" >/dev/null 2>&1; then
-  :
-else
-  ac_cv_header_stdc=no
-fi
-rm -f conftest*
-
-fi
-
-if test $ac_cv_header_stdc = yes; then
-  # /bin/cc in Irix-4.0.5 gets non-ANSI ctype macros unless using -ansi.
-  if test "$cross_compiling" = yes; then
-  :
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ctype.h>
-#if ((' ' & 0x0FF) == 0x020)
-# define ISLOWER(c) ('a' <= (c) && (c) <= 'z')
-# define TOUPPER(c) (ISLOWER(c) ? 'A' + ((c) - 'a') : (c))
-#else
-# define ISLOWER(c) \
-		   (('a' <= (c) && (c) <= 'i') \
-		     || ('j' <= (c) && (c) <= 'r') \
-		     || ('s' <= (c) && (c) <= 'z'))
-# define TOUPPER(c) (ISLOWER(c) ? ((c) | 0x40) : (c))
-#endif
-
-#define XOR(e, f) (((e) && !(f)) || (!(e) && (f)))
-int
-main ()
-{
-  int i;
-  for (i = 0; i < 256; i++)
-    if (XOR (islower (i), ISLOWER (i))
-	|| toupper (i) != TOUPPER (i))
-      exit(2);
-  exit (0);
-}
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-ac_cv_header_stdc=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-fi
-fi
-echo "$as_me:$LINENO: result: $ac_cv_header_stdc" >&5
-echo "${ECHO_T}$ac_cv_header_stdc" >&6
-if test $ac_cv_header_stdc = yes; then
-
-cat >>confdefs.h <<\_ACEOF
-#define STDC_HEADERS 1
-_ACEOF
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-
-
-
-
-
-
-
-
-
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_Header=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_Header=no"
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-
-for ac_header in dlfcn.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## -------------------------------- ##
-## Report this to martine@danga.com ##
-## -------------------------------- ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: checking for $ac_header" >&5
-echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
-  echo "$as_me:$LINENO: result: $CXX" >&5
-echo "${ECHO_T}$CXX" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-    test -n "$CXX" && break
-  done
-fi
-if test -z "$CXX"; then
-  ac_ct_CXX=$CXX
-  for ac_prog in $CCC g++ c++ gpp aCC CC cxx cc++ cl FCC KCC RCC xlC_r xlC
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_CXX"; then
-  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_CXX="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
-  echo "$as_me:$LINENO: result: $ac_ct_CXX" >&5
-echo "${ECHO_T}$ac_ct_CXX" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$ac_ct_CXX" && break
-done
-test -n "$ac_ct_CXX" || ac_ct_CXX="g++"
-
-  CXX=$ac_ct_CXX
-fi
-
-
-# Provide some information about the compiler.
-echo "$as_me:$LINENO:" \
-     "checking for C++ compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-
-echo "$as_me:$LINENO: checking whether we are using the GNU C++ compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU C++ compiler... $ECHO_C" >&6
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_compiler_gnu=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_cxx_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_cxx_compiler_gnu" >&6
-GXX=`test $ac_compiler_gnu = yes && echo yes`
-ac_test_CXXFLAGS=${CXXFLAGS+set}
-ac_save_CXXFLAGS=$CXXFLAGS
-CXXFLAGS="-g"
-echo "$as_me:$LINENO: checking whether $CXX accepts -g" >&5
-echo $ECHO_N "checking whether $CXX accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_cxx_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_cxx_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_prog_cxx_g=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_cxx_g" >&5
-echo "${ECHO_T}$ac_cv_prog_cxx_g" >&6
-if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
-  if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
-  else
-    CXXFLAGS="-g"
-  fi
-else
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  else
-    CXXFLAGS=
-  fi
-fi
-for ac_declaration in \
-   '' \
-   'extern "C" void std::exit (int) throw (); using std::exit;' \
-   'extern "C" void std::exit (int); using std::exit;' \
-   'extern "C" void exit (int) throw ();' \
-   'extern "C" void exit (int);' \
-   'void exit (int);'
-do
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-#include <stdlib.h>
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-continue
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_declaration
-int
-main ()
-{
-exit (42);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  break
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-done
-rm -f conftest*
-if test -n "$ac_declaration"; then
-  echo '#ifdef __cplusplus' >>confdefs.h
-  echo $ac_declaration      >>confdefs.h
-  echo '#endif'             >>confdefs.h
-fi
-
-ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-depcc="$CXX"  am_compiler_list=
-
-echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CXX_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    case $depmode in
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    none) break ;;
-    esac
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.
-    if depmode=$depmode \
-       source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CXX_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CXX_dependencies_compiler_type=none
-fi
-
-fi
-echo "$as_me:$LINENO: result: $am_cv_CXX_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CXX_dependencies_compiler_type" >&6
-CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-
-
-
-if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-  am__fastdepCXX_TRUE=
-  am__fastdepCXX_FALSE='#'
-else
-  am__fastdepCXX_TRUE='#'
-  am__fastdepCXX_FALSE=
-fi
-
-
-ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-echo "$as_me:$LINENO: checking how to run the C++ preprocessor" >&5
-echo $ECHO_N "checking how to run the C++ preprocessor... $ECHO_C" >&6
-if test -z "$CXXCPP"; then
-  if test "${ac_cv_prog_CXXCPP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-      # Double quotes because CXXCPP needs to be expanded
-    for CXXCPP in "$CXX -E" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  break
-fi
-
-    done
-    ac_cv_prog_CXXCPP=$CXXCPP
-
-fi
-  CXXCPP=$ac_cv_prog_CXXCPP
-else
-  ac_cv_prog_CXXCPP=$CXXCPP
-fi
-echo "$as_me:$LINENO: result: $CXXCPP" >&5
-echo "${ECHO_T}$CXXCPP" >&6
-ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether non-existent headers
-  # can be detected and how.
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_cxx_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  # Broken: success on invalid input.
-continue
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then
-  :
-else
-  { { echo "$as_me:$LINENO: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&5
-echo "$as_me: error: C++ preprocessor \"$CXXCPP\" fails sanity check
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-ac_ext=f
-ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
-ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_f77_compiler_gnu
-if test -n "$ac_tool_prefix"; then
-  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$F77"; then
-  ac_cv_prog_F77="$F77" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-F77=$ac_cv_prog_F77
-if test -n "$F77"; then
-  echo "$as_me:$LINENO: result: $F77" >&5
-echo "${ECHO_T}$F77" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-    test -n "$F77" && break
-  done
-fi
-if test -z "$F77"; then
-  ac_ct_F77=$F77
-  for ac_prog in g77 f77 xlf frt pgf77 fort77 fl32 af77 f90 xlf90 pgf90 epcf90 f95 fort xlf95 ifc efc pgf95 lf95 gfortran
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_F77"; then
-  ac_cv_prog_ac_ct_F77="$ac_ct_F77" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_F77="$ac_prog"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-ac_ct_F77=$ac_cv_prog_ac_ct_F77
-if test -n "$ac_ct_F77"; then
-  echo "$as_me:$LINENO: result: $ac_ct_F77" >&5
-echo "${ECHO_T}$ac_ct_F77" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  test -n "$ac_ct_F77" && break
-done
-
-  F77=$ac_ct_F77
-fi
-
-
-# Provide some information about the compiler.
-echo "$as_me:5281:" \
-     "checking for Fortran 77 compiler version" >&5
-ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-  (eval $ac_compiler --version </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -v </dev/null >&5\"") >&5
-  (eval $ac_compiler -v </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-{ (eval echo "$as_me:$LINENO: \"$ac_compiler -V </dev/null >&5\"") >&5
-  (eval $ac_compiler -V </dev/null >&5) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-rm -f a.out
-
-# If we don't use `.F' as extension, the preprocessor is not run on the
-# input file.  (Note that this only needs to work for GNU compilers.)
-ac_save_ext=$ac_ext
-ac_ext=F
-echo "$as_me:$LINENO: checking whether we are using the GNU Fortran 77 compiler" >&5
-echo $ECHO_N "checking whether we are using the GNU Fortran 77 compiler... $ECHO_C" >&6
-if test "${ac_cv_f77_compiler_gnu+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-      program main
-#ifndef __GNUC__
-       choke me
-#endif
-
-      end
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_compiler_gnu=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_compiler_gnu=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_f77_compiler_gnu=$ac_compiler_gnu
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_f77_compiler_gnu" >&5
-echo "${ECHO_T}$ac_cv_f77_compiler_gnu" >&6
-ac_ext=$ac_save_ext
-ac_test_FFLAGS=${FFLAGS+set}
-ac_save_FFLAGS=$FFLAGS
-FFLAGS=
-echo "$as_me:$LINENO: checking whether $F77 accepts -g" >&5
-echo $ECHO_N "checking whether $F77 accepts -g... $ECHO_C" >&6
-if test "${ac_cv_prog_f77_g+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  FFLAGS=-g
-cat >conftest.$ac_ext <<_ACEOF
-      program main
-
-      end
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_prog_f77_g=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_prog_f77_g=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-echo "$as_me:$LINENO: result: $ac_cv_prog_f77_g" >&5
-echo "${ECHO_T}$ac_cv_prog_f77_g" >&6
-if test "$ac_test_FFLAGS" = set; then
-  FFLAGS=$ac_save_FFLAGS
-elif test $ac_cv_prog_f77_g = yes; then
-  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
-    FFLAGS="-g -O2"
-  else
-    FFLAGS="-g"
-  fi
-else
-  if test "x$ac_cv_f77_compiler_gnu" = xyes; then
-    FFLAGS="-O2"
-  else
-    FFLAGS=
-  fi
-fi
-
-G77=`test $ac_compiler_gnu = yes && echo yes`
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
-# Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!
-
-# find the maximum length of command line arguments
-echo "$as_me:$LINENO: checking the maximum length of command line arguments" >&5
-echo $ECHO_N "checking the maximum length of command line arguments... $ECHO_C" >&6
-if test "${lt_cv_sys_max_cmd_len+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-    i=0
-  teststring="ABCD"
-
-  case $build_os in
-  msdosdjgpp*)
-    # On DJGPP, this test can blow up pretty badly due to problems in libc
-    # (any single argument exceeding 2000 bytes causes a buffer overrun
-    # during glob expansion).  Even if it were fixed, the result of this
-    # check would be larger than it should be.
-    lt_cv_sys_max_cmd_len=12288;    # 12K is about right
-    ;;
-
-  gnu*)
-    # Under GNU Hurd, this test is not required because there is
-    # no limit to the length of command line arguments.
-    # Libtool will interpret -1 as no limit whatsoever
-    lt_cv_sys_max_cmd_len=-1;
-    ;;
-
-  cygwin* | mingw*)
-    # On Win9x/ME, this test blows up -- it succeeds, but takes
-    # about 5 minutes as the teststring grows exponentially.
-    # Worse, since 9x/ME are not pre-emptively multitasking,
-    # you end up with a "frozen" computer, even though with patience
-    # the test eventually succeeds (with a max line length of 256k).
-    # Instead, let's just punt: use the minimum linelength reported by
-    # all of the supported platforms: 8192 (on NT/2K/XP).
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
-  amigaos*)
-    # On AmigaOS with pdksh, this test takes hours, literally.
-    # So we just punt and use a minimum line length of 8192.
-    lt_cv_sys_max_cmd_len=8192;
-    ;;
-
- *)
-    # If test is not a shell built-in, we'll probably end up computing a
-    # maximum length that is only half of the actual maximum length, but
-    # we can't tell.
-    while (test "X"`$CONFIG_SHELL $0 --fallback-echo "X$teststring" 2>/dev/null` \
-	       = "XX$teststring") >/dev/null 2>&1 &&
-	    new_result=`expr "X$teststring" : ".*" 2>&1` &&
-	    lt_cv_sys_max_cmd_len=$new_result &&
-	    test $i != 17 # 1/2 MB should be enough
-    do
-      i=`expr $i + 1`
-      teststring=$teststring$teststring
-    done
-    teststring=
-    # Add a significant safety factor because C++ compilers can tack on massive
-    # amounts of additional arguments before passing them to the linker.
-    # It appears as though 1/2 is a usable value.
-    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
-    ;;
-  esac
-
-fi
-
-if test -n $lt_cv_sys_max_cmd_len ; then
-  echo "$as_me:$LINENO: result: $lt_cv_sys_max_cmd_len" >&5
-echo "${ECHO_T}$lt_cv_sys_max_cmd_len" >&6
-else
-  echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6
-fi
-
-
-
-
-# Check for command to grab the raw symbol name followed by C symbol from nm.
-echo "$as_me:$LINENO: checking command to parse $NM output from $compiler object" >&5
-echo $ECHO_N "checking command to parse $NM output from $compiler object... $ECHO_C" >&6
-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-# These are sane defaults that work on at least a few old systems.
-# [They come from Ultrix.  What could be older than Ultrix?!! ;)]
-
-# Character class describing NM global symbol codes.
-symcode='[BCDEGRST]'
-
-# Regexp to match symbols that can be accessed directly from C.
-sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
-
-# Transform the above into a raw symbol and a C symbol.
-symxfrm='\1 \2\3 \3'
-
-# Transform an extracted symbol line into a proper C declaration
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
-
-# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-
-# Define system-specific variables.
-case $host_os in
-aix*)
-  symcode='[BCDT]'
-  ;;
-cygwin* | mingw* | pw32*)
-  symcode='[ABCDGISTW]'
-  ;;
-hpux*) # Its linker distinguishes data from code symbols
-  if test "$host_cpu" = ia64; then
-    symcode='[ABCDEGRST]'
-  fi
-  lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
-  lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (lt_ptr) \&\2},/p'"
-  ;;
-irix* | nonstopux*)
-  symcode='[BCDEGRST]'
-  ;;
-osf*)
-  symcode='[BCDEGQRST]'
-  ;;
-solaris* | sysv5*)
-  symcode='[BDRT]'
-  ;;
-sysv4)
-  symcode='[DFNSTU]'
-  ;;
-esac
-
-# Handle CRLF in mingw tool chain
-opt_cr=
-case $build_os in
-mingw*)
-  opt_cr=`echo 'x\{0,1\}' | tr x '\015'` # option cr in regexp
-  ;;
-esac
-
-# If we're using GNU nm, then use its standard symbol codes.
-case `$NM -V 2>&1` in
-*GNU* | *'with BFD'*)
-  symcode='[ABCDGIRSTW]' ;;
-esac
-
-# Try without a prefix undercore, then with it.
-for ac_symprfx in "" "_"; do
-
-  # Write the raw and C identifiers.
-  lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[ 	]\($symcode$symcode*\)[ 	][ 	]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
-
-  # Check to see that the pipe works correctly.
-  pipe_works=no
-
-  rm -f conftest*
-  cat > conftest.$ac_ext <<EOF
-#ifdef __cplusplus
-extern "C" {
-#endif
-char nm_test_var;
-void nm_test_func(){}
-#ifdef __cplusplus
-}
-#endif
-int main(){nm_test_var='a';nm_test_func();return(0);}
-EOF
-
-  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-    # Now try to grab the symbols.
-    nlist=conftest.nm
-    if { (eval echo "$as_me:$LINENO: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
-  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s "$nlist"; then
-      # Try sorting and uniquifying the output.
-      if sort "$nlist" | uniq > "$nlist"T; then
-	mv -f "$nlist"T "$nlist"
-      else
-	rm -f "$nlist"T
-      fi
-
-      # Make sure that we snagged all the symbols we need.
-      if grep ' nm_test_var$' "$nlist" >/dev/null; then
-	if grep ' nm_test_func$' "$nlist" >/dev/null; then
-	  cat <<EOF > conftest.$ac_ext
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-EOF
-	  # Now generate the symbol file.
-	  eval "$lt_cv_sys_global_symbol_to_cdecl"' < "$nlist" | grep -v main >> conftest.$ac_ext'
-
-	  cat <<EOF >> conftest.$ac_ext
-#if defined (__STDC__) && __STDC__
-# define lt_ptr_t void *
-#else
-# define lt_ptr_t char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-const struct {
-  const char *name;
-  lt_ptr_t address;
-}
-lt_preloaded_symbols[] =
-{
-EOF
-	  $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/  {\"\2\", (lt_ptr_t) \&\2},/" < "$nlist" | grep -v main >> conftest.$ac_ext
-	  cat <<\EOF >> conftest.$ac_ext
-  {0, (lt_ptr_t) 0}
-};
-
-#ifdef __cplusplus
-}
-#endif
-EOF
-	  # Now try linking the two files.
-	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
-	  LIBS="conftstm.$ac_objext"
-	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
-	  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext}; then
-	    pipe_works=yes
-	  fi
-	  LIBS="$lt_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
-	else
-	  echo "cannot find nm_test_func in $nlist" >&5
-	fi
-      else
-	echo "cannot find nm_test_var in $nlist" >&5
-      fi
-    else
-      echo "cannot run $lt_cv_sys_global_symbol_pipe" >&5
-    fi
-  else
-    echo "$progname: failed program was:" >&5
-    cat conftest.$ac_ext >&5
-  fi
-  rm -f conftest* conftst*
-
-  # Do not use the global_symbol_pipe unless it works.
-  if test "$pipe_works" = yes; then
-    break
-  else
-    lt_cv_sys_global_symbol_pipe=
-  fi
-done
-
-fi
-
-if test -z "$lt_cv_sys_global_symbol_pipe"; then
-  lt_cv_sys_global_symbol_to_cdecl=
-fi
-if test -z "$lt_cv_sys_global_symbol_pipe$lt_cv_sys_global_symbol_to_cdecl"; then
-  echo "$as_me:$LINENO: result: failed" >&5
-echo "${ECHO_T}failed" >&6
-else
-  echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6
-fi
-
-echo "$as_me:$LINENO: checking for objdir" >&5
-echo $ECHO_N "checking for objdir... $ECHO_C" >&6
-if test "${lt_cv_objdir+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  rm -f .libs 2>/dev/null
-mkdir .libs 2>/dev/null
-if test -d .libs; then
-  lt_cv_objdir=.libs
-else
-  # MS-DOS does not allow filenames that begin with a dot.
-  lt_cv_objdir=_libs
-fi
-rmdir .libs 2>/dev/null
-fi
-echo "$as_me:$LINENO: result: $lt_cv_objdir" >&5
-echo "${ECHO_T}$lt_cv_objdir" >&6
-objdir=$lt_cv_objdir
-
-
-
-
-
-case $host_os in
-aix3*)
-  # AIX sometimes has problems with the GCC collect2 program.  For some
-  # reason, if we set the COLLECT_NAMES environment variable, the problems
-  # vanish in a puff of smoke.
-  if test "X${COLLECT_NAMES+set}" != Xset; then
-    COLLECT_NAMES=
-    export COLLECT_NAMES
-  fi
-  ;;
-esac
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='sed -e s/^X//'
-sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\([\\"\\`\\\\]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
-# Constants:
-rm="rm -f"
-
-# Global variables:
-default_ofile=libtool
-can_build_shared=yes
-
-# All known linkers require a `.a' archive for static linking (except M$VC,
-# which needs '.lib').
-libext=a
-ltmain="$ac_aux_dir/ltmain.sh"
-ofile="$default_ofile"
-with_gnu_ld="$lt_cv_prog_gnu_ld"
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_AR="${ac_tool_prefix}ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
-  echo "$as_me:$LINENO: result: $AR" >&5
-echo "${ECHO_T}$AR" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_AR"; then
-  ac_ct_AR=$AR
-  # Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_AR"; then
-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_AR="ar"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_prog_ac_ct_AR" && ac_cv_prog_ac_ct_AR="false"
-fi
-fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
-  echo "$as_me:$LINENO: result: $ac_ct_AR" >&5
-echo "${ECHO_T}$ac_ct_AR" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  AR=$ac_ct_AR
-else
-  AR="$ac_cv_prog_AR"
-fi
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$RANLIB"; then
-  ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-RANLIB=$ac_cv_prog_RANLIB
-if test -n "$RANLIB"; then
-  echo "$as_me:$LINENO: result: $RANLIB" >&5
-echo "${ECHO_T}$RANLIB" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_RANLIB"; then
-  ac_ct_RANLIB=$RANLIB
-  # Extract the first word of "ranlib", so it can be a program name with args.
-set dummy ranlib; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_RANLIB"; then
-  ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_RANLIB="ranlib"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_prog_ac_ct_RANLIB" && ac_cv_prog_ac_ct_RANLIB=":"
-fi
-fi
-ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
-if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:$LINENO: result: $ac_ct_RANLIB" >&5
-echo "${ECHO_T}$ac_ct_RANLIB" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  RANLIB=$ac_ct_RANLIB
-else
-  RANLIB="$ac_cv_prog_RANLIB"
-fi
-
-if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-fi
-fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  echo "$as_me:$LINENO: result: $STRIP" >&5
-echo "${ECHO_T}$STRIP" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_prog_ac_ct_STRIP="strip"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
-fi
-fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  echo "$as_me:$LINENO: result: $ac_ct_STRIP" >&5
-echo "${ECHO_T}$ac_ct_STRIP" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  STRIP=$ac_ct_STRIP
-else
-  STRIP="$ac_cv_prog_STRIP"
-fi
-
-
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
-
-# Set sane defaults for various variables
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-test -z "$AS" && AS=as
-test -z "$CC" && CC=cc
-test -z "$LTCC" && LTCC=$CC
-test -z "$DLLTOOL" && DLLTOOL=dlltool
-test -z "$LD" && LD=ld
-test -z "$LN_S" && LN_S="ln -s"
-test -z "$MAGIC_CMD" && MAGIC_CMD=file
-test -z "$NM" && NM=nm
-test -z "$SED" && SED=sed
-test -z "$OBJDUMP" && OBJDUMP=objdump
-test -z "$RANLIB" && RANLIB=:
-test -z "$STRIP" && STRIP=:
-test -z "$ac_objext" && ac_objext=o
-
-# Determine commands to create old-style static archives.
-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
-old_postinstall_cmds='chmod 644 $oldlib'
-old_postuninstall_cmds=
-
-if test -n "$RANLIB"; then
-  case $host_os in
-  openbsd*)
-    old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
-    ;;
-  *)
-    old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
-    ;;
-  esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
-fi
-
-# Only perform the check for file, if the check method requires it
-case $deplibs_check_method in
-file_magic*)
-  if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    echo "$as_me:$LINENO: checking for ${ac_tool_prefix}file" >&5
-echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $MAGIC_CMD in
-[\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/${ac_tool_prefix}file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/${ac_tool_prefix}file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-echo "${ECHO_T}$MAGIC_CMD" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-if test -z "$lt_cv_path_MAGIC_CMD"; then
-  if test -n "$ac_tool_prefix"; then
-    echo "$as_me:$LINENO: checking for file" >&5
-echo $ECHO_N "checking for file... $ECHO_C" >&6
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $MAGIC_CMD in
-[\\/*] |  ?:[\\/]*)
-  lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
-  ;;
-*)
-  lt_save_MAGIC_CMD="$MAGIC_CMD"
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  ac_dummy="/usr/bin$PATH_SEPARATOR$PATH"
-  for ac_dir in $ac_dummy; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/file; then
-      lt_cv_path_MAGIC_CMD="$ac_dir/file"
-      if test -n "$file_magic_test_file"; then
-	case $deplibs_check_method in
-	"file_magic "*)
-	  file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
-	  MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-	  if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
-	    $EGREP "$file_magic_regex" > /dev/null; then
-	    :
-	  else
-	    cat <<EOF 1>&2
-
-*** Warning: the command libtool uses to detect shared libraries,
-*** $file_magic_cmd, produces output that libtool cannot recognize.
-*** The result is that libtool may fail to recognize shared libraries
-*** as such.  This will affect the creation of libtool libraries that
-*** depend on shared libraries, but programs linked with such libtool
-*** libraries will work regardless of this problem.  Nevertheless, you
-*** may want to report the problem to your system manager and/or to
-*** bug-libtool@gnu.org
-
-EOF
-	  fi ;;
-	esac
-      fi
-      break
-    fi
-  done
-  IFS="$lt_save_ifs"
-  MAGIC_CMD="$lt_save_MAGIC_CMD"
-  ;;
-esac
-fi
-
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
-if test -n "$MAGIC_CMD"; then
-  echo "$as_me:$LINENO: result: $MAGIC_CMD" >&5
-echo "${ECHO_T}$MAGIC_CMD" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  else
-    MAGIC_CMD=:
-  fi
-fi
-
-  fi
-  ;;
-esac
-
-enable_dlopen=no
-enable_win32_dll=no
-
-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
-if test "${enable_libtool_lock+set}" = set; then
-  enableval="$enable_libtool_lock"
-
-fi;
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
-
-
-# Check whether --with-pic or --without-pic was given.
-if test "${with_pic+set}" = set; then
-  withval="$with_pic"
-  pic_mode="$withval"
-else
-  pic_mode=default
-fi;
-test -z "$pic_mode" && pic_mode=default
-
-# Use C for the default configuration in the libtool script
-tagname=
-lt_save_CC="$CC"
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-# Source file extension for C test sources.
-ac_ext=c
-
-# Object file extension for compiled C test sources.
-objext=o
-objext=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(){return(0);}\n'
-
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-#
-# Check for any special shared library compilation flags.
-#
-lt_prog_cc_shlib=
-if test "$GCC" = no; then
-  case $host_os in
-  sco3.2v5*)
-    lt_prog_cc_shlib='-belf'
-    ;;
-  esac
-fi
-if test -n "$lt_prog_cc_shlib"; then
-  { echo "$as_me:$LINENO: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&5
-echo "$as_me: WARNING: \`$CC' requires \`$lt_prog_cc_shlib' to build shared libraries" >&2;}
-  if echo "$old_CC $old_CFLAGS " | grep "[ 	]$lt_prog_cc_shlib[ 	]" >/dev/null; then :
-  else
-    { echo "$as_me:$LINENO: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
-echo "$as_me: WARNING: add \`$lt_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
-    lt_cv_prog_cc_can_build_shared=no
-  fi
-fi
-
-
-#
-# Check to make sure the static flag actually works.
-#
-echo "$as_me:$LINENO: checking if $compiler static flag $lt_prog_compiler_static works" >&5
-echo $ECHO_N "checking if $compiler static flag $lt_prog_compiler_static works... $ECHO_C" >&6
-if test "${lt_prog_compiler_static_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_prog_compiler_static_works=no
-   save_LDFLAGS="$LDFLAGS"
-   LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
-   printf "$lt_simple_link_test_code" > conftest.$ac_ext
-   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test -s conftest.err; then
-       # Append any errors to the config.log.
-       cat conftest.err 1>&5
-     else
-       lt_prog_compiler_static_works=yes
-     fi
-   fi
-   $rm conftest*
-   LDFLAGS="$save_LDFLAGS"
-
-fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_static_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_static_works" >&6
-
-if test x"$lt_prog_compiler_static_works" = xyes; then
-    :
-else
-    lt_prog_compiler_static=
-fi
-
-
-
-
-lt_prog_compiler_no_builtin_flag=
-
-if test "$GCC" = yes; then
-  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
-
-
-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_prog_compiler_rtti_exceptions=no
-  ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="-fno-rtti -fno-exceptions"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6313: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:6317: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s conftest.err; then
-       lt_cv_prog_compiler_rtti_exceptions=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
-
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-    lt_prog_compiler_no_builtin_flag="$lt_prog_compiler_no_builtin_flag -fno-rtti -fno-exceptions"
-else
-    :
-fi
-
-fi
-
-lt_prog_compiler_wl=
-lt_prog_compiler_pic=
-lt_prog_compiler_static=
-
-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
-
-  if test "$GCC" = yes; then
-    lt_prog_compiler_wl='-Wl,'
-    lt_prog_compiler_static='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4'
-      ;;
-
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic='-fno-common'
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      lt_prog_compiler_can_build_shared=no
-      enable_shared=no
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic=-Kconform_pic
-      fi
-      ;;
-
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case "$host_cpu" in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic='-fPIC'
-	;;
-      esac
-      ;;
-
-    *)
-      lt_prog_compiler_pic='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static='-Bstatic'
-      else
-	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic='-DDLL_EXPORT'
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case "$host_cpu" in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    newsos6)
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    linux*)
-      case $CC in
-      icc* | ecc*)
-	lt_prog_compiler_wl='-Wl,'
-	lt_prog_compiler_pic='-KPIC'
-	lt_prog_compiler_static='-static'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static='-non_shared'
-        ;;
-      esac
-      ;;
-
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static='-non_shared'
-      ;;
-
-    sco3.2v5*)
-      lt_prog_compiler_pic='-Kpic'
-      lt_prog_compiler_static='-dn'
-      ;;
-
-    solaris*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sunos4*)
-      lt_prog_compiler_wl='-Qoption ld '
-      lt_prog_compiler_pic='-PIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-      lt_prog_compiler_wl='-Wl,'
-      lt_prog_compiler_pic='-KPIC'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	lt_prog_compiler_pic='-Kconform_pic'
-	lt_prog_compiler_static='-Bstatic'
-      fi
-      ;;
-
-    uts4*)
-      lt_prog_compiler_pic='-pic'
-      lt_prog_compiler_static='-Bstatic'
-      ;;
-
-    *)
-      lt_prog_compiler_can_build_shared=no
-      ;;
-    esac
-  fi
-
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic" >&6
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic"; then
-
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic works... $ECHO_C" >&6
-if test "${lt_prog_compiler_pic_works+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_prog_compiler_pic_works=no
-  ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic -DPIC"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6546: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:6550: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s conftest.err; then
-       lt_prog_compiler_pic_works=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works" >&6
-
-if test x"$lt_prog_compiler_pic_works" = xyes; then
-    case $lt_prog_compiler_pic in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic=" $lt_prog_compiler_pic" ;;
-     esac
-else
-    lt_prog_compiler_pic=
-     lt_prog_compiler_can_build_shared=no
-fi
-
-fi
-case "$host_os" in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic=
-    ;;
-  *)
-    lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
-    ;;
-esac
-
-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_prog_compiler_c_o=no
-   $rm -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:6606: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:6610: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s out/conftest.err; then
-       lt_cv_prog_compiler_c_o=yes
-     fi
-   fi
-   chmod u+w .
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o" >&6
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6
-  if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-
-  runpath_var=
-  allow_undefined_flag=
-  enable_shared_with_static_runtimes=no
-  archive_cmds=
-  archive_expsym_cmds=
-  old_archive_From_new_cmds=
-  old_archive_from_expsyms_cmds=
-  export_dynamic_flag_spec=
-  whole_archive_flag_spec=
-  thread_safe_flag_spec=
-  hardcode_libdir_flag_spec=
-  hardcode_libdir_flag_spec_ld=
-  hardcode_libdir_separator=
-  hardcode_direct=no
-  hardcode_minus_L=no
-  hardcode_shlibpath_var=unsupported
-  link_all_deplibs=unknown
-  hardcode_automatic=no
-  module_cmds=
-  module_expsym_cmds=
-  always_export_symbols=no
-  export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  include_expsyms=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  ld_shlibs=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix3* | aix4* | aix5*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	ld_shlibs=no
-	cat <<EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-EOF
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can't use
-      # them.
-      ld_shlibs=no
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	allow_undefined_flag=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec='-L$libdir'
-      allow_undefined_flag=unsupported
-      always_export_symbols=no
-      enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris* | sysv5*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-	ld_shlibs=no
-	cat <<EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-EOF
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    sunos4*)
-      archive_cmds='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-  linux*)
-    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_cmds="$tmp_archive_cmds"
-      supports_anon_versioning=no
-      case `$LD -v 2>/dev/null` in
-        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-        *\ 2.11.*) ;; # other 2.11 versions
-        *) supports_anon_versioning=yes ;;
-      esac
-      if test $supports_anon_versioning = yes; then
-        archive_expsym_cmds='$echo "{ global:" > $output_objdir/$libname.ver~
-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-$echo "local: *; };" >> $output_objdir/$libname.ver~
-        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-      else
-        archive_expsym_cmds="$tmp_archive_cmds"
-      fi
-      link_all_deplibs=no
-    else
-      ld_shlibs=no
-    fi
-    ;;
-
-    *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-    esac
-
-    if test "$ld_shlibs" = yes; then
-      runpath_var=LD_RUN_PATH
-      hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir'
-      export_dynamic_flag_spec='${wl}--export-dynamic'
-      # ancient GNU ld didn't support --whole-archive et. al.
-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- 	whole_archive_flag_spec="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	whole_archive_flag_spec=
-      fi
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag=unsupported
-      always_export_symbols=yes
-      archive_expsym_cmds='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L=yes
-      if test "$GCC" = yes && test -z "$link_static_flag"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	hardcode_direct=unsupported
-      fi
-      ;;
-
-    aix4* | aix5*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-	else
-	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-	  for ld_flag in $LDFLAGS; do
-  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-  	    aix_use_runtimelinking=yes
-  	    break
-  	  fi
-	  done
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      archive_cmds=''
-      hardcode_direct=yes
-      hardcode_libdir_separator=':'
-      link_all_deplibs=yes
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.012|aix4.012.*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" && \
-  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	  then
-  	  # We have reworked collect2
-  	  hardcode_direct=yes
-	  else
-  	  # We have old collect2
-  	  hardcode_direct=unsupported
-  	  # It fails to find uninstalled libraries when the uninstalled
-  	  # path is not listed in the libpath.  Setting hardcode_minus_L
-  	  # to unsupported forces relinking
-  	  hardcode_minus_L=yes
-  	  hardcode_libdir_flag_spec='-L$libdir'
-  	  hardcode_libdir_separator=
-	  fi
-	esac
-	shared_flag='-shared'
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-  	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-  	if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-  	fi
-	fi
-      fi
-
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      always_export_symbols=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	allow_undefined_flag='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-       hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-	archive_expsym_cmds="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-       else
-	if test "$host_cpu" = ia64; then
-	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
-	  allow_undefined_flag="-z nodefs"
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an empty executable.
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  no_undefined_flag=' ${wl}-bernotok'
-	  allow_undefined_flag=' ${wl}-berok'
-	  # -bexpall does not export symbols beginning with underscore (_)
-	  always_export_symbols=yes
-	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec=' '
-	  archive_cmds_need_lc=yes
-	  # This is similar to how AIX traditionally builds it's shared libraries.
-	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      # see comment about different semantics on the GNU ld section
-      ld_shlibs=no
-      ;;
-
-    bsdi4*)
-      export_dynamic_flag_spec=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      hardcode_libdir_flag_spec=' '
-      allow_undefined_flag=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      archive_cmds='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      old_archive_From_new_cmds='true'
-      # FIXME: Should let the user specify the lib program.
-      old_archive_cmds='lib /OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path='`cygpath -w "$srcfile"`'
-      enable_shared_with_static_runtimes=yes
-      ;;
-
-    darwin* | rhapsody*)
-    if test "$GXX" = yes ; then
-      archive_cmds_need_lc=no
-      case "$host_os" in
-      rhapsody* | darwin1.[012])
-	allow_undefined_flag='-undefined suppress'
-	;;
-      *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-      	allow_undefined_flag='-flat_namespace -undefined suppress'
-      else
-        case ${MACOSX_DEPLOYMENT_TARGET} in
-          10.[012])
-            allow_undefined_flag='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            allow_undefined_flag='-undefined dynamic_lookup'
-            ;;
-        esac
-      fi
-	;;
-      esac
-    	lt_int_apple_cc_single_mod=no
-    	output_verbose_link_cmd='echo'
-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-    	  lt_int_apple_cc_single_mod=yes
-    	fi
-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-    	  archive_cmds='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-    	else
-        archive_cmds='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      fi
-      module_cmds='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        else
-          archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        fi
-          module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      hardcode_direct=no
-      hardcode_automatic=yes
-      hardcode_shlibpath_var=unsupported
-      whole_archive_flag_spec='-all_load $convenience'
-      link_all_deplibs=yes
-    else
-      ld_shlibs=no
-    fi
-      ;;
-
-    dgux*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
-
-    freebsd1*)
-      ld_shlibs=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu)
-      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_direct=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L=yes
-      export_dynamic_flag_spec='${wl}-E'
-      ;;
-
-    hpux10* | hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  ;;
-	*)
-	  archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	case "$host_cpu" in
-	hppa*64*)
-	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	  hardcode_libdir_flag_spec_ld='+b $libdir'
-	  hardcode_libdir_separator=:
-	  hardcode_direct=no
-	  hardcode_shlibpath_var=no
-	  ;;
-	ia64*)
-	  hardcode_libdir_flag_spec='-L$libdir'
-	  hardcode_direct=no
-	  hardcode_shlibpath_var=no
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L=yes
-	  ;;
-	*)
-	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	  hardcode_libdir_separator=:
-	  hardcode_direct=yes
-	  export_dynamic_flag_spec='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_ld='-rpath $libdir'
-      fi
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      link_all_deplibs=yes
-      ;;
-
-    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	archive_cmds='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    newsos6)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      hardcode_shlibpath_var=no
-      ;;
-
-    openbsd*)
-      hardcode_direct=yes
-      hardcode_shlibpath_var=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec='${wl}-E'
-      else
-       case $host_os in
-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	   archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   hardcode_libdir_flag_spec='-R$libdir'
-	   ;;
-	 *)
-	   archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
-	   ;;
-       esac
-      fi
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_minus_L=yes
-      allow_undefined_flag=unsupported
-      archive_cmds='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      old_archive_From_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
-      else
-	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	hardcode_libdir_flag_spec='-rpath $libdir'
-      fi
-      hardcode_libdir_separator=:
-      ;;
-
-    sco3.2v5*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var=no
-      export_dynamic_flag_spec='${wl}-Bexport'
-      runpath_var=LD_RUN_PATH
-      hardcode_runpath_var=yes
-      ;;
-
-    solaris*)
-      no_undefined_flag=' -z text'
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-      else
-	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      fi
-      hardcode_libdir_flag_spec='-R$libdir'
-      hardcode_shlibpath_var=no
-      case $host_os in
-      solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-	whole_archive_flag_spec='-z allextract$convenience -z defaultextract' ;;
-      esac
-      link_all_deplibs=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	archive_cmds='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_direct=yes
-      hardcode_minus_L=yes
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  reload_cmds='$CC -r -o $output$reload_objs'
-	  hardcode_direct=no
-        ;;
-	motorola)
-	  archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv4.3*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var=no
-      export_dynamic_flag_spec='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_shlibpath_var=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	ld_shlibs=yes
-      fi
-      ;;
-
-    sysv4.2uw2*)
-      archive_cmds='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct=yes
-      hardcode_minus_L=no
-      hardcode_shlibpath_var=no
-      hardcode_runpath_var=yes
-      runpath_var=LD_RUN_PATH
-      ;;
-
-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
-      no_undefined_flag='${wl}-z ${wl}text'
-      if test "$GCC" = yes; then
-	archive_cmds='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var=no
-      ;;
-
-    sysv5*)
-      no_undefined_flag=' -z text'
-      # $CC -shared without GNU ld will not create a library from C++
-      # object files and a static libstdc++, better avoid it by now
-      archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      archive_expsym_cmds='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      hardcode_libdir_flag_spec=
-      hardcode_shlibpath_var=no
-      runpath_var='LD_RUN_PATH'
-      ;;
-
-    uts4*)
-      archive_cmds='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec='-L$libdir'
-      hardcode_shlibpath_var=no
-      ;;
-
-    *)
-      ld_shlibs=no
-      ;;
-    esac
-  fi
-
-echo "$as_me:$LINENO: result: $ld_shlibs" >&5
-echo "${ECHO_T}$ld_shlibs" >&6
-test "$ld_shlibs" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
-      $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag
-        allow_undefined_flag=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-  (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-        then
-	  archive_cmds_need_lc=no
-        else
-	  archive_cmds_need_lc=yes
-        fi
-        allow_undefined_flag=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc" >&5
-echo "${ECHO_T}$archive_cmds_need_lc" >&6
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix4* | aix5*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi4*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $rm \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-freebsd*)
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.01* | freebsdelf3.01*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  *) # from 3.2 on
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case "$host_cpu" in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-   hppa*64*)
-     shrext_cmds='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsdelf*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
-  ;;
-
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-nto-qnx*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-openbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=yes
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6
-test "$dynamic_linker" = no && can_build_shared=no
-
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
-hardcode_action=
-if test -n "$hardcode_libdir_flag_spec" || \
-   test -n "$runpath_var " || \
-   test "X$hardcode_automatic"="Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, )" != no &&
-     test "$hardcode_minus_L" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action=unsupported
-fi
-echo "$as_me:$LINENO: result: $hardcode_action" >&5
-echo "${ECHO_T}$hardcode_action" >&6
-
-if test "$hardcode_action" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-striplib=
-old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-       else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-       ;;
-   *)
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-    ;;
-  esac
-fi
-
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-   ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-   ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-
-fi
-
-   ;;
-
-  *)
-    echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
-if test "${ac_cv_func_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define shl_load innocuous_shl_load
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shl_load (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef shl_load
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char shl_load ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_shl_load) || defined (__stub___shl_load)
-choke me
-#else
-char (*f) () = shl_load;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != shl_load;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_shl_load=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_shl_load=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6
-if test $ac_cv_func_shl_load = yes; then
-  lt_cv_dlopen="shl_load"
-else
-  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char shl_load ();
-int
-main ()
-{
-shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dld_shl_load=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dld_shl_load=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
-if test $ac_cv_lib_dld_shl_load = yes; then
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
-else
-  echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
-if test "${ac_cv_func_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define dlopen innocuous_dlopen
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dlopen (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef dlopen
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_dlopen) || defined (__stub___dlopen)
-choke me
-#else
-char (*f) () = dlopen;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != dlopen;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
-if test $ac_cv_func_dlopen = yes; then
-  lt_cv_dlopen="dlopen"
-else
-  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_svld_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_svld_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
-if test $ac_cv_lib_svld_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else
-  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dld_link ();
-int
-main ()
-{
-dld_link ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dld_dld_link=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dld_dld_link=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
-if test $ac_cv_lib_dld_dld_link = yes; then
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 8794 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      LDFLAGS="$LDFLAGS $link_static_flag"
-      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self_static+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self_static=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 8892 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self_static=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-
-
-# Report which librarie types wil actually be built
-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6
-
-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case "$host_os" in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-
-aix4* | aix5*)
-  if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
-    test "$enable_shared" = yes && enable_static=no
-  fi
-  ;;
-  darwin* | rhapsody*)
-  if test "$GCC" = yes; then
-    archive_cmds_need_lc=no
-    case "$host_os" in
-    rhapsody* | darwin1.[012])
-      allow_undefined_flag='-undefined suppress'
-      ;;
-    *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-      	allow_undefined_flag='-flat_namespace -undefined suppress'
-      else
-        case ${MACOSX_DEPLOYMENT_TARGET} in
-          10.[012])
-            allow_undefined_flag='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            allow_undefined_flag='-undefined dynamic_lookup'
-            ;;
-        esac
-      fi
-      ;;
-    esac
-    output_verbose_link_cmd='echo'
-    archive_cmds='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring'
-    module_cmds='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-    archive_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag  -o $lib $libobjs $deplibs$compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    module_expsym_cmds='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    hardcode_direct=no
-    hardcode_automatic=yes
-    hardcode_shlibpath_var=unsupported
-    whole_archive_flag_spec='-all_load $convenience'
-    link_all_deplibs=yes
-  else
-    ld_shlibs=no
-  fi
-    ;;
-esac
-echo "$as_me:$LINENO: result: $enable_shared" >&5
-echo "${ECHO_T}$enable_shared" >&6
-
-echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-echo "$as_me:$LINENO: result: $enable_static" >&5
-echo "${ECHO_T}$enable_static" >&6
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler \
-    CC \
-    LD \
-    lt_prog_compiler_wl \
-    lt_prog_compiler_pic \
-    lt_prog_compiler_static \
-    lt_prog_compiler_no_builtin_flag \
-    export_dynamic_flag_spec \
-    thread_safe_flag_spec \
-    whole_archive_flag_spec \
-    enable_shared_with_static_runtimes \
-    old_archive_cmds \
-    old_archive_from_new_cmds \
-    predep_objects \
-    postdep_objects \
-    predeps \
-    postdeps \
-    compiler_lib_search_path \
-    archive_cmds \
-    archive_expsym_cmds \
-    postinstall_cmds \
-    postuninstall_cmds \
-    old_archive_from_expsyms_cmds \
-    allow_undefined_flag \
-    no_undefined_flag \
-    export_symbols_cmds \
-    hardcode_libdir_flag_spec \
-    hardcode_libdir_flag_spec_ld \
-    hardcode_libdir_separator \
-    hardcode_automatic \
-    module_cmds \
-    module_expsym_cmds \
-    lt_cv_prog_compiler_c_o \
-    exclude_expsyms \
-    include_expsyms; do
-
-    case $var in
-    old_archive_cmds | \
-    old_archive_from_new_cmds | \
-    archive_cmds | \
-    archive_expsym_cmds | \
-    module_cmds | \
-    module_expsym_cmds | \
-    old_archive_from_expsyms_cmds | \
-    export_symbols_cmds | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-cfgfile="${ofile}T"
-  trap "$rm \"$cfgfile\"; exit 1" 1 2 15
-  $rm -f "$cfgfile"
-  { echo "$as_me:$LINENO: creating $ofile" >&5
-echo "$as_me: creating $ofile" >&6;}
-
-  cat <<__EOF__ >> "$cfgfile"
-#! $SHELL
-
-# `$echo "$cfgfile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-# Free Software Foundation, Inc.
-#
-# This file is part of GNU Libtool:
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# A sed program that does not truncate output.
-SED=$lt_SED
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="$SED -e s/^X//"
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-
-# The names of the tagged configurations supported by this script.
-available_tags=
-
-# ### BEGIN LIBTOOL CONFIG
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# A language-specific compiler.
-CC=$lt_compiler
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o
-
-# Must we lock files when doing compilation ?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds
-archive_expsym_cmds=$lt_archive_expsym_cmds
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds
-module_expsym_cmds=$lt_module_expsym_cmds
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms
-
-# ### END LIBTOOL CONFIG
-
-__EOF__
-
-
-  case $host_os in
-  aix3*)
-    cat <<\EOF >> "$cfgfile"
-
-# AIX sometimes has problems with the GCC collect2 program.  For some
-# reason, if we set the COLLECT_NAMES environment variable, the problems
-# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
-  COLLECT_NAMES=
-  export COLLECT_NAMES
-fi
-EOF
-    ;;
-  esac
-
-  # We use sed instead of cat because bash on DJGPP gets confused if
-  # if finds mixed CR/LF and LF-only lines.  Since sed operates in
-  # text mode, it properly converts lines to CR/LF.  This bash problem
-  # is reportedly fixed, but why not run on old versions too?
-  sed '$q' "$ltmain" >> "$cfgfile" || (rm -f "$cfgfile"; exit 1)
-
-  mv -f "$cfgfile" "$ofile" || \
-    (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
-  chmod +x "$ofile"
-
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC="$lt_save_CC"
-
-
-# Check whether --with-tags or --without-tags was given.
-if test "${with_tags+set}" = set; then
-  withval="$with_tags"
-  tagnames="$withval"
-fi;
-
-if test -f "$ltmain" && test -n "$tagnames"; then
-  if test ! -f "${ofile}"; then
-    { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not exist" >&5
-echo "$as_me: WARNING: output file \`$ofile' does not exist" >&2;}
-  fi
-
-  if test -z "$LTCC"; then
-    eval "`$SHELL ${ofile} --config | grep '^LTCC='`"
-    if test -z "$LTCC"; then
-      { echo "$as_me:$LINENO: WARNING: output file \`$ofile' does not look like a libtool script" >&5
-echo "$as_me: WARNING: output file \`$ofile' does not look like a libtool script" >&2;}
-    else
-      { echo "$as_me:$LINENO: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&5
-echo "$as_me: WARNING: using \`LTCC=$LTCC', extracted from \`$ofile'" >&2;}
-    fi
-  fi
-
-  # Extract list of available tagged configurations in $ofile.
-  # Note that this assumes the entire list is on one line.
-  available_tags=`grep "^available_tags=" "${ofile}" | $SED -e 's/available_tags=\(.*$\)/\1/' -e 's/\"//g'`
-
-  lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
-  for tagname in $tagnames; do
-    IFS="$lt_save_ifs"
-    # Check whether tagname contains only valid characters
-    case `$echo "X$tagname" | $Xsed -e 's:[-_ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz1234567890,/]::g'` in
-    "") ;;
-    *)  { { echo "$as_me:$LINENO: error: invalid tag name: $tagname" >&5
-echo "$as_me: error: invalid tag name: $tagname" >&2;}
-   { (exit 1); exit 1; }; }
-	;;
-    esac
-
-    if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "${ofile}" > /dev/null
-    then
-      { { echo "$as_me:$LINENO: error: tag name \"$tagname\" already exists" >&5
-echo "$as_me: error: tag name \"$tagname\" already exists" >&2;}
-   { (exit 1); exit 1; }; }
-    fi
-
-    # Update the list of available tags.
-    if test -n "$tagname"; then
-      echo appending configuration tag \"$tagname\" to $ofile
-
-      case $tagname in
-      CXX)
-	if test -n "$CXX" && test "X$CXX" != "Xno"; then
-	  ac_ext=cc
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-
-
-
-
-archive_cmds_need_lc_CXX=no
-allow_undefined_flag_CXX=
-always_export_symbols_CXX=no
-archive_expsym_cmds_CXX=
-export_dynamic_flag_spec_CXX=
-hardcode_direct_CXX=no
-hardcode_libdir_flag_spec_CXX=
-hardcode_libdir_flag_spec_ld_CXX=
-hardcode_libdir_separator_CXX=
-hardcode_minus_L_CXX=no
-hardcode_automatic_CXX=no
-module_cmds_CXX=
-module_expsym_cmds_CXX=
-link_all_deplibs_CXX=unknown
-old_archive_cmds_CXX=$old_archive_cmds
-no_undefined_flag_CXX=
-whole_archive_flag_spec_CXX=
-enable_shared_with_static_runtimes_CXX=no
-
-# Dependencies to place before and after the object being linked:
-predep_objects_CXX=
-postdep_objects_CXX=
-predeps_CXX=
-postdeps_CXX=
-compiler_lib_search_path_CXX=
-
-# Source file extension for C++ test sources.
-ac_ext=cc
-
-# Object file extension for compiled C++ test sources.
-objext=o
-objext_CXX=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="int some_variable = 0;\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='int main(int, char *) { return(0); }\n'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# Allow CC to be a program name with arguments.
-lt_save_CC=$CC
-lt_save_LD=$LD
-lt_save_GCC=$GCC
-GCC=$GXX
-lt_save_with_gnu_ld=$with_gnu_ld
-lt_save_path_LD=$lt_cv_path_LD
-if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
-  lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
-else
-  unset lt_cv_prog_gnu_ld
-fi
-if test -n "${lt_cv_path_LDCXX+set}"; then
-  lt_cv_path_LD=$lt_cv_path_LDCXX
-else
-  unset lt_cv_path_LD
-fi
-test -z "${LDCXX+set}" || LD=$LDCXX
-CC=${CXX-"c++"}
-compiler=$CC
-compiler_CXX=$CC
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-
-# We don't want -fno-exception wen compiling C++ code, so set the
-# no_builtin_flag separately
-if test "$GXX" = yes; then
-  lt_prog_compiler_no_builtin_flag_CXX=' -fno-builtin'
-else
-  lt_prog_compiler_no_builtin_flag_CXX=
-fi
-
-if test "$GXX" = yes; then
-  # Set up default GNU C++ configuration
-
-
-# Check whether --with-gnu-ld or --without-gnu-ld was given.
-if test "${with_gnu_ld+set}" = set; then
-  withval="$with_gnu_ld"
-  test "$withval" = no || with_gnu_ld=yes
-else
-  with_gnu_ld=no
-fi;
-ac_prog=ld
-if test "$GCC" = yes; then
-  # Check if gcc -print-prog-name=ld gives a path.
-  echo "$as_me:$LINENO: checking for ld used by $CC" >&5
-echo $ECHO_N "checking for ld used by $CC... $ECHO_C" >&6
-  case $host in
-  *-*-mingw*)
-    # gcc leaves a trailing carriage return which upsets mingw
-    ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
-  *)
-    ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
-  esac
-  case $ac_prog in
-    # Accept absolute paths.
-    [\\/]* | ?:[\\/]*)
-      re_direlt='/[^/][^/]*/\.\./'
-      # Canonicalize the pathname of ld
-      ac_prog=`echo $ac_prog| $SED 's%\\\\%/%g'`
-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
-	ac_prog=`echo $ac_prog| $SED "s%$re_direlt%/%"`
-      done
-      test -z "$LD" && LD="$ac_prog"
-      ;;
-  "")
-    # If it fails, then pretend we aren't using GCC.
-    ac_prog=ld
-    ;;
-  *)
-    # If it is relative, then search for the first ld in PATH.
-    with_gnu_ld=unknown
-    ;;
-  esac
-elif test "$with_gnu_ld" = yes; then
-  echo "$as_me:$LINENO: checking for GNU ld" >&5
-echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
-else
-  echo "$as_me:$LINENO: checking for non-GNU ld" >&5
-echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
-fi
-if test "${lt_cv_path_LD+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  if test -z "$LD"; then
-  lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-  for ac_dir in $PATH; do
-    IFS="$lt_save_ifs"
-    test -z "$ac_dir" && ac_dir=.
-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
-      lt_cv_path_LD="$ac_dir/$ac_prog"
-      # Check to see if the program is GNU ld.  I'd rather use --version,
-      # but apparently some GNU ld's only accept -v.
-      # Break only if it was the GNU/non-GNU ld that we prefer.
-      case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
-      *GNU* | *'with BFD'*)
-	test "$with_gnu_ld" != no && break
-	;;
-      *)
-	test "$with_gnu_ld" != yes && break
-	;;
-      esac
-    fi
-  done
-  IFS="$lt_save_ifs"
-else
-  lt_cv_path_LD="$LD" # Let the user override the test with a path.
-fi
-fi
-
-LD="$lt_cv_path_LD"
-if test -n "$LD"; then
-  echo "$as_me:$LINENO: result: $LD" >&5
-echo "${ECHO_T}$LD" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-test -z "$LD" && { { echo "$as_me:$LINENO: error: no acceptable ld found in \$PATH" >&5
-echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
-   { (exit 1); exit 1; }; }
-echo "$as_me:$LINENO: checking if the linker ($LD) is GNU ld" >&5
-echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
-if test "${lt_cv_prog_gnu_ld+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
-case `$LD -v 2>&1 </dev/null` in
-*GNU* | *'with BFD'*)
-  lt_cv_prog_gnu_ld=yes
-  ;;
-*)
-  lt_cv_prog_gnu_ld=no
-  ;;
-esac
-fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_gnu_ld" >&5
-echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
-with_gnu_ld=$lt_cv_prog_gnu_ld
-
-
-
-  # Check if GNU C++ uses GNU ld as the underlying linker, since the
-  # archiving commands below assume that GNU ld is being used.
-  if test "$with_gnu_ld" = yes; then
-    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-    archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-
-    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
-    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    # XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
-    #     investigate it a little bit more. (MM)
-    wlarc='${wl}'
-
-    # ancient GNU ld didn't support --whole-archive et. al.
-    if eval "`$CC -print-prog-name=ld` --help 2>&1" | \
-	grep 'no-whole-archive' > /dev/null; then
-      whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-    else
-      whole_archive_flag_spec_CXX=
-    fi
-  else
-    with_gnu_ld=no
-    wlarc=
-
-    # A generic and very simple default shared library creation
-    # command for GNU C++ for the case where it uses the native
-    # linker, instead of GNU ld.  If possible, this setting should
-    # overridden to take advantage of the native linker features on
-    # the platform it is being used on.
-    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
-  fi
-
-  # Commands to make compiler produce verbose output that lists
-  # what "hidden" libraries, object files and flags are used when
-  # linking a shared library.
-  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-else
-  GXX=no
-  with_gnu_ld=no
-  wlarc=
-fi
-
-# PORTME: fill in a description of your system's C++ link characteristics
-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-ld_shlibs_CXX=yes
-case $host_os in
-  aix3*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-  aix4* | aix5*)
-    if test "$host_cpu" = ia64; then
-      # On IA64, the linker does run time linking by default, so we don't
-      # have to do anything special.
-      aix_use_runtimelinking=no
-      exp_sym_flag='-Bexport'
-      no_entry_flag=""
-    else
-      aix_use_runtimelinking=no
-
-      # Test if we are trying to use run time linking or normal
-      # AIX style linking. If -brtl is somewhere in LDFLAGS, we
-      # need to do runtime linking.
-      case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-	for ld_flag in $LDFLAGS; do
-	  case $ld_flag in
-	  *-brtl*)
-	    aix_use_runtimelinking=yes
-	    break
-	    ;;
-	  esac
-	done
-      esac
-
-      exp_sym_flag='-bexport'
-      no_entry_flag='-bnoentry'
-    fi
-
-    # When large executables or shared objects are built, AIX ld can
-    # have problems creating the table of contents.  If linking a library
-    # or program results in "error TOC overflow" add -mminimal-toc to
-    # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-    # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-    archive_cmds_CXX=''
-    hardcode_direct_CXX=yes
-    hardcode_libdir_separator_CXX=':'
-    link_all_deplibs_CXX=yes
-
-    if test "$GXX" = yes; then
-      case $host_os in aix4.012|aix4.012.*)
-      # We only want to do this on AIX 4.2 and lower, the check
-      # below for broken collect2 doesn't work under 4.3+
-	collect2name=`${CC} -print-prog-name=collect2`
-	if test -f "$collect2name" && \
-	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	then
-	  # We have reworked collect2
-	  hardcode_direct_CXX=yes
-	else
-	  # We have old collect2
-	  hardcode_direct_CXX=unsupported
-	  # It fails to find uninstalled libraries when the uninstalled
-	  # path is not listed in the libpath.  Setting hardcode_minus_L
-	  # to unsupported forces relinking
-	  hardcode_minus_L_CXX=yes
-	  hardcode_libdir_flag_spec_CXX='-L$libdir'
-	  hardcode_libdir_separator_CXX=
-	fi
-      esac
-      shared_flag='-shared'
-    else
-      # not using gcc
-      if test "$host_cpu" = ia64; then
-	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-	# chokes on -Wl,-G. The following line is correct:
-	shared_flag='-G'
-      else
-	if test "$aix_use_runtimelinking" = yes; then
-	  shared_flag='${wl}-G'
-	else
-	  shared_flag='${wl}-bM:SRE'
-	fi
-      fi
-    fi
-
-    # It seems that -bexpall does not export symbols beginning with
-    # underscore (_), so it is better to generate a list of symbols to export.
-    always_export_symbols_CXX=yes
-    if test "$aix_use_runtimelinking" = yes; then
-      # Warning - without using the other runtime loading flags (-brtl),
-      # -berok will link without error, but may produce a broken library.
-      allow_undefined_flag_CXX='-berok'
-      # Determine the default libpath from the value encoded in an empty executable.
-      cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-      hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-
-      archive_expsym_cmds_CXX="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-     else
-      if test "$host_cpu" = ia64; then
-	hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
-	allow_undefined_flag_CXX="-z nodefs"
-	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-      else
-	# Determine the default libpath from the value encoded in an empty executable.
-	cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-	hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
-	# Warning - without using the other run time loading flags,
-	# -berok will link without error, but may produce a broken library.
-	no_undefined_flag_CXX=' ${wl}-bernotok'
-	allow_undefined_flag_CXX=' ${wl}-berok'
-	# -bexpall does not export symbols beginning with underscore (_)
-	always_export_symbols_CXX=yes
-	# Exported symbols can be pulled into shared objects from archives
-	whole_archive_flag_spec_CXX=' '
-	archive_cmds_need_lc_CXX=yes
-	# This is similar to how AIX traditionally builds it's shared libraries.
-	archive_expsym_cmds_CXX="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-      fi
-    fi
-    ;;
-  chorus*)
-    case $cc_basename in
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
-
-  cygwin* | mingw* | pw32*)
-    # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
-    # as there is no search path for DLLs.
-    hardcode_libdir_flag_spec_CXX='-L$libdir'
-    allow_undefined_flag_CXX=unsupported
-    always_export_symbols_CXX=no
-    enable_shared_with_static_runtimes_CXX=yes
-
-    if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-      archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-      # If the export-symbols file already is a .def file (1st line
-      # is EXPORTS), use it as is; otherwise, prepend...
-      archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	cp $export_symbols $output_objdir/$soname.def;
-      else
-	echo EXPORTS > $output_objdir/$soname.def;
-	cat $export_symbols >> $output_objdir/$soname.def;
-      fi~
-      $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-    else
-      ld_shlibs_CXX=no
-    fi
-  ;;
-
-  darwin* | rhapsody*)
-  if test "$GXX" = yes; then
-    archive_cmds_need_lc_CXX=no
-    case "$host_os" in
-    rhapsody* | darwin1.[012])
-      allow_undefined_flag_CXX='-undefined suppress'
-      ;;
-    *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-      	allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
-      else
-        case ${MACOSX_DEPLOYMENT_TARGET} in
-          10.[012])
-            allow_undefined_flag_CXX='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            allow_undefined_flag_CXX='-undefined dynamic_lookup'
-            ;;
-        esac
-      fi
-      ;;
-    esac
-    lt_int_apple_cc_single_mod=no
-    output_verbose_link_cmd='echo'
-    if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-      lt_int_apple_cc_single_mod=yes
-    fi
-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-      archive_cmds_CXX='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-    else
-      archive_cmds_CXX='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-    fi
-    module_cmds_CXX='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-
-    # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-    if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-      archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    else
-      archive_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    fi
-    module_expsym_cmds_CXX='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-    hardcode_direct_CXX=no
-    hardcode_automatic_CXX=yes
-    hardcode_shlibpath_var_CXX=unsupported
-    whole_archive_flag_spec_CXX='-all_load $convenience'
-    link_all_deplibs_CXX=yes
-  else
-    ld_shlibs_CXX=no
-  fi
-    ;;
-
-  dgux*)
-    case $cc_basename in
-      ec++)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      ghcx)
-	# Green Hills C++ Compiler
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
-  freebsd12*)
-    # C++ shared libraries reported to be fairly broken before switch to ELF
-    ld_shlibs_CXX=no
-    ;;
-  freebsd-elf*)
-    archive_cmds_need_lc_CXX=no
-    ;;
-  freebsd* | kfreebsd*-gnu)
-    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
-    # conventions
-    ld_shlibs_CXX=yes
-    ;;
-  gnu*)
-    ;;
-  hpux9*)
-    hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-    hardcode_libdir_separator_CXX=:
-    export_dynamic_flag_spec_CXX='${wl}-E'
-    hardcode_direct_CXX=yes
-    hardcode_minus_L_CXX=yes # Not in the search PATH,
-				# but as the default
-				# location of the library.
-
-    case $cc_basename in
-    CC)
-      # FIXME: insert proper C++ library support
-      ld_shlibs_CXX=no
-      ;;
-    aCC)
-      archive_cmds_CXX='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      # Commands to make compiler produce verbose output that lists
-      # what "hidden" libraries, object files and flags are used when
-      # linking a shared library.
-      #
-      # There doesn't appear to be a way to prevent this compiler from
-      # explicitly linking system object files so we need to strip them
-      # from the output so that they don't get included in the library
-      # dependencies.
-      output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-      ;;
-    *)
-      if test "$GXX" = yes; then
-        archive_cmds_CXX='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-        # FIXME: insert proper C++ library support
-        ld_shlibs_CXX=no
-      fi
-      ;;
-    esac
-    ;;
-  hpux10*|hpux11*)
-    if test $with_gnu_ld = no; then
-      case "$host_cpu" in
-      hppa*64*)
-	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-	hardcode_libdir_separator_CXX=:
-        ;;
-      ia64*)
-	hardcode_libdir_flag_spec_CXX='-L$libdir'
-        ;;
-      *)
-	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
-	hardcode_libdir_separator_CXX=:
-	export_dynamic_flag_spec_CXX='${wl}-E'
-        ;;
-      esac
-    fi
-    case "$host_cpu" in
-    hppa*64*)
-      hardcode_direct_CXX=no
-      hardcode_shlibpath_var_CXX=no
-      ;;
-    ia64*)
-      hardcode_direct_CXX=no
-      hardcode_shlibpath_var_CXX=no
-      hardcode_minus_L_CXX=yes # Not in the search PATH,
-					      # but as the default
-					      # location of the library.
-      ;;
-    *)
-      hardcode_direct_CXX=yes
-      hardcode_minus_L_CXX=yes # Not in the search PATH,
-					      # but as the default
-					      # location of the library.
-      ;;
-    esac
-
-    case $cc_basename in
-      CC)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      aCC)
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
-	  ;;
-	*)
-	  archive_cmds_CXX='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	  ;;
-	esac
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes; then
-	  if test $with_gnu_ld = no; then
-	    case "$host_cpu" in
-	    ia64*|hppa*64*)
-	      archive_cmds_CXX='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
-	      ;;
-	    *)
-	      archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      ;;
-	    esac
-	  fi
-	else
-	  # FIXME: insert proper C++ library support
-	  ld_shlibs_CXX=no
-	fi
-	;;
-    esac
-    ;;
-  irix5* | irix6*)
-    case $cc_basename in
-      CC)
-	# SGI C++
-	archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-
-	# Archives containing C++ object files must be created using
-	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-	# necessary to make sure instantiated templates are included
-	# in the archive.
-	old_archive_cmds_CXX='$CC -ar -WR,-u -o $oldlib $oldobjs'
-	;;
-      *)
-	if test "$GXX" = yes; then
-	  if test "$with_gnu_ld" = no; then
-	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-	  else
-	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
-	  fi
-	fi
-	link_all_deplibs_CXX=yes
-	;;
-    esac
-    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-    hardcode_libdir_separator_CXX=:
-    ;;
-  linux*)
-    case $cc_basename in
-      KCC)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-	archive_expsym_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-
-	hardcode_libdir_flag_spec_CXX='${wl}--rpath,$libdir'
-	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-
-	# Archives containing C++ object files must be created using
-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
-	;;
-      icpc)
-	# Intel C++
-	with_gnu_ld=yes
-	archive_cmds_need_lc_CXX=no
-	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-	whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
-	;;
-      cxx)
-	# Compaq C++
-	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname  -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
-
-	runpath_var=LD_RUN_PATH
-	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-	hardcode_libdir_separator_CXX=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-    esac
-    ;;
-  lynxos*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-  m88k*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-  mvs*)
-    case $cc_basename in
-      cxx)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
-  netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-    if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-      archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
-      wlarc=
-      hardcode_libdir_flag_spec_CXX='-R$libdir'
-      hardcode_direct_CXX=yes
-      hardcode_shlibpath_var_CXX=no
-    fi
-    # Workaround some broken pre-1.5 toolchains
-    output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
-    ;;
-  osf3*)
-    case $cc_basename in
-      KCC)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	hardcode_libdir_separator_CXX=:
-
-	# Archives containing C++ object files must be created using
-	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
-	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
-
-	;;
-      RCC)
-	# Rational C++ 2.4.1
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      cxx)
-	allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-
-	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-	hardcode_libdir_separator_CXX=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	  archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-
-	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-	  hardcode_libdir_separator_CXX=:
-
-	  # Commands to make compiler produce verbose output that lists
-	  # what "hidden" libraries, object files and flags are used when
-	  # linking a shared library.
-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-	else
-	  # FIXME: insert proper C++ library support
-	  ld_shlibs_CXX=no
-	fi
-	;;
-    esac
-    ;;
-  osf4* | osf5*)
-    case $cc_basename in
-      KCC)
-	# Kuck and Associates, Inc. (KAI) C++ Compiler
-
-	# KCC will only create a shared library if the output file
-	# ends with ".so" (or ".sl" for HP-UX), so rename the library
-	# to its proper name (with version) after linking.
-	archive_cmds_CXX='tempext=`echo $shared_ext | $SED -e '\''s/\([^()0-9A-Za-z{}]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
-
-	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
-	hardcode_libdir_separator_CXX=:
-
-	# Archives containing C++ object files must be created using
-	# the KAI C++ compiler.
-	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
-	;;
-      RCC)
-	# Rational C++ 2.4.1
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      cxx)
-	allow_undefined_flag_CXX=' -expect_unresolved \*'
-	archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
-	archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
-	  echo "-hidden">> $lib.exp~
-	  $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp  `test -n "$verstring" && echo -set_version	$verstring` -update_registry $objdir/so_locations -o $lib~
-	  $rm $lib.exp'
-
-	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-	hardcode_libdir_separator_CXX=:
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld" | grep -v "ld:"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-	;;
-      *)
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	 archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
-
-	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
-	  hardcode_libdir_separator_CXX=:
-
-	  # Commands to make compiler produce verbose output that lists
-	  # what "hidden" libraries, object files and flags are used when
-	  # linking a shared library.
-	  output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "\-L"'
-
-	else
-	  # FIXME: insert proper C++ library support
-	  ld_shlibs_CXX=no
-	fi
-	;;
-    esac
-    ;;
-  psos*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-  sco*)
-    archive_cmds_need_lc_CXX=no
-    case $cc_basename in
-      CC)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
-  sunos4*)
-    case $cc_basename in
-      CC)
-	# Sun C++ 4.x
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      lcc)
-	# Lucid
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
-  solaris*)
-    case $cc_basename in
-      CC)
-	# Sun C++ 4.2, 5.x and Centerline C++
-	no_undefined_flag_CXX=' -zdefs'
-	archive_cmds_CXX='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	$CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	hardcode_libdir_flag_spec_CXX='-R$libdir'
-	hardcode_shlibpath_var_CXX=no
-	case $host_os in
-	  solaris2.0-5 | solaris2.0-5.*) ;;
-	  *)
-	    # The C++ compiler is used as linker so we must use $wl
-	    # flag to pass the commands to the underlying system
-	    # linker.
-	    # Supported since Solaris 2.6 (maybe 2.5.1?)
-	    whole_archive_flag_spec_CXX='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
-	    ;;
-	esac
-	link_all_deplibs_CXX=yes
-
-	# Commands to make compiler produce verbose output that lists
-	# what "hidden" libraries, object files and flags are used when
-	# linking a shared library.
-	#
-	# There doesn't appear to be a way to prevent this compiler from
-	# explicitly linking system object files so we need to strip them
-	# from the output so that they don't get included in the library
-	# dependencies.
-	output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[LR]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
-
-	# Archives containing C++ object files must be created using
-	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-	# necessary to make sure instantiated templates are included
-	# in the archive.
-	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
-	;;
-      gcx)
-	# Green Hills C++ Compiler
-	archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-
-	# The C++ compiler must be used to create the archive.
-	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-	;;
-      *)
-	# GNU C++ compiler with Solaris linker
-	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
-	  no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
-	  if $CC --version | grep -v '^2\.7' > /dev/null; then
-	    archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    output_verbose_link_cmd="$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-	  else
-	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
-	    # platform.
-	    archive_cmds_CXX='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
-	    archive_expsym_cmds_CXX='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-		$CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
-
-	    # Commands to make compiler produce verbose output that lists
-	    # what "hidden" libraries, object files and flags are used when
-	    # linking a shared library.
-	    output_verbose_link_cmd="$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep \"\-L\""
-	  fi
-
-	  hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
-	fi
-	;;
-    esac
-    ;;
-  sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*)
-    archive_cmds_need_lc_CXX=no
-    ;;
-  tandem*)
-    case $cc_basename in
-      NCC)
-	# NonStop-UX NCC 3.20
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-      *)
-	# FIXME: insert proper C++ library support
-	ld_shlibs_CXX=no
-	;;
-    esac
-    ;;
-  vxworks*)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-  *)
-    # FIXME: insert proper C++ library support
-    ld_shlibs_CXX=no
-    ;;
-esac
-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-echo "${ECHO_T}$ld_shlibs_CXX" >&6
-test "$ld_shlibs_CXX" = no && can_build_shared=no
-
-GCC_CXX="$GXX"
-LD_CXX="$LD"
-
-
-cat > conftest.$ac_ext <<EOF
-class Foo
-{
-public:
-  Foo (void) { a = 0; }
-private:
-  int a;
-};
-EOF
-
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  # Parse the compiler output and extract the necessary
-  # objects, libraries and library flags.
-
-  # Sentinel used to keep track of whether or not we are before
-  # the conftest object file.
-  pre_test_object_deps_done=no
-
-  # The `*' in the case matches for architectures that use `case' in
-  # $output_verbose_cmd can trigger glob expansion during the loop
-  # eval without this substitution.
-  output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
-
-  for p in `eval $output_verbose_link_cmd`; do
-    case $p in
-
-    -L* | -R* | -l*)
-       # Some compilers place space between "-{L,R}" and the path.
-       # Remove the space.
-       if test $p = "-L" \
-	  || test $p = "-R"; then
-	 prev=$p
-	 continue
-       else
-	 prev=
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 case $p in
-	 -L* | -R*)
-	   # Internal compiler library paths should come after those
-	   # provided the user.  The postdeps already come after the
-	   # user supplied libs so there is no need to process them.
-	   if test -z "$compiler_lib_search_path_CXX"; then
-	     compiler_lib_search_path_CXX="${prev}${p}"
-	   else
-	     compiler_lib_search_path_CXX="${compiler_lib_search_path_CXX} ${prev}${p}"
-	   fi
-	   ;;
-	 # The "-l" case would never come before the object being
-	 # linked, so don't bother handling this case.
-	 esac
-       else
-	 if test -z "$postdeps_CXX"; then
-	   postdeps_CXX="${prev}${p}"
-	 else
-	   postdeps_CXX="${postdeps_CXX} ${prev}${p}"
-	 fi
-       fi
-       ;;
-
-    *.$objext)
-       # This assumes that the test object file only shows up
-       # once in the compiler output.
-       if test "$p" = "conftest.$objext"; then
-	 pre_test_object_deps_done=yes
-	 continue
-       fi
-
-       if test "$pre_test_object_deps_done" = no; then
-	 if test -z "$predep_objects_CXX"; then
-	   predep_objects_CXX="$p"
-	 else
-	   predep_objects_CXX="$predep_objects_CXX $p"
-	 fi
-       else
-	 if test -z "$postdep_objects_CXX"; then
-	   postdep_objects_CXX="$p"
-	 else
-	   postdep_objects_CXX="$postdep_objects_CXX $p"
-	 fi
-       fi
-       ;;
-
-    *) ;; # Ignore the rest.
-
-    esac
-  done
-
-  # Clean up.
-  rm -f a.out a.exe
-else
-  echo "libtool.m4: error: problem compiling CXX test program"
-fi
-
-$rm -f confest.$objext
-
-case " $postdeps_CXX " in
-*" -lc "*) archive_cmds_need_lc_CXX=no ;;
-esac
-
-lt_prog_compiler_wl_CXX=
-lt_prog_compiler_pic_CXX=
-lt_prog_compiler_static_CXX=
-
-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
-
-  # C++ specific cases for pic, static, wl, etc.
-  if test "$GXX" = yes; then
-    lt_prog_compiler_wl_CXX='-Wl,'
-    lt_prog_compiler_static_CXX='-static'
-
-    case $host_os in
-    aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_CXX='-Bstatic'
-      fi
-      ;;
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      lt_prog_compiler_pic_CXX='-m68020 -resident32 -malways-restore-a4'
-      ;;
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-    mingw* | os2* | pw32*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
-      ;;
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic_CXX='-fno-common'
-      ;;
-    *djgpp*)
-      # DJGPP does not support shared libraries at all
-      lt_prog_compiler_pic_CXX=
-      ;;
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic_CXX=-Kconform_pic
-      fi
-      ;;
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case "$host_cpu" in
-      hppa*64*|ia64*)
-	;;
-      *)
-	lt_prog_compiler_pic_CXX='-fPIC'
-	;;
-      esac
-      ;;
-    *)
-      lt_prog_compiler_pic_CXX='-fPIC'
-      ;;
-    esac
-  else
-    case $host_os in
-      aix4* | aix5*)
-	# All AIX code is PIC.
-	if test "$host_cpu" = ia64; then
-	  # AIX 5 now supports IA64 processor
-	  lt_prog_compiler_static_CXX='-Bstatic'
-	else
-	  lt_prog_compiler_static_CXX='-bnso -bI:/lib/syscalls.exp'
-	fi
-	;;
-      chorus*)
-	case $cc_basename in
-	cxch68)
-	  # Green Hills C++ Compiler
-	  # _LT_AC_TAGVAR(lt_prog_compiler_static, CXX)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
-	  ;;
-	esac
-	;;
-      dgux*)
-	case $cc_basename in
-	  ec++)
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    ;;
-	  ghcx)
-	    # Green Hills C++ Compiler
-	    lt_prog_compiler_pic_CXX='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      freebsd* | kfreebsd*-gnu)
-	# FreeBSD uses GNU C++
-	;;
-      hpux9* | hpux10* | hpux11*)
-	case $cc_basename in
-	  CC)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-	    if test "$host_cpu" != ia64; then
-	      lt_prog_compiler_pic_CXX='+Z'
-	    fi
-	    ;;
-	  aCC)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
-	    case "$host_cpu" in
-	    hppa*64*|ia64*)
-	      # +Z the default
-	      ;;
-	    *)
-	      lt_prog_compiler_pic_CXX='+Z'
-	      ;;
-	    esac
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      irix5* | irix6* | nonstopux*)
-	case $cc_basename in
-	  CC)
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_static_CXX='-non_shared'
-	    # CC pic flag -KPIC is the default.
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      linux*)
-	case $cc_basename in
-	  KCC)
-	    # KAI C++ Compiler
-	    lt_prog_compiler_wl_CXX='--backend -Wl,'
-	    lt_prog_compiler_pic_CXX='-fPIC'
-	    ;;
-	  icpc)
-	    # Intel C++
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    lt_prog_compiler_static_CXX='-static'
-	    ;;
-	  cxx)
-	    # Compaq C++
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    lt_prog_compiler_pic_CXX=
-	    lt_prog_compiler_static_CXX='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      lynxos*)
-	;;
-      m88k*)
-	;;
-      mvs*)
-	case $cc_basename in
-	  cxx)
-	    lt_prog_compiler_pic_CXX='-W c,exportall'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-	;;
-      osf3* | osf4* | osf5*)
-	case $cc_basename in
-	  KCC)
-	    lt_prog_compiler_wl_CXX='--backend -Wl,'
-	    ;;
-	  RCC)
-	    # Rational C++ 2.4.1
-	    lt_prog_compiler_pic_CXX='-pic'
-	    ;;
-	  cxx)
-	    # Digital/Compaq C++
-	    lt_prog_compiler_wl_CXX='-Wl,'
-	    # Make sure the PIC flag is empty.  It appears that all Alpha
-	    # Linux and Compaq Tru64 Unix objects are PIC.
-	    lt_prog_compiler_pic_CXX=
-	    lt_prog_compiler_static_CXX='-non_shared'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      psos*)
-	;;
-      sco*)
-	case $cc_basename in
-	  CC)
-	    lt_prog_compiler_pic_CXX='-fPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      solaris*)
-	case $cc_basename in
-	  CC)
-	    # Sun C++ 4.2, 5.x and Centerline C++
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    lt_prog_compiler_static_CXX='-Bstatic'
-	    lt_prog_compiler_wl_CXX='-Qoption ld '
-	    ;;
-	  gcx)
-	    # Green Hills C++ Compiler
-	    lt_prog_compiler_pic_CXX='-PIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      sunos4*)
-	case $cc_basename in
-	  CC)
-	    # Sun C++ 4.x
-	    lt_prog_compiler_pic_CXX='-pic'
-	    lt_prog_compiler_static_CXX='-Bstatic'
-	    ;;
-	  lcc)
-	    # Lucid
-	    lt_prog_compiler_pic_CXX='-pic'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      tandem*)
-	case $cc_basename in
-	  NCC)
-	    # NonStop-UX NCC 3.20
-	    lt_prog_compiler_pic_CXX='-KPIC'
-	    ;;
-	  *)
-	    ;;
-	esac
-	;;
-      unixware*)
-	;;
-      vxworks*)
-	;;
-      *)
-	lt_prog_compiler_can_build_shared_CXX=no
-	;;
-    esac
-  fi
-
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_CXX" >&6
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic_CXX"; then
-
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... $ECHO_C" >&6
-if test "${lt_prog_compiler_pic_works_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_prog_compiler_pic_works_CXX=no
-  ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic_CXX -DPIC"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11069: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:11073: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s conftest.err; then
-       lt_prog_compiler_pic_works_CXX=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_CXX" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_CXX" >&6
-
-if test x"$lt_prog_compiler_pic_works_CXX" = xyes; then
-    case $lt_prog_compiler_pic_CXX in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic_CXX=" $lt_prog_compiler_pic_CXX" ;;
-     esac
-else
-    lt_prog_compiler_pic_CXX=
-     lt_prog_compiler_can_build_shared_CXX=no
-fi
-
-fi
-case "$host_os" in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic_CXX=
-    ;;
-  *)
-    lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
-    ;;
-esac
-
-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_prog_compiler_c_o_CXX=no
-   $rm -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11129: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:11133: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s out/conftest.err; then
-       lt_cv_prog_compiler_c_o_CXX=yes
-     fi
-   fi
-   chmod u+w .
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_CXX" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_CXX" >&6
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_CXX" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6
-  if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-
-  export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  case $host_os in
-  aix4* | aix5*)
-    # If we're using GNU nm, then we don't want the "-C" option.
-    # -C means demangle to AIX nm, but means don't demangle with GNU nm
-    if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-    else
-      export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-    fi
-    ;;
-  pw32*)
-    export_symbols_cmds_CXX="$ltdll_cmds"
-  ;;
-  cygwin* | mingw*)
-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  linux*)
-    link_all_deplibs_CXX=no
-  ;;
-  *)
-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  esac
-
-echo "$as_me:$LINENO: result: $ld_shlibs_CXX" >&5
-echo "${ECHO_T}$ld_shlibs_CXX" >&6
-test "$ld_shlibs_CXX" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc_CXX" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc_CXX=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds_CXX in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
-      $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl_CXX
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
-        allow_undefined_flag_CXX=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-  (eval $archive_cmds_CXX 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-        then
-	  archive_cmds_need_lc_CXX=no
-        else
-	  archive_cmds_need_lc_CXX=yes
-        fi
-        allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_CXX" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_CXX" >&6
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix4* | aix5*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi4*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $rm \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-freebsd*)
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.01* | freebsdelf3.01*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  *) # from 3.2 on
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case "$host_cpu" in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-   hppa*64*)
-     shrext_cmds='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsdelf*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
-  ;;
-
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-nto-qnx*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-openbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=yes
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6
-test "$dynamic_linker" = no && can_build_shared=no
-
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
-hardcode_action_CXX=
-if test -n "$hardcode_libdir_flag_spec_CXX" || \
-   test -n "$runpath_var CXX" || \
-   test "X$hardcode_automatic_CXX"="Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct_CXX" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, CXX)" != no &&
-     test "$hardcode_minus_L_CXX" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_CXX=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_CXX=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_CXX=unsupported
-fi
-echo "$as_me:$LINENO: result: $hardcode_action_CXX" >&5
-echo "${ECHO_T}$hardcode_action_CXX" >&6
-
-if test "$hardcode_action_CXX" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-striplib=
-old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-       else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-       ;;
-   *)
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-    ;;
-  esac
-fi
-
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-   ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-   ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-
-fi
-
-   ;;
-
-  *)
-    echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
-if test "${ac_cv_func_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define shl_load innocuous_shl_load
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shl_load (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef shl_load
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char shl_load ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_shl_load) || defined (__stub___shl_load)
-choke me
-#else
-char (*f) () = shl_load;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != shl_load;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_shl_load=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_shl_load=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6
-if test $ac_cv_func_shl_load = yes; then
-  lt_cv_dlopen="shl_load"
-else
-  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char shl_load ();
-int
-main ()
-{
-shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dld_shl_load=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dld_shl_load=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
-if test $ac_cv_lib_dld_shl_load = yes; then
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
-else
-  echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
-if test "${ac_cv_func_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define dlopen innocuous_dlopen
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dlopen (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef dlopen
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_dlopen) || defined (__stub___dlopen)
-choke me
-#else
-char (*f) () = dlopen;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != dlopen;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
-if test $ac_cv_func_dlopen = yes; then
-  lt_cv_dlopen="dlopen"
-else
-  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_svld_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_svld_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
-if test $ac_cv_lib_svld_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else
-  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dld_link ();
-int
-main ()
-{
-dld_link ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dld_dld_link=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dld_dld_link=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
-if test $ac_cv_lib_dld_dld_link = yes; then
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 12498 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      LDFLAGS="$LDFLAGS $link_static_flag"
-      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self_static+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self_static=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 12596 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self_static=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler_CXX \
-    CC_CXX \
-    LD_CXX \
-    lt_prog_compiler_wl_CXX \
-    lt_prog_compiler_pic_CXX \
-    lt_prog_compiler_static_CXX \
-    lt_prog_compiler_no_builtin_flag_CXX \
-    export_dynamic_flag_spec_CXX \
-    thread_safe_flag_spec_CXX \
-    whole_archive_flag_spec_CXX \
-    enable_shared_with_static_runtimes_CXX \
-    old_archive_cmds_CXX \
-    old_archive_from_new_cmds_CXX \
-    predep_objects_CXX \
-    postdep_objects_CXX \
-    predeps_CXX \
-    postdeps_CXX \
-    compiler_lib_search_path_CXX \
-    archive_cmds_CXX \
-    archive_expsym_cmds_CXX \
-    postinstall_cmds_CXX \
-    postuninstall_cmds_CXX \
-    old_archive_from_expsyms_cmds_CXX \
-    allow_undefined_flag_CXX \
-    no_undefined_flag_CXX \
-    export_symbols_cmds_CXX \
-    hardcode_libdir_flag_spec_CXX \
-    hardcode_libdir_flag_spec_ld_CXX \
-    hardcode_libdir_separator_CXX \
-    hardcode_automatic_CXX \
-    module_cmds_CXX \
-    module_expsym_cmds_CXX \
-    lt_cv_prog_compiler_c_o_CXX \
-    exclude_expsyms_CXX \
-    include_expsyms_CXX; do
-
-    case $var in
-    old_archive_cmds_CXX | \
-    old_archive_from_new_cmds_CXX | \
-    archive_cmds_CXX | \
-    archive_expsym_cmds_CXX | \
-    module_cmds_CXX | \
-    module_expsym_cmds_CXX | \
-    old_archive_from_expsyms_cmds_CXX | \
-    export_symbols_cmds_CXX | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-cfgfile="$ofile"
-
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_CXX
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_CXX
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# A language-specific compiler.
-CC=$lt_compiler_CXX
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_CXX
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_CXX
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_CXX
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_CXX
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
-
-# Must we lock files when doing compilation ?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_CXX
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_CXX
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_CXX
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_CXX
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_CXX
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_CXX
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_CXX
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_CXX
-archive_expsym_cmds=$lt_archive_expsym_cmds_CXX
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_CXX
-module_expsym_cmds=$lt_module_expsym_cmds_CXX
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_CXX
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_CXX
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_CXX
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_CXX
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_CXX
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_CXX
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_CXX
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_CXX
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_CXX
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_CXX
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_CXX
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic_CXX
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_CXX
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_CXX"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_CXX
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_CXX
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_CXX
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_CXX
-
-# ### END LIBTOOL TAG CONFIG: $tagname
-
-__EOF__
-
-
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC=$lt_save_CC
-LDCXX=$LD
-LD=$lt_save_LD
-GCC=$lt_save_GCC
-with_gnu_ldcxx=$with_gnu_ld
-with_gnu_ld=$lt_save_with_gnu_ld
-lt_cv_path_LDCXX=$lt_cv_path_LD
-lt_cv_path_LD=$lt_save_path_LD
-lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
-lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-
-	else
-	  tagname=""
-	fi
-	;;
-
-      F77)
-	if test -n "$F77" && test "X$F77" != "Xno"; then
-
-ac_ext=f
-ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
-ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_f77_compiler_gnu
-
-
-archive_cmds_need_lc_F77=no
-allow_undefined_flag_F77=
-always_export_symbols_F77=no
-archive_expsym_cmds_F77=
-export_dynamic_flag_spec_F77=
-hardcode_direct_F77=no
-hardcode_libdir_flag_spec_F77=
-hardcode_libdir_flag_spec_ld_F77=
-hardcode_libdir_separator_F77=
-hardcode_minus_L_F77=no
-hardcode_automatic_F77=no
-module_cmds_F77=
-module_expsym_cmds_F77=
-link_all_deplibs_F77=unknown
-old_archive_cmds_F77=$old_archive_cmds
-no_undefined_flag_F77=
-whole_archive_flag_spec_F77=
-enable_shared_with_static_runtimes_F77=no
-
-# Source file extension for f77 test sources.
-ac_ext=f
-
-# Object file extension for compiled f77 test sources.
-objext=o
-objext_F77=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="      subroutine t\n      return\n      end\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="      program t\n      end\n"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${F77-"f77"}
-compiler=$CC
-compiler_F77=$CC
-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
-
-echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
-echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-echo "$as_me:$LINENO: result: $can_build_shared" >&5
-echo "${ECHO_T}$can_build_shared" >&6
-
-echo "$as_me:$LINENO: checking whether to build shared libraries" >&5
-echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
-test "$can_build_shared" = "no" && enable_shared=no
-
-# On AIX, shared libraries and static libraries use the same namespace, and
-# are all built from PIC.
-case "$host_os" in
-aix3*)
-  test "$enable_shared" = yes && enable_static=no
-  if test -n "$RANLIB"; then
-    archive_cmds="$archive_cmds~\$RANLIB \$lib"
-    postinstall_cmds='$RANLIB $lib'
-  fi
-  ;;
-aix4* | aix5*)
-  test "$enable_shared" = yes && enable_static=no
-  ;;
-esac
-echo "$as_me:$LINENO: result: $enable_shared" >&5
-echo "${ECHO_T}$enable_shared" >&6
-
-echo "$as_me:$LINENO: checking whether to build static libraries" >&5
-echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
-# Make sure either enable_shared or enable_static is yes.
-test "$enable_shared" = yes || enable_static=yes
-echo "$as_me:$LINENO: result: $enable_static" >&5
-echo "${ECHO_T}$enable_static" >&6
-
-test "$ld_shlibs_F77" = no && can_build_shared=no
-
-GCC_F77="$G77"
-LD_F77="$LD"
-
-lt_prog_compiler_wl_F77=
-lt_prog_compiler_pic_F77=
-lt_prog_compiler_static_F77=
-
-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
-
-  if test "$GCC" = yes; then
-    lt_prog_compiler_wl_F77='-Wl,'
-    lt_prog_compiler_static_F77='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_F77='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      lt_prog_compiler_pic_F77='-m68020 -resident32 -malways-restore-a4'
-      ;;
-
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic_F77='-fno-common'
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      lt_prog_compiler_can_build_shared_F77=no
-      enable_shared=no
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic_F77=-Kconform_pic
-      fi
-      ;;
-
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case "$host_cpu" in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic_F77='-fPIC'
-	;;
-      esac
-      ;;
-
-    *)
-      lt_prog_compiler_pic_F77='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_F77='-Bstatic'
-      else
-	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic_F77='-DDLL_EXPORT'
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case "$host_cpu" in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic_F77='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static_F77='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static_F77='-non_shared'
-      ;;
-
-    newsos6)
-      lt_prog_compiler_pic_F77='-KPIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    linux*)
-      case $CC in
-      icc* | ecc*)
-	lt_prog_compiler_wl_F77='-Wl,'
-	lt_prog_compiler_pic_F77='-KPIC'
-	lt_prog_compiler_static_F77='-static'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl_F77='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static_F77='-non_shared'
-        ;;
-      esac
-      ;;
-
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static_F77='-non_shared'
-      ;;
-
-    sco3.2v5*)
-      lt_prog_compiler_pic_F77='-Kpic'
-      lt_prog_compiler_static_F77='-dn'
-      ;;
-
-    solaris*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      lt_prog_compiler_pic_F77='-KPIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    sunos4*)
-      lt_prog_compiler_wl_F77='-Qoption ld '
-      lt_prog_compiler_pic_F77='-PIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-      lt_prog_compiler_wl_F77='-Wl,'
-      lt_prog_compiler_pic_F77='-KPIC'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	lt_prog_compiler_pic_F77='-Kconform_pic'
-	lt_prog_compiler_static_F77='-Bstatic'
-      fi
-      ;;
-
-    uts4*)
-      lt_prog_compiler_pic_F77='-pic'
-      lt_prog_compiler_static_F77='-Bstatic'
-      ;;
-
-    *)
-      lt_prog_compiler_can_build_shared_F77=no
-      ;;
-    esac
-  fi
-
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_F77" >&6
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic_F77"; then
-
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_F77 works... $ECHO_C" >&6
-if test "${lt_prog_compiler_pic_works_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_prog_compiler_pic_works_F77=no
-  ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic_F77"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13423: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:13427: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s conftest.err; then
-       lt_prog_compiler_pic_works_F77=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_F77" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_F77" >&6
-
-if test x"$lt_prog_compiler_pic_works_F77" = xyes; then
-    case $lt_prog_compiler_pic_F77 in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic_F77=" $lt_prog_compiler_pic_F77" ;;
-     esac
-else
-    lt_prog_compiler_pic_F77=
-     lt_prog_compiler_can_build_shared_F77=no
-fi
-
-fi
-case "$host_os" in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic_F77=
-    ;;
-  *)
-    lt_prog_compiler_pic_F77="$lt_prog_compiler_pic_F77"
-    ;;
-esac
-
-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
-if test "${lt_cv_prog_compiler_c_o_F77+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_prog_compiler_c_o_F77=no
-   $rm -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13483: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:13487: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s out/conftest.err; then
-       lt_cv_prog_compiler_c_o_F77=yes
-     fi
-   fi
-   chmod u+w .
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_F77" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_F77" >&6
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_F77" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6
-  if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-
-  runpath_var=
-  allow_undefined_flag_F77=
-  enable_shared_with_static_runtimes_F77=no
-  archive_cmds_F77=
-  archive_expsym_cmds_F77=
-  old_archive_From_new_cmds_F77=
-  old_archive_from_expsyms_cmds_F77=
-  export_dynamic_flag_spec_F77=
-  whole_archive_flag_spec_F77=
-  thread_safe_flag_spec_F77=
-  hardcode_libdir_flag_spec_F77=
-  hardcode_libdir_flag_spec_ld_F77=
-  hardcode_libdir_separator_F77=
-  hardcode_direct_F77=no
-  hardcode_minus_L_F77=no
-  hardcode_shlibpath_var_F77=unsupported
-  link_all_deplibs_F77=unknown
-  hardcode_automatic_F77=no
-  module_cmds_F77=
-  module_expsym_cmds_F77=
-  always_export_symbols_F77=no
-  export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  include_expsyms_F77=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  exclude_expsyms_F77="_GLOBAL_OFFSET_TABLE_"
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  ld_shlibs_F77=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix3* | aix4* | aix5*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	ld_shlibs_F77=no
-	cat <<EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-EOF
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_minus_L_F77=yes
-
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can't use
-      # them.
-      ld_shlibs_F77=no
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	allow_undefined_flag_F77=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds_F77='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	ld_shlibs_F77=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      allow_undefined_flag_F77=unsupported
-      always_export_symbols_F77=no
-      enable_shared_with_static_runtimes_F77=yes
-      export_symbols_cmds_F77='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds_F77='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris* | sysv5*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-	ld_shlibs_F77=no
-	cat <<EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-EOF
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs_F77=no
-      fi
-      ;;
-
-    sunos4*)
-      archive_cmds_F77='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-  linux*)
-    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_cmds_F77="$tmp_archive_cmds"
-      supports_anon_versioning=no
-      case `$LD -v 2>/dev/null` in
-        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-        *\ 2.11.*) ;; # other 2.11 versions
-        *) supports_anon_versioning=yes ;;
-      esac
-      if test $supports_anon_versioning = yes; then
-        archive_expsym_cmds_F77='$echo "{ global:" > $output_objdir/$libname.ver~
-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-$echo "local: *; };" >> $output_objdir/$libname.ver~
-        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-      else
-        archive_expsym_cmds_F77="$tmp_archive_cmds"
-      fi
-      link_all_deplibs_F77=no
-    else
-      ld_shlibs_F77=no
-    fi
-    ;;
-
-    *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs_F77=no
-      fi
-      ;;
-    esac
-
-    if test "$ld_shlibs_F77" = yes; then
-      runpath_var=LD_RUN_PATH
-      hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir'
-      export_dynamic_flag_spec_F77='${wl}--export-dynamic'
-      # ancient GNU ld didn't support --whole-archive et. al.
-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- 	whole_archive_flag_spec_F77="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	whole_archive_flag_spec_F77=
-      fi
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag_F77=unsupported
-      always_export_symbols_F77=yes
-      archive_expsym_cmds_F77='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L_F77=yes
-      if test "$GCC" = yes && test -z "$link_static_flag"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	hardcode_direct_F77=unsupported
-      fi
-      ;;
-
-    aix4* | aix5*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-	  export_symbols_cmds_F77='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-	else
-	  export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-	  for ld_flag in $LDFLAGS; do
-  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-  	    aix_use_runtimelinking=yes
-  	    break
-  	  fi
-	  done
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      archive_cmds_F77=''
-      hardcode_direct_F77=yes
-      hardcode_libdir_separator_F77=':'
-      link_all_deplibs_F77=yes
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.012|aix4.012.*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" && \
-  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	  then
-  	  # We have reworked collect2
-  	  hardcode_direct_F77=yes
-	  else
-  	  # We have old collect2
-  	  hardcode_direct_F77=unsupported
-  	  # It fails to find uninstalled libraries when the uninstalled
-  	  # path is not listed in the libpath.  Setting hardcode_minus_L
-  	  # to unsupported forces relinking
-  	  hardcode_minus_L_F77=yes
-  	  hardcode_libdir_flag_spec_F77='-L$libdir'
-  	  hardcode_libdir_separator_F77=
-	  fi
-	esac
-	shared_flag='-shared'
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-  	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-  	if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-  	fi
-	fi
-      fi
-
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      always_export_symbols_F77=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	allow_undefined_flag_F77='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       cat >conftest.$ac_ext <<_ACEOF
-      program main
-
-      end
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-       hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
-	archive_expsym_cmds_F77="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-       else
-	if test "$host_cpu" = ia64; then
-	  hardcode_libdir_flag_spec_F77='${wl}-R $libdir:/usr/lib:/lib'
-	  allow_undefined_flag_F77="-z nodefs"
-	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an empty executable.
-	 cat >conftest.$ac_ext <<_ACEOF
-      program main
-
-      end
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_f77_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-	 hardcode_libdir_flag_spec_F77='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  no_undefined_flag_F77=' ${wl}-bernotok'
-	  allow_undefined_flag_F77=' ${wl}-berok'
-	  # -bexpall does not export symbols beginning with underscore (_)
-	  always_export_symbols_F77=yes
-	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec_F77=' '
-	  archive_cmds_need_lc_F77=yes
-	  # This is similar to how AIX traditionally builds it's shared libraries.
-	  archive_expsym_cmds_F77="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds_F77='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_minus_L_F77=yes
-      # see comment about different semantics on the GNU ld section
-      ld_shlibs_F77=no
-      ;;
-
-    bsdi4*)
-      export_dynamic_flag_spec_F77=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      hardcode_libdir_flag_spec_F77=' '
-      allow_undefined_flag_F77=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      archive_cmds_F77='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      old_archive_From_new_cmds_F77='true'
-      # FIXME: Should let the user specify the lib program.
-      old_archive_cmds_F77='lib /OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path='`cygpath -w "$srcfile"`'
-      enable_shared_with_static_runtimes_F77=yes
-      ;;
-
-    darwin* | rhapsody*)
-    if test "$GXX" = yes ; then
-      archive_cmds_need_lc_F77=no
-      case "$host_os" in
-      rhapsody* | darwin1.[012])
-	allow_undefined_flag_F77='-undefined suppress'
-	;;
-      *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-      	allow_undefined_flag_F77='-flat_namespace -undefined suppress'
-      else
-        case ${MACOSX_DEPLOYMENT_TARGET} in
-          10.[012])
-            allow_undefined_flag_F77='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            allow_undefined_flag_F77='-undefined dynamic_lookup'
-            ;;
-        esac
-      fi
-	;;
-      esac
-    	lt_int_apple_cc_single_mod=no
-    	output_verbose_link_cmd='echo'
-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-    	  lt_int_apple_cc_single_mod=yes
-    	fi
-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-    	  archive_cmds_F77='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-    	else
-        archive_cmds_F77='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      fi
-      module_cmds_F77='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        else
-          archive_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        fi
-          module_expsym_cmds_F77='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      hardcode_direct_F77=no
-      hardcode_automatic_F77=yes
-      hardcode_shlibpath_var_F77=unsupported
-      whole_archive_flag_spec_F77='-all_load $convenience'
-      link_all_deplibs_F77=yes
-    else
-      ld_shlibs_F77=no
-    fi
-      ;;
-
-    dgux*)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    freebsd1*)
-      ld_shlibs_F77=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec_F77='-R$libdir'
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_F77=yes
-      hardcode_minus_L_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu)
-      archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec_F77='-R$libdir'
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds_F77='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds_F77='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator_F77=:
-      hardcode_direct_F77=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L_F77=yes
-      export_dynamic_flag_spec_F77='${wl}-E'
-      ;;
-
-    hpux10* | hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  archive_cmds_F77='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds_F77='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  ;;
-	*)
-	  archive_cmds_F77='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	case "$host_cpu" in
-	hppa*64*)
-	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
-	  hardcode_libdir_separator_F77=:
-	  hardcode_direct_F77=no
-	  hardcode_shlibpath_var_F77=no
-	  ;;
-	ia64*)
-	  hardcode_libdir_flag_spec_F77='-L$libdir'
-	  hardcode_direct_F77=no
-	  hardcode_shlibpath_var_F77=no
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L_F77=yes
-	  ;;
-	*)
-	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
-	  hardcode_libdir_separator_F77=:
-	  hardcode_direct_F77=yes
-	  export_dynamic_flag_spec_F77='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L_F77=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	archive_cmds_F77='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
-      fi
-      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_F77=:
-      link_all_deplibs_F77=yes
-      ;;
-
-    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	archive_cmds_F77='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec_F77='-R$libdir'
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    newsos6)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_F77=yes
-      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_F77=:
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    openbsd*)
-      hardcode_direct_F77=yes
-      hardcode_shlibpath_var_F77=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec_F77='${wl}-E'
-      else
-       case $host_os in
-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	   archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   hardcode_libdir_flag_spec_F77='-R$libdir'
-	   ;;
-	 *)
-	   archive_cmds_F77='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
-	   ;;
-       esac
-      fi
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_minus_L_F77=yes
-      allow_undefined_flag_F77=unsupported
-      archive_cmds_F77='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      old_archive_From_new_cmds_F77='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	allow_undefined_flag_F77=' -expect_unresolved \*'
-	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_F77=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_F77='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_F77='${wl}-rpath ${wl}$libdir'
-      else
-	allow_undefined_flag_F77=' -expect_unresolved \*'
-	archive_cmds_F77='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds_F77='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	hardcode_libdir_flag_spec_F77='-rpath $libdir'
-      fi
-      hardcode_libdir_separator_F77=:
-      ;;
-
-    sco3.2v5*)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var_F77=no
-      export_dynamic_flag_spec_F77='${wl}-Bexport'
-      runpath_var=LD_RUN_PATH
-      hardcode_runpath_var=yes
-      ;;
-
-    solaris*)
-      no_undefined_flag_F77=' -z text'
-      if test "$GCC" = yes; then
-	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-      else
-	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      fi
-      hardcode_libdir_flag_spec_F77='-R$libdir'
-      hardcode_shlibpath_var_F77=no
-      case $host_os in
-      solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-	whole_archive_flag_spec_F77='-z allextract$convenience -z defaultextract' ;;
-      esac
-      link_all_deplibs_F77=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	archive_cmds_F77='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_direct_F77=yes
-      hardcode_minus_L_F77=yes
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct_F77=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  reload_cmds_F77='$CC -r -o $output$reload_objs'
-	  hardcode_direct_F77=no
-        ;;
-	motorola)
-	  archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct_F77=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    sysv4.3*)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var_F77=no
-      export_dynamic_flag_spec_F77='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_shlibpath_var_F77=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	ld_shlibs_F77=yes
-      fi
-      ;;
-
-    sysv4.2uw2*)
-      archive_cmds_F77='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_F77=yes
-      hardcode_minus_L_F77=no
-      hardcode_shlibpath_var_F77=no
-      hardcode_runpath_var=yes
-      runpath_var=LD_RUN_PATH
-      ;;
-
-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
-      no_undefined_flag_F77='${wl}-z ${wl}text'
-      if test "$GCC" = yes; then
-	archive_cmds_F77='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_F77='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    sysv5*)
-      no_undefined_flag_F77=' -z text'
-      # $CC -shared without GNU ld will not create a library from C++
-      # object files and a static libstdc++, better avoid it by now
-      archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      archive_expsym_cmds_F77='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      hardcode_libdir_flag_spec_F77=
-      hardcode_shlibpath_var_F77=no
-      runpath_var='LD_RUN_PATH'
-      ;;
-
-    uts4*)
-      archive_cmds_F77='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_F77='-L$libdir'
-      hardcode_shlibpath_var_F77=no
-      ;;
-
-    *)
-      ld_shlibs_F77=no
-      ;;
-    esac
-  fi
-
-echo "$as_me:$LINENO: result: $ld_shlibs_F77" >&5
-echo "${ECHO_T}$ld_shlibs_F77" >&6
-test "$ld_shlibs_F77" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc_F77" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc_F77=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds_F77 in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
-      $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl_F77
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag_F77
-        allow_undefined_flag_F77=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-  (eval $archive_cmds_F77 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-        then
-	  archive_cmds_need_lc_F77=no
-        else
-	  archive_cmds_need_lc_F77=yes
-        fi
-        allow_undefined_flag_F77=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_F77" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_F77" >&6
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix4* | aix5*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi4*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $rm \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-freebsd*)
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.01* | freebsdelf3.01*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  *) # from 3.2 on
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case "$host_cpu" in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-   hppa*64*)
-     shrext_cmds='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsdelf*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
-  ;;
-
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-nto-qnx*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-openbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=yes
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6
-test "$dynamic_linker" = no && can_build_shared=no
-
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
-hardcode_action_F77=
-if test -n "$hardcode_libdir_flag_spec_F77" || \
-   test -n "$runpath_var F77" || \
-   test "X$hardcode_automatic_F77"="Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct_F77" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, F77)" != no &&
-     test "$hardcode_minus_L_F77" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_F77=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_F77=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_F77=unsupported
-fi
-echo "$as_me:$LINENO: result: $hardcode_action_F77" >&5
-echo "${ECHO_T}$hardcode_action_F77" >&6
-
-if test "$hardcode_action_F77" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-striplib=
-old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-       else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-       ;;
-   *)
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-    ;;
-  esac
-fi
-
-
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler_F77 \
-    CC_F77 \
-    LD_F77 \
-    lt_prog_compiler_wl_F77 \
-    lt_prog_compiler_pic_F77 \
-    lt_prog_compiler_static_F77 \
-    lt_prog_compiler_no_builtin_flag_F77 \
-    export_dynamic_flag_spec_F77 \
-    thread_safe_flag_spec_F77 \
-    whole_archive_flag_spec_F77 \
-    enable_shared_with_static_runtimes_F77 \
-    old_archive_cmds_F77 \
-    old_archive_from_new_cmds_F77 \
-    predep_objects_F77 \
-    postdep_objects_F77 \
-    predeps_F77 \
-    postdeps_F77 \
-    compiler_lib_search_path_F77 \
-    archive_cmds_F77 \
-    archive_expsym_cmds_F77 \
-    postinstall_cmds_F77 \
-    postuninstall_cmds_F77 \
-    old_archive_from_expsyms_cmds_F77 \
-    allow_undefined_flag_F77 \
-    no_undefined_flag_F77 \
-    export_symbols_cmds_F77 \
-    hardcode_libdir_flag_spec_F77 \
-    hardcode_libdir_flag_spec_ld_F77 \
-    hardcode_libdir_separator_F77 \
-    hardcode_automatic_F77 \
-    module_cmds_F77 \
-    module_expsym_cmds_F77 \
-    lt_cv_prog_compiler_c_o_F77 \
-    exclude_expsyms_F77 \
-    include_expsyms_F77; do
-
-    case $var in
-    old_archive_cmds_F77 | \
-    old_archive_from_new_cmds_F77 | \
-    archive_cmds_F77 | \
-    archive_expsym_cmds_F77 | \
-    module_cmds_F77 | \
-    module_expsym_cmds_F77 | \
-    old_archive_from_expsyms_cmds_F77 | \
-    export_symbols_cmds_F77 | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-cfgfile="$ofile"
-
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_F77
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_F77
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# A language-specific compiler.
-CC=$lt_compiler_F77
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_F77
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_F77
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_F77
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_F77
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
-
-# Must we lock files when doing compilation ?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_F77
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_F77
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_F77
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_F77
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_F77
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_F77
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_F77
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_F77
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_F77
-archive_expsym_cmds=$lt_archive_expsym_cmds_F77
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_F77
-module_expsym_cmds=$lt_module_expsym_cmds_F77
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_F77
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_F77
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_F77
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_F77
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_F77
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_F77
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_F77
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_F77
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_F77
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_F77
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_F77
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_F77
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_F77
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_F77
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic_F77
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_F77
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_F77"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_F77
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_F77
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_F77
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_F77
-
-# ### END LIBTOOL TAG CONFIG: $tagname
-
-__EOF__
-
-
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC="$lt_save_CC"
-
-	else
-	  tagname=""
-	fi
-	;;
-
-      GCJ)
-	if test -n "$GCJ" && test "X$GCJ" != "Xno"; then
-
-
-
-# Source file extension for Java test sources.
-ac_ext=java
-
-# Object file extension for compiled Java test sources.
-objext=o
-objext_GCJ=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code="class foo {}\n"
-
-# Code to be used in simple link tests
-lt_simple_link_test_code='public class conftest { public static void main(String argv) {}; }\n'
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${GCJ-"gcj"}
-compiler=$CC
-compiler_GCJ=$CC
-
-# GCJ did not exist at the time GCC didn't implicitly link libc in.
-archive_cmds_need_lc_GCJ=no
-
-
-lt_prog_compiler_no_builtin_flag_GCJ=
-
-if test "$GCC" = yes; then
-  lt_prog_compiler_no_builtin_flag_GCJ=' -fno-builtin'
-
-
-echo "$as_me:$LINENO: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
-echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_prog_compiler_rtti_exceptions=no
-  ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="-fno-rtti -fno-exceptions"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15528: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:15532: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s conftest.err; then
-       lt_cv_prog_compiler_rtti_exceptions=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_rtti_exceptions" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_rtti_exceptions" >&6
-
-if test x"$lt_cv_prog_compiler_rtti_exceptions" = xyes; then
-    lt_prog_compiler_no_builtin_flag_GCJ="$lt_prog_compiler_no_builtin_flag_GCJ -fno-rtti -fno-exceptions"
-else
-    :
-fi
-
-fi
-
-lt_prog_compiler_wl_GCJ=
-lt_prog_compiler_pic_GCJ=
-lt_prog_compiler_static_GCJ=
-
-echo "$as_me:$LINENO: checking for $compiler option to produce PIC" >&5
-echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
-
-  if test "$GCC" = yes; then
-    lt_prog_compiler_wl_GCJ='-Wl,'
-    lt_prog_compiler_static_GCJ='-static'
-
-    case $host_os in
-      aix*)
-      # All AIX code is PIC.
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_GCJ='-Bstatic'
-      fi
-      ;;
-
-    amigaos*)
-      # FIXME: we need at least 68020 code to build shared libraries, but
-      # adding the `-m68020' flag to GCC prevents building anything better,
-      # like `-m68040'.
-      lt_prog_compiler_pic_GCJ='-m68020 -resident32 -malways-restore-a4'
-      ;;
-
-    beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
-      # PIC is the default for these OSes.
-      ;;
-
-    mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
-      ;;
-
-    darwin* | rhapsody*)
-      # PIC is the default on this platform
-      # Common symbols not allowed in MH_DYLIB files
-      lt_prog_compiler_pic_GCJ='-fno-common'
-      ;;
-
-    msdosdjgpp*)
-      # Just because we use GCC doesn't mean we suddenly get shared libraries
-      # on systems that don't support them.
-      lt_prog_compiler_can_build_shared_GCJ=no
-      enable_shared=no
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	lt_prog_compiler_pic_GCJ=-Kconform_pic
-      fi
-      ;;
-
-    hpux*)
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case "$host_cpu" in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic_GCJ='-fPIC'
-	;;
-      esac
-      ;;
-
-    *)
-      lt_prog_compiler_pic_GCJ='-fPIC'
-      ;;
-    esac
-  else
-    # PORTME Check for flag to pass linker flags through the system compiler.
-    case $host_os in
-    aix*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      if test "$host_cpu" = ia64; then
-	# AIX 5 now supports IA64 processor
-	lt_prog_compiler_static_GCJ='-Bstatic'
-      else
-	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
-      fi
-      ;;
-
-    mingw* | pw32* | os2*)
-      # This hack is so that the source file can tell whether it is being
-      # built for inclusion in a dll (and should export symbols for example).
-      lt_prog_compiler_pic_GCJ='-DDLL_EXPORT'
-      ;;
-
-    hpux9* | hpux10* | hpux11*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
-      # not for PA HP-UX.
-      case "$host_cpu" in
-      hppa*64*|ia64*)
-	# +Z the default
-	;;
-      *)
-	lt_prog_compiler_pic_GCJ='+Z'
-	;;
-      esac
-      # Is there a better lt_prog_compiler_static that works with the bundled CC?
-      lt_prog_compiler_static_GCJ='${wl}-a ${wl}archive'
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      # PIC (with -KPIC) is the default.
-      lt_prog_compiler_static_GCJ='-non_shared'
-      ;;
-
-    newsos6)
-      lt_prog_compiler_pic_GCJ='-KPIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
-
-    linux*)
-      case $CC in
-      icc* | ecc*)
-	lt_prog_compiler_wl_GCJ='-Wl,'
-	lt_prog_compiler_pic_GCJ='-KPIC'
-	lt_prog_compiler_static_GCJ='-static'
-        ;;
-      ccc*)
-        lt_prog_compiler_wl_GCJ='-Wl,'
-        # All Alpha code is PIC.
-        lt_prog_compiler_static_GCJ='-non_shared'
-        ;;
-      esac
-      ;;
-
-    osf3* | osf4* | osf5*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      # All OSF/1 code is PIC.
-      lt_prog_compiler_static_GCJ='-non_shared'
-      ;;
-
-    sco3.2v5*)
-      lt_prog_compiler_pic_GCJ='-Kpic'
-      lt_prog_compiler_static_GCJ='-dn'
-      ;;
-
-    solaris*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      lt_prog_compiler_pic_GCJ='-KPIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
-
-    sunos4*)
-      lt_prog_compiler_wl_GCJ='-Qoption ld '
-      lt_prog_compiler_pic_GCJ='-PIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
-
-    sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-      lt_prog_compiler_wl_GCJ='-Wl,'
-      lt_prog_compiler_pic_GCJ='-KPIC'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec ;then
-	lt_prog_compiler_pic_GCJ='-Kconform_pic'
-	lt_prog_compiler_static_GCJ='-Bstatic'
-      fi
-      ;;
-
-    uts4*)
-      lt_prog_compiler_pic_GCJ='-pic'
-      lt_prog_compiler_static_GCJ='-Bstatic'
-      ;;
-
-    *)
-      lt_prog_compiler_can_build_shared_GCJ=no
-      ;;
-    esac
-  fi
-
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_GCJ" >&6
-
-#
-# Check to make sure the PIC flag actually works.
-#
-if test -n "$lt_prog_compiler_pic_GCJ"; then
-
-echo "$as_me:$LINENO: checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works" >&5
-echo $ECHO_N "checking if $compiler PIC flag $lt_prog_compiler_pic_GCJ works... $ECHO_C" >&6
-if test "${lt_prog_compiler_pic_works_GCJ+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_prog_compiler_pic_works_GCJ=no
-  ac_outfile=conftest.$ac_objext
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-   lt_compiler_flag="$lt_prog_compiler_pic_GCJ"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   # The option is referenced via a variable to avoid confusing sed.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15761: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>conftest.err)
-   ac_status=$?
-   cat conftest.err >&5
-   echo "$as_me:15765: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s "$ac_outfile"; then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s conftest.err; then
-       lt_prog_compiler_pic_works_GCJ=yes
-     fi
-   fi
-   $rm conftest*
-
-fi
-echo "$as_me:$LINENO: result: $lt_prog_compiler_pic_works_GCJ" >&5
-echo "${ECHO_T}$lt_prog_compiler_pic_works_GCJ" >&6
-
-if test x"$lt_prog_compiler_pic_works_GCJ" = xyes; then
-    case $lt_prog_compiler_pic_GCJ in
-     "" | " "*) ;;
-     *) lt_prog_compiler_pic_GCJ=" $lt_prog_compiler_pic_GCJ" ;;
-     esac
-else
-    lt_prog_compiler_pic_GCJ=
-     lt_prog_compiler_can_build_shared_GCJ=no
-fi
-
-fi
-case "$host_os" in
-  # For platforms which do not support PIC, -DPIC is meaningless:
-  *djgpp*)
-    lt_prog_compiler_pic_GCJ=
-    ;;
-  *)
-    lt_prog_compiler_pic_GCJ="$lt_prog_compiler_pic_GCJ"
-    ;;
-esac
-
-echo "$as_me:$LINENO: checking if $compiler supports -c -o file.$ac_objext" >&5
-echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
-if test "${lt_cv_prog_compiler_c_o_GCJ+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  lt_cv_prog_compiler_c_o_GCJ=no
-   $rm -r conftest 2>/dev/null
-   mkdir conftest
-   cd conftest
-   mkdir out
-   printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-   lt_compiler_flag="-o out/conftest2.$ac_objext"
-   # Insert the option either (1) after the last *FLAGS variable, or
-   # (2) before a word containing "conftest.", or (3) at the end.
-   # Note that $ac_compile itself does not contain backslashes and begins
-   # with a dollar sign (not a hyphen), so the echo should work correctly.
-   lt_compile=`echo "$ac_compile" | $SED \
-   -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
-   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-   -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15821: $lt_compile\"" >&5)
-   (eval "$lt_compile" 2>out/conftest.err)
-   ac_status=$?
-   cat out/conftest.err >&5
-   echo "$as_me:15825: \$? = $ac_status" >&5
-   if (exit $ac_status) && test -s out/conftest2.$ac_objext
-   then
-     # The compiler can only warn and ignore the option if not recognized
-     # So say no if there are warnings
-     if test ! -s out/conftest.err; then
-       lt_cv_prog_compiler_c_o_GCJ=yes
-     fi
-   fi
-   chmod u+w .
-   $rm conftest*
-   # SGI C++ compiler will create directory out/ii_files/ for
-   # template instantiation
-   test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
-   $rm out/* && rmdir out
-   cd ..
-   rmdir conftest
-   $rm conftest*
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_prog_compiler_c_o_GCJ" >&5
-echo "${ECHO_T}$lt_cv_prog_compiler_c_o_GCJ" >&6
-
-
-hard_links="nottested"
-if test "$lt_cv_prog_compiler_c_o_GCJ" = no && test "$need_locks" != no; then
-  # do not overwrite the value of need_locks provided by the user
-  echo "$as_me:$LINENO: checking if we can lock with hard links" >&5
-echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
-  hard_links=yes
-  $rm conftest*
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  touch conftest.a
-  ln conftest.a conftest.b 2>&5 || hard_links=no
-  ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  echo "$as_me:$LINENO: result: $hard_links" >&5
-echo "${ECHO_T}$hard_links" >&6
-  if test "$hard_links" = no; then
-    { echo "$as_me:$LINENO: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
-echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
-    need_locks=warn
-  fi
-else
-  need_locks=no
-fi
-
-echo "$as_me:$LINENO: checking whether the $compiler linker ($LD) supports shared libraries" >&5
-echo $ECHO_N "checking whether the $compiler linker ($LD) supports shared libraries... $ECHO_C" >&6
-
-  runpath_var=
-  allow_undefined_flag_GCJ=
-  enable_shared_with_static_runtimes_GCJ=no
-  archive_cmds_GCJ=
-  archive_expsym_cmds_GCJ=
-  old_archive_From_new_cmds_GCJ=
-  old_archive_from_expsyms_cmds_GCJ=
-  export_dynamic_flag_spec_GCJ=
-  whole_archive_flag_spec_GCJ=
-  thread_safe_flag_spec_GCJ=
-  hardcode_libdir_flag_spec_GCJ=
-  hardcode_libdir_flag_spec_ld_GCJ=
-  hardcode_libdir_separator_GCJ=
-  hardcode_direct_GCJ=no
-  hardcode_minus_L_GCJ=no
-  hardcode_shlibpath_var_GCJ=unsupported
-  link_all_deplibs_GCJ=unknown
-  hardcode_automatic_GCJ=no
-  module_cmds_GCJ=
-  module_expsym_cmds_GCJ=
-  always_export_symbols_GCJ=no
-  export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  # include_expsyms should be a list of space-separated symbols to be *always*
-  # included in the symbol list
-  include_expsyms_GCJ=
-  # exclude_expsyms can be an extended regexp of symbols to exclude
-  # it will be wrapped by ` (' and `)$', so one must not match beginning or
-  # end of line.  Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
-  # as well as any symbol that contains `d'.
-  exclude_expsyms_GCJ="_GLOBAL_OFFSET_TABLE_"
-  # Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
-  # platforms (ab)use it in PIC code, but their linkers get confused if
-  # the symbol is explicitly referenced.  Since portable code cannot
-  # rely on this symbol name, it's probably fine to never include it in
-  # preloaded symbol tables.
-  extract_expsyms_cmds=
-
-  case $host_os in
-  cygwin* | mingw* | pw32*)
-    # FIXME: the MSVC++ port hasn't been tested in a loooong time
-    # When not using gcc, we currently assume that we are using
-    # Microsoft Visual C++.
-    if test "$GCC" != yes; then
-      with_gnu_ld=no
-    fi
-    ;;
-  openbsd*)
-    with_gnu_ld=no
-    ;;
-  esac
-
-  ld_shlibs_GCJ=yes
-  if test "$with_gnu_ld" = yes; then
-    # If archive_cmds runs LD, not CC, wlarc should be empty
-    wlarc='${wl}'
-
-    # See if GNU ld supports shared libraries.
-    case $host_os in
-    aix3* | aix4* | aix5*)
-      # On AIX/PPC, the GNU linker is very broken
-      if test "$host_cpu" != ia64; then
-	ld_shlibs_GCJ=no
-	cat <<EOF 1>&2
-
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
-*** to be unable to reliably create shared libraries on AIX.
-*** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
-
-EOF
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_minus_L_GCJ=yes
-
-      # Samuel A. Falvo II <kc5tja@dolphin.openprojects.net> reports
-      # that the semantics of dynamic libraries on AmigaOS, at least up
-      # to version 4, is to share data among multiple programs linked
-      # with the same dynamic library.  Since this doesn't match the
-      # behavior of shared libraries on other platforms, we can't use
-      # them.
-      ld_shlibs_GCJ=no
-      ;;
-
-    beos*)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	allow_undefined_flag_GCJ=unsupported
-	# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
-	# support --undefined.  This deserves some investigation.  FIXME
-	archive_cmds_GCJ='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-      else
-	ld_shlibs_GCJ=no
-      fi
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
-      # as there is no search path for DLLs.
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      allow_undefined_flag_GCJ=unsupported
-      always_export_symbols_GCJ=no
-      enable_shared_with_static_runtimes_GCJ=yes
-      export_symbols_cmds_GCJ='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGS] /s/.* \([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW] /s/.* //'\'' | sort | uniq > $export_symbols'
-
-      if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
-        archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
-	# If the export-symbols file already is a .def file (1st line
-	# is EXPORTS), use it as is; otherwise, prepend...
-	archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	  cp $export_symbols $output_objdir/$soname.def;
-	else
-	  echo EXPORTS > $output_objdir/$soname.def;
-	  cat $export_symbols >> $output_objdir/$soname.def;
-	fi~
-	$CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--image-base=0x10000000  ${wl}--out-implib,$lib'
-      else
-	ld_shlibs=no
-      fi
-      ;;
-
-    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds_GCJ='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
-	wlarc=
-      else
-	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      fi
-      ;;
-
-    solaris* | sysv5*)
-      if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
-	ld_shlibs_GCJ=no
-	cat <<EOF 1>&2
-
-*** Warning: The releases 2.8.* of the GNU linker cannot reliably
-*** create shared libraries on Solaris systems.  Therefore, libtool
-*** is disabling shared libraries support.  We urge you to upgrade GNU
-*** binutils to release 2.9.1 or newer.  Another option is to modify
-*** your PATH or compiler configuration so that the native linker is
-*** used, and then restart.
-
-EOF
-      elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs_GCJ=no
-      fi
-      ;;
-
-    sunos4*)
-      archive_cmds_GCJ='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      wlarc=
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-  linux*)
-    if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-        tmp_archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_cmds_GCJ="$tmp_archive_cmds"
-      supports_anon_versioning=no
-      case `$LD -v 2>/dev/null` in
-        *\ 01.* | *\ 2.[0-9].* | *\ 2.10.*) ;; # catch versions < 2.11
-        *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
-        *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
-        *\ 2.11.*) ;; # other 2.11 versions
-        *) supports_anon_versioning=yes ;;
-      esac
-      if test $supports_anon_versioning = yes; then
-        archive_expsym_cmds_GCJ='$echo "{ global:" > $output_objdir/$libname.ver~
-cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
-$echo "local: *; };" >> $output_objdir/$libname.ver~
-        $CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
-      else
-        archive_expsym_cmds_GCJ="$tmp_archive_cmds"
-      fi
-      link_all_deplibs_GCJ=no
-    else
-      ld_shlibs_GCJ=no
-    fi
-    ;;
-
-    *)
-      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
-	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
-      else
-	ld_shlibs_GCJ=no
-      fi
-      ;;
-    esac
-
-    if test "$ld_shlibs_GCJ" = yes; then
-      runpath_var=LD_RUN_PATH
-      hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir'
-      export_dynamic_flag_spec_GCJ='${wl}--export-dynamic'
-      # ancient GNU ld didn't support --whole-archive et. al.
-      if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
- 	whole_archive_flag_spec_GCJ="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
-      else
-  	whole_archive_flag_spec_GCJ=
-      fi
-    fi
-  else
-    # PORTME fill in a description of your system's linker (not GNU ld)
-    case $host_os in
-    aix3*)
-      allow_undefined_flag_GCJ=unsupported
-      always_export_symbols_GCJ=yes
-      archive_expsym_cmds_GCJ='$LD -o $output_objdir/$soname $libobjs $deplibs $linker_flags -bE:$export_symbols -T512 -H512 -bM:SRE~$AR $AR_FLAGS $lib $output_objdir/$soname'
-      # Note: this linker hardcodes the directories in LIBPATH if there
-      # are no directories specified by -L.
-      hardcode_minus_L_GCJ=yes
-      if test "$GCC" = yes && test -z "$link_static_flag"; then
-	# Neither direct hardcoding nor static linking is supported with a
-	# broken collect2.
-	hardcode_direct_GCJ=unsupported
-      fi
-      ;;
-
-    aix4* | aix5*)
-      if test "$host_cpu" = ia64; then
-	# On IA64, the linker does run time linking by default, so we don't
-	# have to do anything special.
-	aix_use_runtimelinking=no
-	exp_sym_flag='-Bexport'
-	no_entry_flag=""
-      else
-	# If we're using GNU nm, then we don't want the "-C" option.
-	# -C means demangle to AIX nm, but means don't demangle with GNU nm
-	if $NM -V 2>&1 | grep 'GNU' > /dev/null; then
-	  export_symbols_cmds_GCJ='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-	else
-	  export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
-	fi
-	aix_use_runtimelinking=no
-
-	# Test if we are trying to use run time linking or normal
-	# AIX style linking. If -brtl is somewhere in LDFLAGS, we
-	# need to do runtime linking.
-	case $host_os in aix4.[23]|aix4.[23].*|aix5*)
-	  for ld_flag in $LDFLAGS; do
-  	  if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
-  	    aix_use_runtimelinking=yes
-  	    break
-  	  fi
-	  done
-	esac
-
-	exp_sym_flag='-bexport'
-	no_entry_flag='-bnoentry'
-      fi
-
-      # When large executables or shared objects are built, AIX ld can
-      # have problems creating the table of contents.  If linking a library
-      # or program results in "error TOC overflow" add -mminimal-toc to
-      # CXXFLAGS/CFLAGS for g++/gcc.  In the cases where that is not
-      # enough to fix the problem, add -Wl,-bbigtoc to LDFLAGS.
-
-      archive_cmds_GCJ=''
-      hardcode_direct_GCJ=yes
-      hardcode_libdir_separator_GCJ=':'
-      link_all_deplibs_GCJ=yes
-
-      if test "$GCC" = yes; then
-	case $host_os in aix4.012|aix4.012.*)
-	# We only want to do this on AIX 4.2 and lower, the check
-	# below for broken collect2 doesn't work under 4.3+
-	  collect2name=`${CC} -print-prog-name=collect2`
-	  if test -f "$collect2name" && \
-  	   strings "$collect2name" | grep resolve_lib_name >/dev/null
-	  then
-  	  # We have reworked collect2
-  	  hardcode_direct_GCJ=yes
-	  else
-  	  # We have old collect2
-  	  hardcode_direct_GCJ=unsupported
-  	  # It fails to find uninstalled libraries when the uninstalled
-  	  # path is not listed in the libpath.  Setting hardcode_minus_L
-  	  # to unsupported forces relinking
-  	  hardcode_minus_L_GCJ=yes
-  	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
-  	  hardcode_libdir_separator_GCJ=
-	  fi
-	esac
-	shared_flag='-shared'
-      else
-	# not using gcc
-	if test "$host_cpu" = ia64; then
-  	# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
-  	# chokes on -Wl,-G. The following line is correct:
-	  shared_flag='-G'
-	else
-  	if test "$aix_use_runtimelinking" = yes; then
-	    shared_flag='${wl}-G'
-	  else
-	    shared_flag='${wl}-bM:SRE'
-  	fi
-	fi
-      fi
-
-      # It seems that -bexpall does not export symbols beginning with
-      # underscore (_), so it is better to generate a list of symbols to export.
-      always_export_symbols_GCJ=yes
-      if test "$aix_use_runtimelinking" = yes; then
-	# Warning - without using the other runtime loading flags (-brtl),
-	# -berok will link without error, but may produce a broken library.
-	allow_undefined_flag_GCJ='-berok'
-       # Determine the default libpath from the value encoded in an empty executable.
-       cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-       hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
-	archive_expsym_cmds_GCJ="\$CC"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols $shared_flag"
-       else
-	if test "$host_cpu" = ia64; then
-	  hardcode_libdir_flag_spec_GCJ='${wl}-R $libdir:/usr/lib:/lib'
-	  allow_undefined_flag_GCJ="-z nodefs"
-	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
-	else
-	 # Determine the default libpath from the value encoded in an empty executable.
-	 cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }
-}'`; fi
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
-
-	 hardcode_libdir_flag_spec_GCJ='${wl}-blibpath:$libdir:'"$aix_libpath"
-	  # Warning - without using the other run time loading flags,
-	  # -berok will link without error, but may produce a broken library.
-	  no_undefined_flag_GCJ=' ${wl}-bernotok'
-	  allow_undefined_flag_GCJ=' ${wl}-berok'
-	  # -bexpall does not export symbols beginning with underscore (_)
-	  always_export_symbols_GCJ=yes
-	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec_GCJ=' '
-	  archive_cmds_need_lc_GCJ=yes
-	  # This is similar to how AIX traditionally builds it's shared libraries.
-	  archive_expsym_cmds_GCJ="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs $compiler_flags ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
-	fi
-      fi
-      ;;
-
-    amigaos*)
-      archive_cmds_GCJ='$rm $output_objdir/a2ixlibrary.data~$echo "#define NAME $libname" > $output_objdir/a2ixlibrary.data~$echo "#define LIBRARY_ID 1" >> $output_objdir/a2ixlibrary.data~$echo "#define VERSION $major" >> $output_objdir/a2ixlibrary.data~$echo "#define REVISION $revision" >> $output_objdir/a2ixlibrary.data~$AR $AR_FLAGS $lib $libobjs~$RANLIB $lib~(cd $output_objdir && a2ixlibrary -32)'
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_minus_L_GCJ=yes
-      # see comment about different semantics on the GNU ld section
-      ld_shlibs_GCJ=no
-      ;;
-
-    bsdi4*)
-      export_dynamic_flag_spec_GCJ=-rdynamic
-      ;;
-
-    cygwin* | mingw* | pw32*)
-      # When not using gcc, we currently assume that we are using
-      # Microsoft Visual C++.
-      # hardcode_libdir_flag_spec is actually meaningless, as there is
-      # no search path for DLLs.
-      hardcode_libdir_flag_spec_GCJ=' '
-      allow_undefined_flag_GCJ=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      archive_cmds_GCJ='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      old_archive_From_new_cmds_GCJ='true'
-      # FIXME: Should let the user specify the lib program.
-      old_archive_cmds_GCJ='lib /OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path='`cygpath -w "$srcfile"`'
-      enable_shared_with_static_runtimes_GCJ=yes
-      ;;
-
-    darwin* | rhapsody*)
-    if test "$GXX" = yes ; then
-      archive_cmds_need_lc_GCJ=no
-      case "$host_os" in
-      rhapsody* | darwin1.[012])
-	allow_undefined_flag_GCJ='-undefined suppress'
-	;;
-      *) # Darwin 1.3 on
-      if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
-      	allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
-      else
-        case ${MACOSX_DEPLOYMENT_TARGET} in
-          10.[012])
-            allow_undefined_flag_GCJ='-flat_namespace -undefined suppress'
-            ;;
-          10.*)
-            allow_undefined_flag_GCJ='-undefined dynamic_lookup'
-            ;;
-        esac
-      fi
-	;;
-      esac
-    	lt_int_apple_cc_single_mod=no
-    	output_verbose_link_cmd='echo'
-    	if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
-    	  lt_int_apple_cc_single_mod=yes
-    	fi
-    	if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-    	  archive_cmds_GCJ='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-    	else
-        archive_cmds_GCJ='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
-      fi
-      module_cmds_GCJ='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
-      # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
-        if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
-          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        else
-          archive_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-        fi
-          module_expsym_cmds_GCJ='sed -e "s,#.*,," -e "s,^[    ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag  -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
-      hardcode_direct_GCJ=no
-      hardcode_automatic_GCJ=yes
-      hardcode_shlibpath_var_GCJ=unsupported
-      whole_archive_flag_spec_GCJ='-all_load $convenience'
-      link_all_deplibs_GCJ=yes
-    else
-      ld_shlibs_GCJ=no
-    fi
-      ;;
-
-    dgux*)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    freebsd1*)
-      ld_shlibs_GCJ=no
-      ;;
-
-    # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
-    # support.  Future versions do this automatically, but an explicit c++rt0.o
-    # does not break anything, and helps significantly (at the cost of a little
-    # extra space).
-    freebsd2.2*)
-      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags /usr/lib/c++rt0.o'
-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
-      archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_GCJ=yes
-      hardcode_minus_L_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
-    freebsd* | kfreebsd*-gnu)
-      archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    hpux9*)
-      if test "$GCC" = yes; then
-	archive_cmds_GCJ='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      else
-	archive_cmds_GCJ='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
-      fi
-      hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-      hardcode_libdir_separator_GCJ=:
-      hardcode_direct_GCJ=yes
-
-      # hardcode_minus_L: Not really in the search PATH,
-      # but as the default location of the library.
-      hardcode_minus_L_GCJ=yes
-      export_dynamic_flag_spec_GCJ='${wl}-E'
-      ;;
-
-    hpux10* | hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  archive_cmds_GCJ='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds_GCJ='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case "$host_cpu" in
-	hppa*64*|ia64*)
-	  archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  ;;
-	*)
-	  archive_cmds_GCJ='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
-	  ;;
-	esac
-      fi
-      if test "$with_gnu_ld" = no; then
-	case "$host_cpu" in
-	hppa*64*)
-	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
-	  hardcode_libdir_separator_GCJ=:
-	  hardcode_direct_GCJ=no
-	  hardcode_shlibpath_var_GCJ=no
-	  ;;
-	ia64*)
-	  hardcode_libdir_flag_spec_GCJ='-L$libdir'
-	  hardcode_direct_GCJ=no
-	  hardcode_shlibpath_var_GCJ=no
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L_GCJ=yes
-	  ;;
-	*)
-	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
-	  hardcode_libdir_separator_GCJ=:
-	  hardcode_direct_GCJ=yes
-	  export_dynamic_flag_spec_GCJ='${wl}-E'
-
-	  # hardcode_minus_L: Not really in the search PATH,
-	  # but as the default location of the library.
-	  hardcode_minus_L_GCJ=yes
-	  ;;
-	esac
-      fi
-      ;;
-
-    irix5* | irix6* | nonstopux*)
-      if test "$GCC" = yes; then
-	archive_cmds_GCJ='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
-      fi
-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_GCJ=:
-      link_all_deplibs_GCJ=yes
-      ;;
-
-    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
-      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
-      else
-	archive_cmds_GCJ='$LD -shared -o $lib $libobjs $deplibs $linker_flags'      # ELF
-      fi
-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    newsos6)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_GCJ=yes
-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_GCJ=:
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    openbsd*)
-      hardcode_direct_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-	archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-	export_dynamic_flag_spec_GCJ='${wl}-E'
-      else
-       case $host_os in
-	 openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
-	   archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
-	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
-	   ;;
-	 *)
-	   archive_cmds_GCJ='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
-	   ;;
-       esac
-      fi
-      ;;
-
-    os2*)
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_minus_L_GCJ=yes
-      allow_undefined_flag_GCJ=unsupported
-      archive_cmds_GCJ='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
-      old_archive_From_new_cmds_GCJ='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
-      ;;
-
-    osf3*)
-      if test "$GCC" = yes; then
-	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-      else
-	allow_undefined_flag_GCJ=' -expect_unresolved \*'
-	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-      fi
-      hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-      hardcode_libdir_separator_GCJ=:
-      ;;
-
-    osf4* | osf5*)	# as osf3* with the addition of -msym flag
-      if test "$GCC" = yes; then
-	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds_GCJ='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
-	hardcode_libdir_flag_spec_GCJ='${wl}-rpath ${wl}$libdir'
-      else
-	allow_undefined_flag_GCJ=' -expect_unresolved \*'
-	archive_cmds_GCJ='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds_GCJ='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
-	$LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
-
-	# Both c and cxx compiler support -rpath directly
-	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-      fi
-      hardcode_libdir_separator_GCJ=:
-      ;;
-
-    sco3.2v5*)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var_GCJ=no
-      export_dynamic_flag_spec_GCJ='${wl}-Bexport'
-      runpath_var=LD_RUN_PATH
-      hardcode_runpath_var=yes
-      ;;
-
-    solaris*)
-      no_undefined_flag_GCJ=' -z text'
-      if test "$GCC" = yes; then
-	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
-      else
-	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  	$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      fi
-      hardcode_libdir_flag_spec_GCJ='-R$libdir'
-      hardcode_shlibpath_var_GCJ=no
-      case $host_os in
-      solaris2.[0-5] | solaris2.[0-5].*) ;;
-      *) # Supported since Solaris 2.6 (maybe 2.5.1?)
-	whole_archive_flag_spec_GCJ='-z allextract$convenience -z defaultextract' ;;
-      esac
-      link_all_deplibs_GCJ=yes
-      ;;
-
-    sunos4*)
-      if test "x$host_vendor" = xsequent; then
-	# Use $CC to link under sequent, because it throws in some extra .o
-	# files that make .init and .fini sections work.
-	archive_cmds_GCJ='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
-      fi
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_direct_GCJ=yes
-      hardcode_minus_L_GCJ=yes
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    sysv4)
-      case $host_vendor in
-	sni)
-	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct_GCJ=yes # is this really true???
-	;;
-	siemens)
-	  ## LD is ld it makes a PLAMLIB
-	  ## CC just makes a GrossModule.
-	  archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-	  reload_cmds_GCJ='$CC -r -o $output$reload_objs'
-	  hardcode_direct_GCJ=no
-        ;;
-	motorola)
-	  archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	  hardcode_direct_GCJ=no #Motorola manual says yes, but my tests say they lie
-	;;
-      esac
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    sysv4.3*)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_shlibpath_var_GCJ=no
-      export_dynamic_flag_spec_GCJ='-Bexport'
-      ;;
-
-    sysv4*MP*)
-      if test -d /usr/nec; then
-	archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-	hardcode_shlibpath_var_GCJ=no
-	runpath_var=LD_RUN_PATH
-	hardcode_runpath_var=yes
-	ld_shlibs_GCJ=yes
-      fi
-      ;;
-
-    sysv4.2uw2*)
-      archive_cmds_GCJ='$LD -G -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_direct_GCJ=yes
-      hardcode_minus_L_GCJ=no
-      hardcode_shlibpath_var_GCJ=no
-      hardcode_runpath_var=yes
-      runpath_var=LD_RUN_PATH
-      ;;
-
-   sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
-      no_undefined_flag_GCJ='${wl}-z ${wl}text'
-      if test "$GCC" = yes; then
-	archive_cmds_GCJ='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      else
-	archive_cmds_GCJ='$CC -G ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-      fi
-      runpath_var='LD_RUN_PATH'
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    sysv5*)
-      no_undefined_flag_GCJ=' -z text'
-      # $CC -shared without GNU ld will not create a library from C++
-      # object files and a static libstdc++, better avoid it by now
-      archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      archive_expsym_cmds_GCJ='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
-  		$LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
-      hardcode_libdir_flag_spec_GCJ=
-      hardcode_shlibpath_var_GCJ=no
-      runpath_var='LD_RUN_PATH'
-      ;;
-
-    uts4*)
-      archive_cmds_GCJ='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
-      hardcode_libdir_flag_spec_GCJ='-L$libdir'
-      hardcode_shlibpath_var_GCJ=no
-      ;;
-
-    *)
-      ld_shlibs_GCJ=no
-      ;;
-    esac
-  fi
-
-echo "$as_me:$LINENO: result: $ld_shlibs_GCJ" >&5
-echo "${ECHO_T}$ld_shlibs_GCJ" >&6
-test "$ld_shlibs_GCJ" = no && can_build_shared=no
-
-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
-  variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-fi
-
-#
-# Do we need to explicitly link libc?
-#
-case "x$archive_cmds_need_lc_GCJ" in
-x|xyes)
-  # Assume -lc should be added
-  archive_cmds_need_lc_GCJ=yes
-
-  if test "$enable_shared" = yes && test "$GCC" = yes; then
-    case $archive_cmds_GCJ in
-    *'~'*)
-      # FIXME: we may have to deal with multi-command sequences.
-      ;;
-    '$CC '*)
-      # Test whether the compiler implicitly links with -lc since on some
-      # systems, -lgcc has to come before -lc. If gcc already passes -lc
-      # to ld, don't add -lc before -lgcc.
-      echo "$as_me:$LINENO: checking whether -lc should be explicitly linked in" >&5
-echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
-      $rm conftest*
-      printf "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl_GCJ
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag_GCJ
-        allow_undefined_flag_GCJ=
-        if { (eval echo "$as_me:$LINENO: \"$archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
-  (eval $archive_cmds_GCJ 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }
-        then
-	  archive_cmds_need_lc_GCJ=no
-        else
-	  archive_cmds_need_lc_GCJ=yes
-        fi
-        allow_undefined_flag_GCJ=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $rm conftest*
-      echo "$as_me:$LINENO: result: $archive_cmds_need_lc_GCJ" >&5
-echo "${ECHO_T}$archive_cmds_need_lc_GCJ" >&6
-      ;;
-    esac
-  fi
-  ;;
-esac
-
-echo "$as_me:$LINENO: checking dynamic linker characteristics" >&5
-echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
-library_names_spec=
-libname_spec='lib$name'
-soname_spec=
-shrext_cmds=".so"
-postinstall_cmds=
-postuninstall_cmds=
-finish_cmds=
-finish_eval=
-shlibpath_var=
-shlibpath_overrides_runpath=unknown
-version_type=none
-dynamic_linker="$host_os ld.so"
-sys_lib_dlsearch_path_spec="/lib /usr/lib"
-if test "$GCC" = yes; then
-  sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if echo "$sys_lib_search_path_spec" | grep ';' >/dev/null ; then
-    # if the path contains ";" then we assume it to be the separator
-    # otherwise default to the standard path separator (i.e. ":") - it is
-    # assumed that no part of a normal pathname contains ";" but that should
-    # okay in the real world where ";" in dirpaths is itself problematic.
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
-else
-  sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
-fi
-need_lib_prefix=unknown
-hardcode_into_libs=no
-
-# when you set need_version to no, make sure it does not cause -set_version
-# flags to be left without arguments
-need_version=unknown
-
-case $host_os in
-aix3*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
-  shlibpath_var=LIBPATH
-
-  # AIX 3 has no versioning support, so we append a major version to the name.
-  soname_spec='${libname}${release}${shared_ext}$major'
-  ;;
-
-aix4* | aix5*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  hardcode_into_libs=yes
-  if test "$host_cpu" = ia64; then
-    # AIX 5 supports IA64
-    library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
-    shlibpath_var=LD_LIBRARY_PATH
-  else
-    # With GCC up to 2.95.x, collect2 would create an import file
-    # for dependence libraries.  The import file would start with
-    # the line `#! .'.  This would cause the generated library to
-    # depend on `.', always an invalid library.  This was fixed in
-    # development snapshots of GCC prior to 3.0.
-    case $host_os in
-      aix4 | aix4.[01] | aix4.[01].*)
-      if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
-	   echo ' yes '
-	   echo '#endif'; } | ${CC} -E - | grep yes > /dev/null; then
-	:
-      else
-	can_build_shared=no
-      fi
-      ;;
-    esac
-    # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
-    # soname into executable. Probably we can add versioning support to
-    # collect2, so additional links can be useful in future.
-    if test "$aix_use_runtimelinking" = yes; then
-      # If using run time linking (on AIX 4.2 or later) use lib<name>.so
-      # instead of lib<name>.a to let people know that these are not
-      # typical AIX shared libraries.
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    else
-      # We preserve .a as extension for shared libraries through AIX4.2
-      # and later when we are not doing run time linking.
-      library_names_spec='${libname}${release}.a $libname.a'
-      soname_spec='${libname}${release}${shared_ext}$major'
-    fi
-    shlibpath_var=LIBPATH
-  fi
-  ;;
-
-amigaos*)
-  library_names_spec='$libname.ixlibrary $libname.a'
-  # Create ${libname}_ixlibrary.a entries in /sys/libs.
-  finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
-  ;;
-
-beos*)
-  library_names_spec='${libname}${shared_ext}'
-  dynamic_linker="$host_os ld.so"
-  shlibpath_var=LIBRARY_PATH
-  ;;
-
-bsdi4*)
-  version_type=linux
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
-  sys_lib_dlsearch_path_spec="/shlib /usr/lib /usr/local/lib"
-  # the default ld.so.conf also contains /usr/contrib/lib and
-  # /usr/X11R6/lib (/usr/X11 is a link to /usr/X11R6), but let us allow
-  # libtool to hard-code these into programs
-  ;;
-
-cygwin* | mingw* | pw32*)
-  version_type=windows
-  shrext_cmds=".dll"
-  need_version=no
-  need_lib_prefix=no
-
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32*)
-    library_names_spec='$libname.dll.a'
-    # DLL is installed to $(libdir)/../bin by postinstall_cmds
-    postinstall_cmds='base_file=`basename \${file}`~
-      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
-      dldir=$destdir/`dirname \$dlpath`~
-      test -d \$dldir || mkdir -p \$dldir~
-      $install_prog $dir/$dlname \$dldir/$dlname'
-    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
-      dlpath=$dir/\$dldll~
-       $rm \$dlpath'
-    shlibpath_overrides_runpath=yes
-
-    case $host_os in
-    cygwin*)
-      # Cygwin DLLs use 'cyg' prefix rather than 'lib'
-      soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
-      ;;
-    mingw*)
-      # MinGW DLLs use traditional 'lib' prefix
-      soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | grep "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if echo "$sys_lib_search_path_spec" | grep ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`echo "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
-      ;;
-    pw32*)
-      # pw32 DLLs use 'pw' prefix rather than 'lib'
-      library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/./-/g'`${versuffix}${shared_ext}'
-      ;;
-    esac
-    ;;
-
-  *)
-    library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
-    ;;
-  esac
-  dynamic_linker='Win32 ld.exe'
-  # FIXME: first we should search . and the directory the executable is in
-  shlibpath_var=PATH
-  ;;
-
-darwin* | rhapsody*)
-  dynamic_linker="$host_os dyld"
-  version_type=darwin
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${versuffix}$shared_ext ${libname}${release}${major}$shared_ext ${libname}$shared_ext'
-  soname_spec='${libname}${release}${major}$shared_ext'
-  shlibpath_overrides_runpath=yes
-  shlibpath_var=DYLD_LIBRARY_PATH
-  shrext_cmds='$(test .$module = .yes && echo .so || echo .dylib)'
-  # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
-  if test "$GCC" = yes; then
-    sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
-  else
-    sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
-  fi
-  sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
-  ;;
-
-dgux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
-kfreebsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-freebsd*)
-  objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-  version_type=freebsd-$objformat
-  case $version_type in
-    freebsd-elf*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
-      need_version=no
-      need_lib_prefix=no
-      ;;
-    freebsd-*)
-      library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
-      need_version=yes
-      ;;
-  esac
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_os in
-  freebsd2*)
-    shlibpath_overrides_runpath=yes
-    ;;
-  freebsd3.01* | freebsdelf3.01*)
-    shlibpath_overrides_runpath=yes
-    hardcode_into_libs=yes
-    ;;
-  *) # from 3.2 on
-    shlibpath_overrides_runpath=no
-    hardcode_into_libs=yes
-    ;;
-  esac
-  ;;
-
-gnu*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  hardcode_into_libs=yes
-  ;;
-
-hpux9* | hpux10* | hpux11*)
-  # Give a soname corresponding to the major version so that dld.sl refuses to
-  # link against other versions.
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  case "$host_cpu" in
-  ia64*)
-    shrext_cmds='.so'
-    hardcode_into_libs=yes
-    dynamic_linker="$host_os dld.so"
-    shlibpath_var=LD_LIBRARY_PATH
-    shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    if test "X$HPUX_IA64_MODE" = X32; then
-      sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
-    else
-      sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
-    fi
-    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-    ;;
-   hppa*64*)
-     shrext_cmds='.sl'
-     hardcode_into_libs=yes
-     dynamic_linker="$host_os dld.sl"
-     shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-     shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
-     library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-     soname_spec='${libname}${release}${shared_ext}$major'
-     sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
-     sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
-     ;;
-   *)
-    shrext_cmds='.sl'
-    dynamic_linker="$host_os dld.sl"
-    shlibpath_var=SHLIB_PATH
-    shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    ;;
-  esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
-  postinstall_cmds='chmod 555 $lib'
-  ;;
-
-irix5* | irix6* | nonstopux*)
-  case $host_os in
-    nonstopux*) version_type=nonstopux ;;
-    *)
-	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
-	else
-		version_type=irix
-	fi ;;
-  esac
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
-  case $host_os in
-  irix5* | nonstopux*)
-    libsuff= shlibsuff=
-    ;;
-  *)
-    case $LD in # libtool.m4 will add one of these switches to LD
-    *-32|*"-32 "|*-melf32bsmip|*"-melf32bsmip ")
-      libsuff= shlibsuff= libmagic=32-bit;;
-    *-n32|*"-n32 "|*-melf32bmipn32|*"-melf32bmipn32 ")
-      libsuff=32 shlibsuff=N32 libmagic=N32;;
-    *-64|*"-64 "|*-melf64bmip|*"-melf64bmip ")
-      libsuff=64 shlibsuff=64 libmagic=64-bit;;
-    *) libsuff= shlibsuff= libmagic=never-match;;
-    esac
-    ;;
-  esac
-  shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
-  shlibpath_overrides_runpath=no
-  sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
-  sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
-  hardcode_into_libs=yes
-  ;;
-
-# No shared lib support for Linux oldld, aout, or coff.
-linux*oldld* | linux*aout* | linux*coff*)
-  dynamic_linker=no
-  ;;
-
-# This must be Linux ELF.
-linux*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  # This implies no fast_install, which is unacceptable.
-  # Some rework will be needed to allow for fast_install
-  # before this can be enabled.
-  hardcode_into_libs=yes
-
-  # Append ld.so.conf contents to the search path
-  if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`$SED -e 's/:,\t/ /g;s/=^=*$//;s/=^= * / /g' /etc/ld.so.conf | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
-  fi
-
-  # We used to test for /lib/ld.so.1 and disable shared libraries on
-  # powerpc, because MkLinux only supported shared libraries with the
-  # GNU dynamic linker.  Since this was broken with cross compilers,
-  # most powerpc-linux boxes support dynamic linking these days and
-  # people can always --disable-shared, the test was removed, and we
-  # assume the GNU/Linux dynamic linker is in use.
-  dynamic_linker='GNU/Linux ld.so'
-  ;;
-
-netbsdelf*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='NetBSD ld.elf_so'
-  ;;
-
-knetbsd*-gnu)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=no
-  hardcode_into_libs=yes
-  dynamic_linker='GNU ld.so'
-  ;;
-
-netbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=no
-  if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-    finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-    dynamic_linker='NetBSD (a.out) ld.so'
-  else
-    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
-    soname_spec='${libname}${release}${shared_ext}$major'
-    dynamic_linker='NetBSD ld.elf_so'
-  fi
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  ;;
-
-newsos6)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-nto-qnx*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  ;;
-
-openbsd*)
-  version_type=sunos
-  need_lib_prefix=no
-  need_version=yes
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
-    case $host_os in
-      openbsd2.[89] | openbsd2.[89].*)
-	shlibpath_overrides_runpath=no
-	;;
-      *)
-	shlibpath_overrides_runpath=yes
-	;;
-      esac
-  else
-    shlibpath_overrides_runpath=yes
-  fi
-  ;;
-
-os2*)
-  libname_spec='$name'
-  shrext_cmds=".dll"
-  need_lib_prefix=no
-  library_names_spec='$libname${shared_ext} $libname.a'
-  dynamic_linker='OS/2 ld.exe'
-  shlibpath_var=LIBPATH
-  ;;
-
-osf3* | osf4* | osf5*)
-  version_type=osf
-  need_lib_prefix=no
-  need_version=no
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
-  sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
-  ;;
-
-sco3.2v5*)
-  version_type=osf
-  soname_spec='${libname}${release}${shared_ext}$major'
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-solaris*)
-  version_type=linux
-  need_lib_prefix=no
-  need_version=no
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  hardcode_into_libs=yes
-  # ldd complains unless libraries are executable
-  postinstall_cmds='chmod +x $lib'
-  ;;
-
-sunos4*)
-  version_type=sunos
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
-  finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
-  shlibpath_var=LD_LIBRARY_PATH
-  shlibpath_overrides_runpath=yes
-  if test "$with_gnu_ld" = yes; then
-    need_lib_prefix=no
-  fi
-  need_version=yes
-  ;;
-
-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  case $host_vendor in
-    sni)
-      shlibpath_overrides_runpath=no
-      need_lib_prefix=no
-      export_dynamic_flag_spec='${wl}-Blargedynsym'
-      runpath_var=LD_RUN_PATH
-      ;;
-    siemens)
-      need_lib_prefix=no
-      ;;
-    motorola)
-      need_lib_prefix=no
-      need_version=no
-      shlibpath_overrides_runpath=no
-      sys_lib_search_path_spec='/lib /usr/lib /usr/ccs/lib'
-      ;;
-  esac
-  ;;
-
-sysv4*MP*)
-  if test -d /usr/nec ;then
-    version_type=linux
-    library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
-    soname_spec='$libname${shared_ext}.$major'
-    shlibpath_var=LD_LIBRARY_PATH
-  fi
-  ;;
-
-uts4*)
-  version_type=linux
-  library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-  soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
-  ;;
-
-*)
-  dynamic_linker=no
-  ;;
-esac
-echo "$as_me:$LINENO: result: $dynamic_linker" >&5
-echo "${ECHO_T}$dynamic_linker" >&6
-test "$dynamic_linker" = no && can_build_shared=no
-
-echo "$as_me:$LINENO: checking how to hardcode library paths into programs" >&5
-echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
-hardcode_action_GCJ=
-if test -n "$hardcode_libdir_flag_spec_GCJ" || \
-   test -n "$runpath_var GCJ" || \
-   test "X$hardcode_automatic_GCJ"="Xyes" ; then
-
-  # We can hardcode non-existant directories.
-  if test "$hardcode_direct_GCJ" != no &&
-     # If the only mechanism to avoid hardcoding is shlibpath_var, we
-     # have to relink, otherwise we might link with an installed library
-     # when we should be linking with a yet-to-be-installed one
-     ## test "$_LT_AC_TAGVAR(hardcode_shlibpath_var, GCJ)" != no &&
-     test "$hardcode_minus_L_GCJ" != no; then
-    # Linking always hardcodes the temporary library directory.
-    hardcode_action_GCJ=relink
-  else
-    # We can link without hardcoding, and we can hardcode nonexisting dirs.
-    hardcode_action_GCJ=immediate
-  fi
-else
-  # We cannot hardcode anything, or else we can only hardcode existing
-  # directories.
-  hardcode_action_GCJ=unsupported
-fi
-echo "$as_me:$LINENO: result: $hardcode_action_GCJ" >&5
-echo "${ECHO_T}$hardcode_action_GCJ" >&6
-
-if test "$hardcode_action_GCJ" = relink; then
-  # Fast installation is not supported
-  enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
-     test "$enable_shared" = no; then
-  # Fast installation is not necessary
-  enable_fast_install=needless
-fi
-
-striplib=
-old_striplib=
-echo "$as_me:$LINENO: checking whether stripping libraries is possible" >&5
-echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
-if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
-  test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
-  test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-else
-# FIXME - insert some real tests, host_os isn't really good enough
-  case $host_os in
-   darwin*)
-       if test -n "$STRIP" ; then
-         striplib="$STRIP -x"
-         echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-       else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-       ;;
-   *)
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-    ;;
-  esac
-fi
-
-if test "x$enable_dlopen" != xyes; then
-  enable_dlopen=unknown
-  enable_dlopen_self=unknown
-  enable_dlopen_self_static=unknown
-else
-  lt_cv_dlopen=no
-  lt_cv_dlopen_libs=
-
-  case $host_os in
-  beos*)
-    lt_cv_dlopen="load_add_on"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-    ;;
-
-  mingw* | pw32*)
-    lt_cv_dlopen="LoadLibrary"
-    lt_cv_dlopen_libs=
-   ;;
-
-  cygwin*)
-    lt_cv_dlopen="dlopen"
-    lt_cv_dlopen_libs=
-   ;;
-
-  darwin*)
-  # if libdl is installed we need to link against it
-    echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-
-    lt_cv_dlopen="dyld"
-    lt_cv_dlopen_libs=
-    lt_cv_dlopen_self=yes
-
-fi
-
-   ;;
-
-  *)
-    echo "$as_me:$LINENO: checking for shl_load" >&5
-echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
-if test "${ac_cv_func_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define shl_load to an innocuous variant, in case <limits.h> declares shl_load.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define shl_load innocuous_shl_load
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char shl_load (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef shl_load
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char shl_load ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_shl_load) || defined (__stub___shl_load)
-choke me
-#else
-char (*f) () = shl_load;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != shl_load;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_shl_load=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_shl_load=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
-echo "${ECHO_T}$ac_cv_func_shl_load" >&6
-if test $ac_cv_func_shl_load = yes; then
-  lt_cv_dlopen="shl_load"
-else
-  echo "$as_me:$LINENO: checking for shl_load in -ldld" >&5
-echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char shl_load ();
-int
-main ()
-{
-shl_load ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dld_shl_load=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dld_shl_load=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_shl_load" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
-if test $ac_cv_lib_dld_shl_load = yes; then
-  lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
-else
-  echo "$as_me:$LINENO: checking for dlopen" >&5
-echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
-if test "${ac_cv_func_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define dlopen to an innocuous variant, in case <limits.h> declares dlopen.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define dlopen innocuous_dlopen
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char dlopen (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef dlopen
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_dlopen) || defined (__stub___dlopen)
-choke me
-#else
-char (*f) () = dlopen;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != dlopen;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_func_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_func_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
-echo "${ECHO_T}$ac_cv_func_dlopen" >&6
-if test $ac_cv_func_dlopen = yes; then
-  lt_cv_dlopen="dlopen"
-else
-  echo "$as_me:$LINENO: checking for dlopen in -ldl" >&5
-echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldl  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dl_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dl_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dl_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
-if test $ac_cv_lib_dl_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
-else
-  echo "$as_me:$LINENO: checking for dlopen in -lsvld" >&5
-echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lsvld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dlopen ();
-int
-main ()
-{
-dlopen ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_svld_dlopen=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_svld_dlopen=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_svld_dlopen" >&5
-echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
-if test $ac_cv_lib_svld_dlopen = yes; then
-  lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
-else
-  echo "$as_me:$LINENO: checking for dld_link in -ldld" >&5
-echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-ldld  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char dld_link ();
-int
-main ()
-{
-dld_link ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_dld_dld_link=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_dld_dld_link=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_dld_dld_link" >&5
-echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
-if test $ac_cv_lib_dld_dld_link = yes; then
-  lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-
-fi
-
-    ;;
-  esac
-
-  if test "x$lt_cv_dlopen" != xno; then
-    enable_dlopen=yes
-  else
-    enable_dlopen=no
-  fi
-
-  case $lt_cv_dlopen in
-  dlopen)
-    save_CPPFLAGS="$CPPFLAGS"
-    test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
-
-    save_LDFLAGS="$LDFLAGS"
-    eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
-
-    save_LIBS="$LIBS"
-    LIBS="$lt_cv_dlopen_libs $LIBS"
-
-    echo "$as_me:$LINENO: checking whether a program can dlopen itself" >&5
-echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 18009 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self" >&6
-
-    if test "x$lt_cv_dlopen_self" = xyes; then
-      LDFLAGS="$LDFLAGS $link_static_flag"
-      echo "$as_me:$LINENO: checking whether a statically linked program can dlopen itself" >&5
-echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
-if test "${lt_cv_dlopen_self_static+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  	  if test "$cross_compiling" = yes; then :
-  lt_cv_dlopen_self_static=cross
-else
-  lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
-  lt_status=$lt_dlunknown
-  cat > conftest.$ac_ext <<EOF
-#line 18107 "configure"
-#include "confdefs.h"
-
-#if HAVE_DLFCN_H
-#include <dlfcn.h>
-#endif
-
-#include <stdio.h>
-
-#ifdef RTLD_GLOBAL
-#  define LT_DLGLOBAL		RTLD_GLOBAL
-#else
-#  ifdef DL_GLOBAL
-#    define LT_DLGLOBAL		DL_GLOBAL
-#  else
-#    define LT_DLGLOBAL		0
-#  endif
-#endif
-
-/* We may have to define LT_DLLAZY_OR_NOW in the command line if we
-   find out it does not work in some platform. */
-#ifndef LT_DLLAZY_OR_NOW
-#  ifdef RTLD_LAZY
-#    define LT_DLLAZY_OR_NOW		RTLD_LAZY
-#  else
-#    ifdef DL_LAZY
-#      define LT_DLLAZY_OR_NOW		DL_LAZY
-#    else
-#      ifdef RTLD_NOW
-#        define LT_DLLAZY_OR_NOW	RTLD_NOW
-#      else
-#        ifdef DL_NOW
-#          define LT_DLLAZY_OR_NOW	DL_NOW
-#        else
-#          define LT_DLLAZY_OR_NOW	0
-#        endif
-#      endif
-#    endif
-#  endif
-#endif
-
-#ifdef __cplusplus
-extern "C" void exit (int);
-#endif
-
-void fnord() { int i=42;}
-int main ()
-{
-  void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
-  int status = $lt_dlunknown;
-
-  if (self)
-    {
-      if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
-      /* dlclose (self); */
-    }
-
-    exit (status);
-}
-EOF
-  if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
-    (./conftest; exit; ) 2>/dev/null
-    lt_status=$?
-    case x$lt_status in
-      x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_dlneed_uscore) lt_cv_dlopen_self_static=yes ;;
-      x$lt_unknown|x*) lt_cv_dlopen_self_static=no ;;
-    esac
-  else :
-    # compilation failed
-    lt_cv_dlopen_self_static=no
-  fi
-fi
-rm -fr conftest*
-
-
-fi
-echo "$as_me:$LINENO: result: $lt_cv_dlopen_self_static" >&5
-echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
-    fi
-
-    CPPFLAGS="$save_CPPFLAGS"
-    LDFLAGS="$save_LDFLAGS"
-    LIBS="$save_LIBS"
-    ;;
-  esac
-
-  case $lt_cv_dlopen_self in
-  yes|no) enable_dlopen_self=$lt_cv_dlopen_self ;;
-  *) enable_dlopen_self=unknown ;;
-  esac
-
-  case $lt_cv_dlopen_self_static in
-  yes|no) enable_dlopen_self_static=$lt_cv_dlopen_self_static ;;
-  *) enable_dlopen_self_static=unknown ;;
-  esac
-fi
-
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler_GCJ \
-    CC_GCJ \
-    LD_GCJ \
-    lt_prog_compiler_wl_GCJ \
-    lt_prog_compiler_pic_GCJ \
-    lt_prog_compiler_static_GCJ \
-    lt_prog_compiler_no_builtin_flag_GCJ \
-    export_dynamic_flag_spec_GCJ \
-    thread_safe_flag_spec_GCJ \
-    whole_archive_flag_spec_GCJ \
-    enable_shared_with_static_runtimes_GCJ \
-    old_archive_cmds_GCJ \
-    old_archive_from_new_cmds_GCJ \
-    predep_objects_GCJ \
-    postdep_objects_GCJ \
-    predeps_GCJ \
-    postdeps_GCJ \
-    compiler_lib_search_path_GCJ \
-    archive_cmds_GCJ \
-    archive_expsym_cmds_GCJ \
-    postinstall_cmds_GCJ \
-    postuninstall_cmds_GCJ \
-    old_archive_from_expsyms_cmds_GCJ \
-    allow_undefined_flag_GCJ \
-    no_undefined_flag_GCJ \
-    export_symbols_cmds_GCJ \
-    hardcode_libdir_flag_spec_GCJ \
-    hardcode_libdir_flag_spec_ld_GCJ \
-    hardcode_libdir_separator_GCJ \
-    hardcode_automatic_GCJ \
-    module_cmds_GCJ \
-    module_expsym_cmds_GCJ \
-    lt_cv_prog_compiler_c_o_GCJ \
-    exclude_expsyms_GCJ \
-    include_expsyms_GCJ; do
-
-    case $var in
-    old_archive_cmds_GCJ | \
-    old_archive_from_new_cmds_GCJ | \
-    archive_cmds_GCJ | \
-    archive_expsym_cmds_GCJ | \
-    module_cmds_GCJ | \
-    module_expsym_cmds_GCJ | \
-    old_archive_from_expsyms_cmds_GCJ | \
-    export_symbols_cmds_GCJ | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-cfgfile="$ofile"
-
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_GCJ
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_GCJ
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# A language-specific compiler.
-CC=$lt_compiler_GCJ
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_GCJ
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_GCJ
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_GCJ
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_GCJ
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
-
-# Must we lock files when doing compilation ?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_GCJ
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_GCJ
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_GCJ
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_GCJ
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_GCJ
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_GCJ
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_GCJ
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_GCJ
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_GCJ
-archive_expsym_cmds=$lt_archive_expsym_cmds_GCJ
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_GCJ
-module_expsym_cmds=$lt_module_expsym_cmds_GCJ
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_GCJ
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_GCJ
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_GCJ
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_GCJ
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_GCJ
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_GCJ
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_GCJ
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_GCJ
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_GCJ
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_GCJ
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_GCJ
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_GCJ
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_GCJ
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_GCJ
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic_GCJ
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_GCJ
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_GCJ"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_GCJ
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_GCJ
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_GCJ
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_GCJ
-
-# ### END LIBTOOL TAG CONFIG: $tagname
-
-__EOF__
-
-
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC="$lt_save_CC"
-
-	else
-	  tagname=""
-	fi
-	;;
-
-      RC)
-
-
-
-# Source file extension for RC test sources.
-ac_ext=rc
-
-# Object file extension for compiled RC test sources.
-objext=o
-objext_RC=$objext
-
-# Code to be used in simple compile tests
-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
-
-# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
-
-# ltmain only uses $CC for tagged configurations so make sure $CC is set.
-
-# If no C compiler was specified, use CC.
-LTCC=${LTCC-"$CC"}
-
-# Allow CC to be a program name with arguments.
-compiler=$CC
-
-
-# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
-CC=${RC-"windres"}
-compiler=$CC
-compiler_RC=$CC
-lt_cv_prog_compiler_c_o_RC=yes
-
-# The else clause should only fire when bootstrapping the
-# libtool distribution, otherwise you forgot to ship ltmain.sh
-# with your package, and you will get complaints that there are
-# no rules to generate ltmain.sh.
-if test -f "$ltmain"; then
-  # See if we are running on zsh, and set the options which allow our commands through
-  # without removal of \ escapes.
-  if test -n "${ZSH_VERSION+set}" ; then
-    setopt NO_GLOB_SUBST
-  fi
-  # Now quote all the things that may contain metacharacters while being
-  # careful not to overquote the AC_SUBSTed values.  We take copies of the
-  # variables and quote the copies for generation of the libtool script.
-  for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM \
-    SED SHELL STRIP \
-    libname_spec library_names_spec soname_spec extract_expsyms_cmds \
-    old_striplib striplib file_magic_cmd finish_cmds finish_eval \
-    deplibs_check_method reload_flag reload_cmds need_locks \
-    lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
-    lt_cv_sys_global_symbol_to_c_name_address \
-    sys_lib_search_path_spec sys_lib_dlsearch_path_spec \
-    old_postinstall_cmds old_postuninstall_cmds \
-    compiler_RC \
-    CC_RC \
-    LD_RC \
-    lt_prog_compiler_wl_RC \
-    lt_prog_compiler_pic_RC \
-    lt_prog_compiler_static_RC \
-    lt_prog_compiler_no_builtin_flag_RC \
-    export_dynamic_flag_spec_RC \
-    thread_safe_flag_spec_RC \
-    whole_archive_flag_spec_RC \
-    enable_shared_with_static_runtimes_RC \
-    old_archive_cmds_RC \
-    old_archive_from_new_cmds_RC \
-    predep_objects_RC \
-    postdep_objects_RC \
-    predeps_RC \
-    postdeps_RC \
-    compiler_lib_search_path_RC \
-    archive_cmds_RC \
-    archive_expsym_cmds_RC \
-    postinstall_cmds_RC \
-    postuninstall_cmds_RC \
-    old_archive_from_expsyms_cmds_RC \
-    allow_undefined_flag_RC \
-    no_undefined_flag_RC \
-    export_symbols_cmds_RC \
-    hardcode_libdir_flag_spec_RC \
-    hardcode_libdir_flag_spec_ld_RC \
-    hardcode_libdir_separator_RC \
-    hardcode_automatic_RC \
-    module_cmds_RC \
-    module_expsym_cmds_RC \
-    lt_cv_prog_compiler_c_o_RC \
-    exclude_expsyms_RC \
-    include_expsyms_RC; do
-
-    case $var in
-    old_archive_cmds_RC | \
-    old_archive_from_new_cmds_RC | \
-    archive_cmds_RC | \
-    archive_expsym_cmds_RC | \
-    module_cmds_RC | \
-    module_expsym_cmds_RC | \
-    old_archive_from_expsyms_cmds_RC | \
-    export_symbols_cmds_RC | \
-    extract_expsyms_cmds | reload_cmds | finish_cmds | \
-    postinstall_cmds | postuninstall_cmds | \
-    old_postinstall_cmds | old_postuninstall_cmds | \
-    sys_lib_search_path_spec | sys_lib_dlsearch_path_spec)
-      # Double-quote double-evaled strings.
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$double_quote_subst\" -e \"\$sed_quote_subst\" -e \"\$delay_variable_subst\"\`\\\""
-      ;;
-    *)
-      eval "lt_$var=\\\"\`\$echo \"X\$$var\" | \$Xsed -e \"\$sed_quote_subst\"\`\\\""
-      ;;
-    esac
-  done
-
-  case $lt_echo in
-  *'\$0 --fallback-echo"')
-    lt_echo=`$echo "X$lt_echo" | $Xsed -e 's/\\\\\\\$0 --fallback-echo"$/$0 --fallback-echo"/'`
-    ;;
-  esac
-
-cfgfile="$ofile"
-
-  cat <<__EOF__ >> "$cfgfile"
-# ### BEGIN LIBTOOL TAG CONFIG: $tagname
-
-# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
-
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
-
-# Whether or not to build shared libraries.
-build_libtool_libs=$enable_shared
-
-# Whether or not to build static libraries.
-build_old_libs=$enable_static
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=$archive_cmds_need_lc_RC
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=$enable_shared_with_static_runtimes_RC
-
-# Whether or not to optimize for fast installation.
-fast_install=$enable_fast_install
-
-# The host system.
-host_alias=$host_alias
-host=$host
-
-# An echo program that does not interpret backslashes.
-echo=$lt_echo
-
-# The archiver.
-AR=$lt_AR
-AR_FLAGS=$lt_AR_FLAGS
-
-# A C compiler.
-LTCC=$lt_LTCC
-
-# A language-specific compiler.
-CC=$lt_compiler_RC
-
-# Is the compiler the GNU C compiler?
-with_gcc=$GCC_RC
-
-# An ERE matcher.
-EGREP=$lt_EGREP
-
-# The linker used to build libraries.
-LD=$lt_LD_RC
-
-# Whether we need hard or soft links.
-LN_S=$lt_LN_S
-
-# A BSD-compatible nm program.
-NM=$lt_NM
-
-# A symbol stripping program
-STRIP=$lt_STRIP
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=$MAGIC_CMD
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="$DLLTOOL"
-
-# Used on cygwin: object dumper.
-OBJDUMP="$OBJDUMP"
-
-# Used on cygwin: assembler.
-AS="$AS"
-
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
-
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
-
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_RC
-
-# Object file suffix (normally "o").
-objext="$ac_objext"
-
-# Old archive suffix (normally "a").
-libext="$libext"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='$shrext_cmds'
-
-# Executable file suffix (normally "").
-exeext="$exeext"
-
-# Additional compiler flags for building library objects.
-pic_flag=$lt_lt_prog_compiler_pic_RC
-pic_mode=$pic_mode
-
-# What is the maximum length of a command?
-max_cmd_len=$lt_cv_sys_max_cmd_len
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
-
-# Must we lock files when doing compilation ?
-need_locks=$lt_need_locks
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=$need_lib_prefix
-
-# Do we need a version for libraries?
-need_version=$need_version
-
-# Whether dlopen is supported.
-dlopen_support=$enable_dlopen
-
-# Whether dlopen of programs is supported.
-dlopen_self=$enable_dlopen_self
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=$enable_dlopen_self_static
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag=$lt_lt_prog_compiler_static_RC
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_RC
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec=$lt_export_dynamic_flag_spec_RC
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec=$lt_whole_archive_flag_spec_RC
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=$lt_thread_safe_flag_spec_RC
-
-# Library versioning type.
-version_type=$version_type
-
-# Format of library name prefix.
-libname_spec=$lt_libname_spec
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec=$lt_library_names_spec
-
-# The coded name of the library, if different from the real name.
-soname_spec=$lt_soname_spec
-
-# Commands used to build and install an old-style archive.
-RANLIB=$lt_RANLIB
-old_archive_cmds=$lt_old_archive_cmds_RC
-old_postinstall_cmds=$lt_old_postinstall_cmds
-old_postuninstall_cmds=$lt_old_postuninstall_cmds
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=$lt_old_archive_from_new_cmds_RC
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=$lt_old_archive_from_expsyms_cmds_RC
-
-# Commands used to build and install a shared archive.
-archive_cmds=$lt_archive_cmds_RC
-archive_expsym_cmds=$lt_archive_expsym_cmds_RC
-postinstall_cmds=$lt_postinstall_cmds
-postuninstall_cmds=$lt_postuninstall_cmds
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=$lt_module_cmds_RC
-module_expsym_cmds=$lt_module_expsym_cmds_RC
-
-# Commands to strip libraries.
-old_striplib=$lt_old_striplib
-striplib=$lt_striplib
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=$lt_predep_objects_RC
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=$lt_postdep_objects_RC
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=$lt_predeps_RC
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=$lt_postdeps_RC
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=$lt_compiler_lib_search_path_RC
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method=$lt_deplibs_check_method
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd=$lt_file_magic_cmd
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=$lt_allow_undefined_flag_RC
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=$lt_no_undefined_flag_RC
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds=$lt_finish_cmds
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=$lt_finish_eval
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe=$lt_lt_cv_sys_global_symbol_pipe
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl=$lt_lt_cv_sys_global_symbol_to_cdecl
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address=$lt_lt_cv_sys_global_symbol_to_c_name_address
-
-# This is the shared library runtime path variable.
-runpath_var=$runpath_var
-
-# This is the shared library path variable.
-shlibpath_var=$shlibpath_var
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=$shlibpath_overrides_runpath
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=$hardcode_action_RC
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=$hardcode_into_libs
-
-# Flag to hardcode \$libdir into a binary during linking.
-# This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_RC
-
-# If ld is used when linking, flag to hardcode \$libdir into
-# a binary during linking. This must work even if \$libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_RC
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=$lt_hardcode_libdir_separator_RC
-
-# Set to yes if using DIR/libNAME${shared_ext} during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=$hardcode_direct_RC
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=$hardcode_minus_L_RC
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=$hardcode_shlibpath_var_RC
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=$hardcode_automatic_RC
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="$variables_saved_for_relink"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=$link_all_deplibs_RC
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
-
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path="$fix_srcfile_path_RC"
-
-# Set to yes if exported symbols are required.
-always_export_symbols=$always_export_symbols_RC
-
-# The commands to list exported symbols.
-export_symbols_cmds=$lt_export_symbols_cmds_RC
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=$lt_extract_expsyms_cmds
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=$lt_exclude_expsyms_RC
-
-# Symbols that must always be exported.
-include_expsyms=$lt_include_expsyms_RC
-
-# ### END LIBTOOL TAG CONFIG: $tagname
-
-__EOF__
-
-
-else
-  # If there is no Makefile yet, we rely on a make rule to execute
-  # `config.status --recheck' to rerun these tests and create the
-  # libtool script then.
-  ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
-  if test -f "$ltmain_in"; then
-    test -f Makefile && make "$ltmain"
-  fi
-fi
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-CC="$lt_save_CC"
-
-	;;
-
-      *)
-	{ { echo "$as_me:$LINENO: error: Unsupported tag name: $tagname" >&5
-echo "$as_me: error: Unsupported tag name: $tagname" >&2;}
-   { (exit 1); exit 1; }; }
-	;;
-      esac
-
-      # Append the new tag name to the list of available tags.
-      if test -n "$tagname" ; then
-      available_tags="$available_tags $tagname"
-    fi
-    fi
-  done
-  IFS="$lt_save_ifs"
-
-  # Now substitute the updated list of available tags.
-  if eval "sed -e 's/^available_tags=.*\$/available_tags=\"$available_tags\"/' \"$ofile\" > \"${ofile}T\""; then
-    mv "${ofile}T" "$ofile"
-    chmod +x "$ofile"
-  else
-    rm -f "${ofile}T"
-    { { echo "$as_me:$LINENO: error: unable to update list of available tagged configurations." >&5
-echo "$as_me: error: unable to update list of available tagged configurations." >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-fi
-
-
-
-# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-
-# Always use our own libtool.
-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-
-# Prevent multiple expansion
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-WARN_CFLAGS=""
-if test "x$GCC" = "xyes"; then
-	WARN_CFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes \
-               -Wmissing-prototypes -Wmissing-declarations \
-               -Wnested-externs -fno-strict-aliasing"
-fi
-
-CFLAGS="$CFLAGS $WARN_CFLAGS"
-
-GHOSD_PACKAGES="cairo"
-# Check whether --enable-pango or --disable-pango was given.
-if test "${enable_pango+set}" = set; then
-  enableval="$enable_pango"
-
-else
-  enable_pango=yes
-fi;
-if test "$enable_pango" = "yes"; then
-  GHOSD_PACKAGES="$GHOSD_PACKAGES pangocairo"
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_PANGO
-_ACEOF
-
-fi
-
-
-if test "$enable_pango" = "yes"; then
-  PANGO_TRUE=
-  PANGO_FALSE='#'
-else
-  PANGO_TRUE='#'
-  PANGO_FALSE=
-fi
-
-
-
-
-if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
-set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
-if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-fi
-if test -z "$ac_cv_path_PKG_CONFIG"; then
-  ac_pt_PKG_CONFIG=$PKG_CONFIG
-  # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $ac_pt_PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  ;;
-esac
-fi
-ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
-
-if test -n "$ac_pt_PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $ac_pt_PKG_CONFIG" >&5
-echo "${ECHO_T}$ac_pt_PKG_CONFIG" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-  PKG_CONFIG=$ac_pt_PKG_CONFIG
-else
-  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
-fi
-
-fi
-if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=0.9.0
-	echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
-echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-	else
-		echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-		PKG_CONFIG=""
-	fi
-
-fi
-
-pkg_failed=no
-echo "$as_me:$LINENO: checking for GHOSD" >&5
-echo $ECHO_N "checking for GHOSD... $ECHO_C" >&6
-
-if test -n "$PKG_CONFIG"; then
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GHOSD_PACKAGES\"") >&5
-  ($PKG_CONFIG --exists --print-errors "$GHOSD_PACKAGES") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_GHOSD_CFLAGS=`$PKG_CONFIG --cflags "$GHOSD_PACKAGES" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GHOSD_PACKAGES\"") >&5
-  ($PKG_CONFIG --exists --print-errors "$GHOSD_PACKAGES") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_GHOSD_LIBS=`$PKG_CONFIG --libs "$GHOSD_PACKAGES" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-else
-	pkg_failed=untried
-fi
-
-if test $pkg_failed = yes; then
-	GHOSD_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$GHOSD_PACKAGES"`
-	# Put the nasty error message in config.log where it belongs
-	echo "$GHOSD_PKG_ERRORS" 1>&5
-
-	{ { echo "$as_me:$LINENO: error: Package requirements ($GHOSD_PACKAGES) were not met.
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively you may set the GHOSD_CFLAGS and GHOSD_LIBS environment variables
-to avoid the need to call pkg-config.  See the pkg-config man page for
-more details." >&5
-echo "$as_me: error: Package requirements ($GHOSD_PACKAGES) were not met.
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively you may set the GHOSD_CFLAGS and GHOSD_LIBS environment variables
-to avoid the need to call pkg-config.  See the pkg-config man page for
-more details." >&2;}
-   { (exit 1); exit 1; }; }
-elif test $pkg_failed = untried; then
-	{ { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively you may set the GHOSD_CFLAGS and GHOSD_LIBS environment variables
-to avoid the need to call pkg-config.  See the pkg-config man page for
-more details.
-
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-See \`config.log' for more details." >&5
-echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively you may set the GHOSD_CFLAGS and GHOSD_LIBS environment variables
-to avoid the need to call pkg-config.  See the pkg-config man page for
-more details.
-
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
-	GHOSD_CFLAGS=$pkg_cv_GHOSD_CFLAGS
-	GHOSD_LIBS=$pkg_cv_GHOSD_LIBS
-        echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-	:
-fi
-
-
-
-
-
-pkg_failed=no
-echo "$as_me:$LINENO: checking for GHOSD_EXAMPLE" >&5
-echo $ECHO_N "checking for GHOSD_EXAMPLE... $ECHO_C" >&6
-
-if test -n "$PKG_CONFIG"; then
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GHOSD_PACKAGES glib-2.0 >= 2.6\"") >&5
-  ($PKG_CONFIG --exists --print-errors "$GHOSD_PACKAGES glib-2.0 >= 2.6") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_GHOSD_EXAMPLE_CFLAGS=`$PKG_CONFIG --cflags "$GHOSD_PACKAGES glib-2.0 >= 2.6" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-else
-	pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
-        if test -n "$PKG_CONFIG" && \
-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"\$GHOSD_PACKAGES glib-2.0 >= 2.6\"") >&5
-  ($PKG_CONFIG --exists --print-errors "$GHOSD_PACKAGES glib-2.0 >= 2.6") 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  pkg_cv_GHOSD_EXAMPLE_LIBS=`$PKG_CONFIG --libs "$GHOSD_PACKAGES glib-2.0 >= 2.6" 2>/dev/null`
-else
-  pkg_failed=yes
-fi
-else
-	pkg_failed=untried
-fi
-
-if test $pkg_failed = yes; then
-	GHOSD_EXAMPLE_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "$GHOSD_PACKAGES glib-2.0 >= 2.6"`
-	# Put the nasty error message in config.log where it belongs
-	echo "$GHOSD_EXAMPLE_PKG_ERRORS" 1>&5
-
-	{ { echo "$as_me:$LINENO: error: Package requirements ($GHOSD_PACKAGES glib-2.0 >= 2.6) were not met.
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively you may set the GHOSD_EXAMPLE_CFLAGS and GHOSD_EXAMPLE_LIBS environment variables
-to avoid the need to call pkg-config.  See the pkg-config man page for
-more details." >&5
-echo "$as_me: error: Package requirements ($GHOSD_PACKAGES glib-2.0 >= 2.6) were not met.
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively you may set the GHOSD_EXAMPLE_CFLAGS and GHOSD_EXAMPLE_LIBS environment variables
-to avoid the need to call pkg-config.  See the pkg-config man page for
-more details." >&2;}
-   { (exit 1); exit 1; }; }
-elif test $pkg_failed = untried; then
-	{ { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively you may set the GHOSD_EXAMPLE_CFLAGS and GHOSD_EXAMPLE_LIBS environment variables
-to avoid the need to call pkg-config.  See the pkg-config man page for
-more details.
-
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-See \`config.log' for more details." >&5
-echo "$as_me: error: The pkg-config script could not be found or is too old.  Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively you may set the GHOSD_EXAMPLE_CFLAGS and GHOSD_EXAMPLE_LIBS environment variables
-to avoid the need to call pkg-config.  See the pkg-config man page for
-more details.
-
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-See \`config.log' for more details." >&2;}
-   { (exit 1); exit 1; }; }
-else
-	GHOSD_EXAMPLE_CFLAGS=$pkg_cv_GHOSD_EXAMPLE_CFLAGS
-	GHOSD_EXAMPLE_LIBS=$pkg_cv_GHOSD_EXAMPLE_LIBS
-        echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-	:
-fi
-
-
-
-
-
-# Check whether --with-html-dir or --without-html-dir was given.
-if test "${with_html_dir+set}" = set; then
-  withval="$with_html_dir"
-
-else
-  with_html_dir='${datadir}/gtk-doc/html'
-fi;
-  HTML_DIR="$with_html_dir"
-
-
-    # Check whether --enable-gtk-doc or --disable-gtk-doc was given.
-if test "${enable_gtk_doc+set}" = set; then
-  enableval="$enable_gtk_doc"
-
-else
-  enable_gtk_doc=no
-fi;
-
-  have_gtk_doc=no
-  if test x$enable_gtk_doc = xyes; then
-    if test -z "$PKG_CONFIG"; then
-      # Extract the first word of "pkg-config", so it can be a program name with args.
-set dummy pkg-config; ac_word=$2
-echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  case $PKG_CONFIG in
-  [\\/]* | ?:[\\/]*)
-  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
-  ;;
-  *)
-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for ac_exec_ext in '' $ac_executable_extensions; do
-  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
-    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
-    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-done
-
-  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
-  ;;
-esac
-fi
-PKG_CONFIG=$ac_cv_path_PKG_CONFIG
-
-if test -n "$PKG_CONFIG"; then
-  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
-echo "${ECHO_T}$PKG_CONFIG" >&6
-else
-  echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-fi
-
-    fi
-    if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
-      have_gtk_doc=yes
-    fi
-
-  gtk_doc_min_version=1.3
-    if test "$have_gtk_doc" = yes; then
-      echo "$as_me:$LINENO: checking gtk-doc version >= $gtk_doc_min_version" >&5
-echo $ECHO_N "checking gtk-doc version >= $gtk_doc_min_version... $ECHO_C" >&6
-      if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
-        echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6
-      else
-        echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6
-        have_gtk_doc=no
-      fi
-    fi
-
-    if test "$have_gtk_doc" != yes; then
-      enable_gtk_doc=no
-    fi
-  fi
-
-
-
-if test x$enable_gtk_doc = xyes; then
-  ENABLE_GTK_DOC_TRUE=
-  ENABLE_GTK_DOC_FALSE='#'
-else
-  ENABLE_GTK_DOC_TRUE='#'
-  ENABLE_GTK_DOC_FALSE=
-fi
-
-
-
-if test -n "$LIBTOOL"; then
-  GTK_DOC_USE_LIBTOOL_TRUE=
-  GTK_DOC_USE_LIBTOOL_FALSE='#'
-else
-  GTK_DOC_USE_LIBTOOL_TRUE='#'
-  GTK_DOC_USE_LIBTOOL_FALSE=
-fi
-
-
-
-                                                  ac_config_files="$ac_config_files Makefile ghosd.pc ghosd/Makefile examples/Makefile doc/Makefile"
-cat >confcache <<\_ACEOF
-# This file is a shell script that caches the results of configure
-# tests run on this system so they can be shared between configure
-# scripts and configure runs, see configure's option --config-cache.
-# It is not useful on other systems.  If it contains results you don't
-# want to keep, you may remove or edit it.
-#
-# config.status only pays attention to the cache file if you give it
-# the --recheck option to rerun configure.
-#
-# `ac_cv_env_foo' variables (set or unset) will be overridden when
-# loading this file, other *unset* `ac_cv_foo' will be assigned the
-# following values.
-
-_ACEOF
-
-# The following way of writing the cache mishandles newlines in values,
-# but we know of no workaround that is simple, portable, and efficient.
-# So, don't put newlines in cache variables' values.
-# Ultrix sh set writes to stderr and can't be redirected directly,
-# and sets the high bit in the cache file unless we assign to the vars.
-{
-  (set) 2>&1 |
-    case `(ac_space=' '; set | grep ac_space) 2>&1` in
-    *ac_space=\ *)
-      # `set' does not quote correctly, so add quotes (double-quote
-      # substitution turns \\\\ into \\, and sed turns \\ into \).
-      sed -n \
-	"s/'/'\\\\''/g;
-	  s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1='\\2'/p"
-      ;;
-    *)
-      # `set' quotes correctly as required by POSIX, so do not add quotes.
-      sed -n \
-	"s/^\\([_$as_cr_alnum]*_cv_[_$as_cr_alnum]*\\)=\\(.*\\)/\\1=\\2/p"
-      ;;
-    esac;
-} |
-  sed '
-     t clear
-     : clear
-     s/^\([^=]*\)=\(.*[{}].*\)$/test "${\1+set}" = set || &/
-     t end
-     /^ac_cv_env/!s/^\([^=]*\)=\(.*\)$/\1=${\1=\2}/
-     : end' >>confcache
-if diff $cache_file confcache >/dev/null 2>&1; then :; else
-  if test -w $cache_file; then
-    test "x$cache_file" != "x/dev/null" && echo "updating cache $cache_file"
-    cat confcache >$cache_file
-  else
-    echo "not updating unwritable cache $cache_file"
-  fi
-fi
-rm -f confcache
-
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-# Let make expand exec_prefix.
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# VPATH may cause trouble with some makes, so we remove $(srcdir),
-# ${srcdir} and @srcdir@ from VPATH if srcdir is ".", strip leading and
-# trailing colons and then remove the whole line if VPATH becomes empty
-# (actually we leave an empty line to preserve line numbers).
-if test "x$srcdir" = x.; then
-  ac_vpsub='/^[	 ]*VPATH[	 ]*=/{
-s/:*\$(srcdir):*/:/;
-s/:*\${srcdir}:*/:/;
-s/:*@srcdir@:*/:/;
-s/^\([^=]*=[	 ]*\):*/\1/;
-s/:*$//;
-s/^[^=]*=[	 ]*$//;
-}'
-fi
-
-DEFS=-DHAVE_CONFIG_H
-
-ac_libobjs=
-ac_ltlibobjs=
-for ac_i in : $LIBOBJS; do test "x$ac_i" = x: && continue
-  # 1. Remove the extension, and $U if already installed.
-  ac_i=`echo "$ac_i" |
-	 sed 's/\$U\././;s/\.o$//;s/\.obj$//'`
-  # 2. Add them.
-  ac_libobjs="$ac_libobjs $ac_i\$U.$ac_objext"
-  ac_ltlibobjs="$ac_ltlibobjs $ac_i"'$U.lo'
-done
-LIBOBJS=$ac_libobjs
-
-LTLIBOBJS=$ac_ltlibobjs
-
-
-if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"AMDEP\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${PANGO_TRUE}" && test -z "${PANGO_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"PANGO\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"PANGO\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${ENABLE_GTK_DOC_TRUE}" && test -z "${ENABLE_GTK_DOC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"ENABLE_GTK_DOC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"ENABLE_GTK_DOC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-if test -z "${GTK_DOC_USE_LIBTOOL_TRUE}" && test -z "${GTK_DOC_USE_LIBTOOL_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"GTK_DOC_USE_LIBTOOL\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
-
-: ${CONFIG_STATUS=./config.status}
-ac_clean_files_save=$ac_clean_files
-ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:$LINENO: creating $CONFIG_STATUS" >&5
-echo "$as_me: creating $CONFIG_STATUS" >&6;}
-cat >$CONFIG_STATUS <<_ACEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate the current configuration.
-# Compiler output produced by configure, useful for debugging
-# configure, is in config.log if it exists.
-
-debug=false
-ac_cs_recheck=false
-ac_cs_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-## --------------------- ##
-## M4sh Initialization.  ##
-## --------------------- ##
-
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-  emulate sh
-  NULLCMD=:
-  # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
-  # is contrary to our usage.  Disable this feature.
-  alias -g '${1+"$@"}'='"$@"'
-elif test -n "${BASH_VERSION+set}" && (set -o posix) >/dev/null 2>&1; then
-  set -o posix
-fi
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# Support unset when possible.
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
-  as_unset=unset
-else
-  as_unset=false
-fi
-
-
-# Work around bugs in pre-3.0 UWIN ksh.
-$as_unset ENV MAIL MAILPATH
-PS1='$ '
-PS2='> '
-PS4='+ '
-
-# NLS nuisances.
-for as_var in \
-  LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION \
-  LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER \
-  LC_TELEPHONE LC_TIME
-do
-  if (set +x; test -z "`(eval $as_var=C; export $as_var) 2>&1`"); then
-    eval $as_var=C; export $as_var
-  else
-    $as_unset $as_var
-  fi
-done
-
-# Required to use basename.
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-if (basename /) >/dev/null 2>&1 && test "X`basename / 2>&1`" = "X/"; then
-  as_basename=basename
-else
-  as_basename=false
-fi
-
-
-# Name of the executable.
-as_me=`$as_basename "$0" ||
-$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
-	 X"$0" : 'X\(//\)$' \| \
-	 X"$0" : 'X\(/\)$' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X/"$0" |
-    sed '/^.*\/\([^/][^/]*\)\/*$/{ s//\1/; q; }
-  	  /^X\/\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\/\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-
-
-# PATH needs CR, and LINENO needs CR and PATH.
-# Avoid depending upon Character Ranges.
-as_cr_letters='abcdefghijklmnopqrstuvwxyz'
-as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
-as_cr_Letters=$as_cr_letters$as_cr_LETTERS
-as_cr_digits='0123456789'
-as_cr_alnum=$as_cr_Letters$as_cr_digits
-
-# The user is always right.
-if test "${PATH_SEPARATOR+set}" != set; then
-  echo "#! /bin/sh" >conf$$.sh
-  echo  "exit 0"   >>conf$$.sh
-  chmod +x conf$$.sh
-  if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then
-    PATH_SEPARATOR=';'
-  else
-    PATH_SEPARATOR=:
-  fi
-  rm -f conf$$.sh
-fi
-
-
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2"  || {
-  # Find who we are.  Look in the path if we contain no path at all
-  # relative or not.
-  case $0 in
-    *[\\/]* ) as_myself=$0 ;;
-    *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
-done
-
-       ;;
-  esac
-  # We did not find ourselves, most probably we were run as `sh COMMAND'
-  # in which case we are not to be found in the path.
-  if test "x$as_myself" = x; then
-    as_myself=$0
-  fi
-  if test ! -f "$as_myself"; then
-    { { echo "$as_me:$LINENO: error: cannot find myself; rerun with an absolute path" >&5
-echo "$as_me: error: cannot find myself; rerun with an absolute path" >&2;}
-   { (exit 1); exit 1; }; }
-  fi
-  case $CONFIG_SHELL in
-  '')
-    as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-  for as_base in sh bash ksh sh5; do
-	 case $as_dir in
-	 /*)
-	   if ("$as_dir/$as_base" -c '
-  as_lineno_1=$LINENO
-  as_lineno_2=$LINENO
-  as_lineno_3=`(expr $as_lineno_1 + 1) 2>/dev/null`
-  test "x$as_lineno_1" != "x$as_lineno_2" &&
-  test "x$as_lineno_3"  = "x$as_lineno_2" ') 2>/dev/null; then
-	     $as_unset BASH_ENV || test "${BASH_ENV+set}" != set || { BASH_ENV=; export BASH_ENV; }
-	     $as_unset ENV || test "${ENV+set}" != set || { ENV=; export ENV; }
-	     CONFIG_SHELL=$as_dir/$as_base
-	     export CONFIG_SHELL
-	     exec "$CONFIG_SHELL" "$0" ${1+"$@"}
-	   fi;;
-	 esac
-       done
-done
-;;
-  esac
-
-  # Create $as_me.lineno as a copy of $as_myself, but with $LINENO
-  # uniformly replaced by the line number.  The first 'sed' inserts a
-  # line-number line before each line; the second 'sed' does the real
-  # work.  The second script uses 'N' to pair each line-number line
-  # with the numbered line, and appends trailing '-' during
-  # substitution so that $LINENO is not a special case at line end.
-  # (Raja R Harinath suggested sed '=', and Paul Eggert wrote the
-  # second 'sed' script.  Blame Lee E. McMahon for sed's syntax.  :-)
-  sed '=' <$as_myself |
-    sed '
-      N
-      s,$,-,
-      : loop
-      s,^\(['$as_cr_digits']*\)\(.*\)[$]LINENO\([^'$as_cr_alnum'_]\),\1\2\1\3,
-      t loop
-      s,-$,,
-      s,^['$as_cr_digits']*\n,,
-    ' >$as_me.lineno &&
-  chmod +x $as_me.lineno ||
-    { { echo "$as_me:$LINENO: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&5
-echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2;}
-   { (exit 1); exit 1; }; }
-
-  # Don't try to exec as it changes $[0], causing all sort of problems
-  # (the dirname of $[0] is not the place where we might find the
-  # original and so on.  Autoconf is especially sensible to this).
-  . ./$as_me.lineno
-  # Exit status is that of the last command.
-  exit
-}
-
-
-case `echo "testing\c"; echo 1,2,3`,`echo -n testing; echo 1,2,3` in
-  *c*,-n*) ECHO_N= ECHO_C='
-' ECHO_T='	' ;;
-  *c*,*  ) ECHO_N=-n ECHO_C= ECHO_T= ;;
-  *)       ECHO_N= ECHO_C='\c' ECHO_T= ;;
-esac
-
-if expr a : '\(a\)' >/dev/null 2>&1; then
-  as_expr=expr
-else
-  as_expr=false
-fi
-
-rm -f conf$$ conf$$.exe conf$$.file
-echo >conf$$.file
-if ln -s conf$$.file conf$$ 2>/dev/null; then
-  # We could just check for DJGPP; but this test a) works b) is more generic
-  # and c) will remain valid once DJGPP supports symlinks (DJGPP 2.04).
-  if test -f conf$$.exe; then
-    # Don't use ln at all; we don't have any links
-    as_ln_s='cp -p'
-  else
-    as_ln_s='ln -s'
-  fi
-elif ln conf$$.file conf$$ 2>/dev/null; then
-  as_ln_s=ln
-else
-  as_ln_s='cp -p'
-fi
-rm -f conf$$ conf$$.exe conf$$.file
-
-if mkdir -p . 2>/dev/null; then
-  as_mkdir_p=:
-else
-  test -d ./-p && rmdir ./-p
-  as_mkdir_p=false
-fi
-
-as_executable_p="test -f"
-
-# Sed expression to map a string onto a valid CPP name.
-as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-
-# Sed expression to map a string onto a valid variable name.
-as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
-
-
-# IFS
-# We need space, tab and new line, in precisely that order.
-as_nl='
-'
-IFS=" 	$as_nl"
-
-# CDPATH.
-$as_unset CDPATH
-
-exec 6>&1
-
-# Open the log real soon, to keep \$[0] and so on meaningful, and to
-# report actual input values of CONFIG_FILES etc. instead of their
-# values after options handling.  Logging --version etc. is OK.
-exec 5>>config.log
-{
-  echo
-  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
-## Running $as_me. ##
-_ASBOX
-} >&5
-cat >&5 <<_CSEOF
-
-This file was extended by ghosd $as_me 0.0.1, which was
-generated by GNU Autoconf 2.59.  Invocation command line was
-
-  CONFIG_FILES    = $CONFIG_FILES
-  CONFIG_HEADERS  = $CONFIG_HEADERS
-  CONFIG_LINKS    = $CONFIG_LINKS
-  CONFIG_COMMANDS = $CONFIG_COMMANDS
-  $ $0 $@
-
-_CSEOF
-echo "on `(hostname || uname -n) 2>/dev/null | sed 1q`" >&5
-echo >&5
-_ACEOF
-
-# Files that config.status was made for.
-if test -n "$ac_config_files"; then
-  echo "config_files=\"$ac_config_files\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_headers"; then
-  echo "config_headers=\"$ac_config_headers\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_links"; then
-  echo "config_links=\"$ac_config_links\"" >>$CONFIG_STATUS
-fi
-
-if test -n "$ac_config_commands"; then
-  echo "config_commands=\"$ac_config_commands\"" >>$CONFIG_STATUS
-fi
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-ac_cs_usage="\
-\`$as_me' instantiates files from templates according to the
-current configuration.
-
-Usage: $0 [OPTIONS] [FILE]...
-
-  -h, --help       print this help, then exit
-  -V, --version    print version number, then exit
-  -q, --quiet      do not print progress messages
-  -d, --debug      don't remove temporary files
-      --recheck    update $as_me by reconfiguring in the same conditions
-  --file=FILE[:TEMPLATE]
-		   instantiate the configuration file FILE
-  --header=FILE[:TEMPLATE]
-		   instantiate the configuration header FILE
-
-Configuration files:
-$config_files
-
-Configuration headers:
-$config_headers
-
-Configuration commands:
-$config_commands
-
-Report bugs to <bug-autoconf@gnu.org>."
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-ac_cs_version="\\
-ghosd config.status 0.0.1
-configured by $0, generated by GNU Autoconf 2.59,
-  with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
-
-Copyright (C) 2003 Free Software Foundation, Inc.
-This config.status script is free software; the Free Software Foundation
-gives unlimited permission to copy, distribute and modify it."
-srcdir=$srcdir
-INSTALL="$INSTALL"
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-# If no file are specified by the user, then we need to provide default
-# value.  By we need to know if files were specified by the user.
-ac_need_defaults=:
-while test $# != 0
-do
-  case $1 in
-  --*=*)
-    ac_option=`expr "x$1" : 'x\([^=]*\)='`
-    ac_optarg=`expr "x$1" : 'x[^=]*=\(.*\)'`
-    ac_shift=:
-    ;;
-  -*)
-    ac_option=$1
-    ac_optarg=$2
-    ac_shift=shift
-    ;;
-  *) # This is not an option, so the user has probably given explicit
-     # arguments.
-     ac_option=$1
-     ac_need_defaults=false;;
-  esac
-
-  case $ac_option in
-  # Handling of the options.
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
-    ac_cs_recheck=: ;;
-  --version | --vers* | -V )
-    echo "$ac_cs_version"; exit 0 ;;
-  --he | --h)
-    # Conflict between --help and --header
-    { { echo "$as_me:$LINENO: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: ambiguous option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; };;
-  --help | --hel | -h )
-    echo "$ac_cs_usage"; exit 0 ;;
-  --debug | --d* | -d )
-    debug=: ;;
-  --file | --fil | --fi | --f )
-    $ac_shift
-    CONFIG_FILES="$CONFIG_FILES $ac_optarg"
-    ac_need_defaults=false;;
-  --header | --heade | --head | --hea )
-    $ac_shift
-    CONFIG_HEADERS="$CONFIG_HEADERS $ac_optarg"
-    ac_need_defaults=false;;
-  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
-  | -silent | --silent | --silen | --sile | --sil | --si | --s)
-    ac_cs_silent=: ;;
-
-  # This is an error.
-  -*) { { echo "$as_me:$LINENO: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&5
-echo "$as_me: error: unrecognized option: $1
-Try \`$0 --help' for more information." >&2;}
-   { (exit 1); exit 1; }; } ;;
-
-  *) ac_config_targets="$ac_config_targets $1" ;;
-
-  esac
-  shift
-done
-
-ac_configure_extra_args=
-
-if $ac_cs_silent; then
-  exec 6>/dev/null
-  ac_configure_extra_args="$ac_configure_extra_args --silent"
-fi
-
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-if \$ac_cs_recheck; then
-  echo "running $SHELL $0 " $ac_configure_args \$ac_configure_extra_args " --no-create --no-recursion" >&6
-  exec $SHELL $0 $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
-fi
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-#
-# INIT-COMMANDS section.
-#
-
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
-
-_ACEOF
-
-
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_config_target in $ac_config_targets
-do
-  case "$ac_config_target" in
-  # Handling of arguments.
-  "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;;
-  "ghosd.pc" ) CONFIG_FILES="$CONFIG_FILES ghosd.pc" ;;
-  "ghosd/Makefile" ) CONFIG_FILES="$CONFIG_FILES ghosd/Makefile" ;;
-  "examples/Makefile" ) CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;
-  "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
-  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-  "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-  *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
-echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
-   { (exit 1); exit 1; }; };;
-  esac
-done
-
-# If the user did not use the arguments to specify the items to instantiate,
-# then the envvar interface is used.  Set only those that are not.
-# We use the long form for the default assignment because of an extremely
-# bizarre bug on SunOS 4.1.3.
-if $ac_need_defaults; then
-  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
-  test "${CONFIG_HEADERS+set}" = set || CONFIG_HEADERS=$config_headers
-  test "${CONFIG_COMMANDS+set}" = set || CONFIG_COMMANDS=$config_commands
-fi
-
-# Have a temporary directory for convenience.  Make it in the build tree
-# simply because there is no reason to put it here, and in addition,
-# creating and moving files from /tmp can sometimes cause problems.
-# Create a temporary directory, and hook for its removal unless debugging.
-$debug ||
-{
-  trap 'exit_status=$?; rm -rf $tmp && exit $exit_status' 0
-  trap '{ (exit 1); exit 1; }' 1 2 13 15
-}
-
-# Create a (secure) tmp directory for tmp files.
-
-{
-  tmp=`(umask 077 && mktemp -d -q "./confstatXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
-}  ||
-{
-  tmp=./confstat$$-$RANDOM
-  (umask 077 && mkdir $tmp)
-} ||
-{
-   echo "$me: cannot create a temporary directory in ." >&2
-   { (exit 1); exit 1; }
-}
-
-_ACEOF
-
-cat >>$CONFIG_STATUS <<_ACEOF
-
-#
-# CONFIG_FILES section.
-#
-
-# No need to generate the scripts if there are no CONFIG_FILES.
-# This happens for instance when ./config.status config.h
-if test -n "\$CONFIG_FILES"; then
-  # Protect against being on the right side of a sed subst in config.status.
-  sed 's/,@/@@/; s/@,/@@/; s/,;t t\$/@;t t/; /@;t t\$/s/[\\\\&,]/\\\\&/g;
-   s/@@/,@/; s/@@/@,/; s/@;t t\$/,;t t/' >\$tmp/subs.sed <<\\CEOF
-s,@SHELL@,$SHELL,;t t
-s,@PATH_SEPARATOR@,$PATH_SEPARATOR,;t t
-s,@PACKAGE_NAME@,$PACKAGE_NAME,;t t
-s,@PACKAGE_TARNAME@,$PACKAGE_TARNAME,;t t
-s,@PACKAGE_VERSION@,$PACKAGE_VERSION,;t t
-s,@PACKAGE_STRING@,$PACKAGE_STRING,;t t
-s,@PACKAGE_BUGREPORT@,$PACKAGE_BUGREPORT,;t t
-s,@exec_prefix@,$exec_prefix,;t t
-s,@prefix@,$prefix,;t t
-s,@program_transform_name@,$program_transform_name,;t t
-s,@bindir@,$bindir,;t t
-s,@sbindir@,$sbindir,;t t
-s,@libexecdir@,$libexecdir,;t t
-s,@datadir@,$datadir,;t t
-s,@sysconfdir@,$sysconfdir,;t t
-s,@sharedstatedir@,$sharedstatedir,;t t
-s,@localstatedir@,$localstatedir,;t t
-s,@libdir@,$libdir,;t t
-s,@includedir@,$includedir,;t t
-s,@oldincludedir@,$oldincludedir,;t t
-s,@infodir@,$infodir,;t t
-s,@mandir@,$mandir,;t t
-s,@build_alias@,$build_alias,;t t
-s,@host_alias@,$host_alias,;t t
-s,@target_alias@,$target_alias,;t t
-s,@DEFS@,$DEFS,;t t
-s,@ECHO_C@,$ECHO_C,;t t
-s,@ECHO_N@,$ECHO_N,;t t
-s,@ECHO_T@,$ECHO_T,;t t
-s,@LIBS@,$LIBS,;t t
-s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
-s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
-s,@INSTALL_DATA@,$INSTALL_DATA,;t t
-s,@CYGPATH_W@,$CYGPATH_W,;t t
-s,@PACKAGE@,$PACKAGE,;t t
-s,@VERSION@,$VERSION,;t t
-s,@ACLOCAL@,$ACLOCAL,;t t
-s,@AUTOCONF@,$AUTOCONF,;t t
-s,@AUTOMAKE@,$AUTOMAKE,;t t
-s,@AUTOHEADER@,$AUTOHEADER,;t t
-s,@MAKEINFO@,$MAKEINFO,;t t
-s,@install_sh@,$install_sh,;t t
-s,@STRIP@,$STRIP,;t t
-s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
-s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
-s,@mkdir_p@,$mkdir_p,;t t
-s,@AWK@,$AWK,;t t
-s,@SET_MAKE@,$SET_MAKE,;t t
-s,@am__leading_dot@,$am__leading_dot,;t t
-s,@AMTAR@,$AMTAR,;t t
-s,@am__tar@,$am__tar,;t t
-s,@am__untar@,$am__untar,;t t
-s,@VERSION_INFO@,$VERSION_INFO,;t t
-s,@MAINTAINER_MODE_TRUE@,$MAINTAINER_MODE_TRUE,;t t
-s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
-s,@MAINT@,$MAINT,;t t
-s,@CC@,$CC,;t t
-s,@CFLAGS@,$CFLAGS,;t t
-s,@LDFLAGS@,$LDFLAGS,;t t
-s,@CPPFLAGS@,$CPPFLAGS,;t t
-s,@ac_ct_CC@,$ac_ct_CC,;t t
-s,@EXEEXT@,$EXEEXT,;t t
-s,@OBJEXT@,$OBJEXT,;t t
-s,@DEPDIR@,$DEPDIR,;t t
-s,@am__include@,$am__include,;t t
-s,@am__quote@,$am__quote,;t t
-s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
-s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
-s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
-s,@CCDEPMODE@,$CCDEPMODE,;t t
-s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
-s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
-s,@build@,$build,;t t
-s,@build_cpu@,$build_cpu,;t t
-s,@build_vendor@,$build_vendor,;t t
-s,@build_os@,$build_os,;t t
-s,@host@,$host,;t t
-s,@host_cpu@,$host_cpu,;t t
-s,@host_vendor@,$host_vendor,;t t
-s,@host_os@,$host_os,;t t
-s,@EGREP@,$EGREP,;t t
-s,@LN_S@,$LN_S,;t t
-s,@ECHO@,$ECHO,;t t
-s,@AR@,$AR,;t t
-s,@ac_ct_AR@,$ac_ct_AR,;t t
-s,@RANLIB@,$RANLIB,;t t
-s,@ac_ct_RANLIB@,$ac_ct_RANLIB,;t t
-s,@CPP@,$CPP,;t t
-s,@CXX@,$CXX,;t t
-s,@CXXFLAGS@,$CXXFLAGS,;t t
-s,@ac_ct_CXX@,$ac_ct_CXX,;t t
-s,@CXXDEPMODE@,$CXXDEPMODE,;t t
-s,@am__fastdepCXX_TRUE@,$am__fastdepCXX_TRUE,;t t
-s,@am__fastdepCXX_FALSE@,$am__fastdepCXX_FALSE,;t t
-s,@CXXCPP@,$CXXCPP,;t t
-s,@F77@,$F77,;t t
-s,@FFLAGS@,$FFLAGS,;t t
-s,@ac_ct_F77@,$ac_ct_F77,;t t
-s,@LIBTOOL@,$LIBTOOL,;t t
-s,@PANGO_TRUE@,$PANGO_TRUE,;t t
-s,@PANGO_FALSE@,$PANGO_FALSE,;t t
-s,@PKG_CONFIG@,$PKG_CONFIG,;t t
-s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
-s,@GHOSD_CFLAGS@,$GHOSD_CFLAGS,;t t
-s,@GHOSD_LIBS@,$GHOSD_LIBS,;t t
-s,@GHOSD_PACKAGES@,$GHOSD_PACKAGES,;t t
-s,@GHOSD_EXAMPLE_CFLAGS@,$GHOSD_EXAMPLE_CFLAGS,;t t
-s,@GHOSD_EXAMPLE_LIBS@,$GHOSD_EXAMPLE_LIBS,;t t
-s,@HTML_DIR@,$HTML_DIR,;t t
-s,@ENABLE_GTK_DOC_TRUE@,$ENABLE_GTK_DOC_TRUE,;t t
-s,@ENABLE_GTK_DOC_FALSE@,$ENABLE_GTK_DOC_FALSE,;t t
-s,@GTK_DOC_USE_LIBTOOL_TRUE@,$GTK_DOC_USE_LIBTOOL_TRUE,;t t
-s,@GTK_DOC_USE_LIBTOOL_FALSE@,$GTK_DOC_USE_LIBTOOL_FALSE,;t t
-s,@LIBOBJS@,$LIBOBJS,;t t
-s,@LTLIBOBJS@,$LTLIBOBJS,;t t
-CEOF
-
-_ACEOF
-
-  cat >>$CONFIG_STATUS <<\_ACEOF
-  # Split the substitutions into bite-sized pieces for seds with
-  # small command number limits, like on Digital OSF/1 and HP-UX.
-  ac_max_sed_lines=48
-  ac_sed_frag=1 # Number of current file.
-  ac_beg=1 # First line for current file.
-  ac_end=$ac_max_sed_lines # Line after last line for current file.
-  ac_more_lines=:
-  ac_sed_cmds=
-  while $ac_more_lines; do
-    if test $ac_beg -gt 1; then
-      sed "1,${ac_beg}d; ${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    else
-      sed "${ac_end}q" $tmp/subs.sed >$tmp/subs.frag
-    fi
-    if test ! -s $tmp/subs.frag; then
-      ac_more_lines=false
-    else
-      # The purpose of the label and of the branching condition is to
-      # speed up the sed processing (if there are no `@' at all, there
-      # is no need to browse any of the substitutions).
-      # These are the two extra sed commands mentioned above.
-      (echo ':t
-  /@[a-zA-Z_][a-zA-Z_0-9]*@/!b' && cat $tmp/subs.frag) >$tmp/subs-$ac_sed_frag.sed
-      if test -z "$ac_sed_cmds"; then
-	ac_sed_cmds="sed -f $tmp/subs-$ac_sed_frag.sed"
-      else
-	ac_sed_cmds="$ac_sed_cmds | sed -f $tmp/subs-$ac_sed_frag.sed"
-      fi
-      ac_sed_frag=`expr $ac_sed_frag + 1`
-      ac_beg=$ac_end
-      ac_end=`expr $ac_end + $ac_max_sed_lines`
-    fi
-  done
-  if test -z "$ac_sed_cmds"; then
-    ac_sed_cmds=cat
-  fi
-fi # test -n "$CONFIG_FILES"
-
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-for ac_file in : $CONFIG_FILES; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  # Compute @srcdir@, @top_srcdir@, and @INSTALL@ for subdirectories.
-  ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-  case $INSTALL in
-  [\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
-  *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
-  esac
-
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    configure_input=
-  else
-    configure_input="$ac_file.  "
-  fi
-  configure_input=$configure_input"Generated from `echo $ac_file_in |
-				     sed 's,.*/,,'` by configure."
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
-_ACEOF
-cat >>$CONFIG_STATUS <<_ACEOF
-  sed "$ac_vpsub
-$extrasub
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-:t
-/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
-s,@configure_input@,$configure_input,;t t
-s,@srcdir@,$ac_srcdir,;t t
-s,@abs_srcdir@,$ac_abs_srcdir,;t t
-s,@top_srcdir@,$ac_top_srcdir,;t t
-s,@abs_top_srcdir@,$ac_abs_top_srcdir,;t t
-s,@builddir@,$ac_builddir,;t t
-s,@abs_builddir@,$ac_abs_builddir,;t t
-s,@top_builddir@,$ac_top_builddir,;t t
-s,@abs_top_builddir@,$ac_abs_top_builddir,;t t
-s,@INSTALL@,$ac_INSTALL,;t t
-" $ac_file_inputs | (eval "$ac_sed_cmds") >$tmp/out
-  rm -f $tmp/stdin
-  if test x"$ac_file" != x-; then
-    mv $tmp/out $ac_file
-  else
-    cat $tmp/out
-    rm -f $tmp/out
-  fi
-
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_HEADER section.
-#
-
-# These sed commands are passed to sed as "A NAME B NAME C VALUE D", where
-# NAME is the cpp macro being defined and VALUE is the value it is being given.
-#
-# ac_d sets the value in "#define NAME VALUE" lines.
-ac_dA='s,^\([	 ]*\)#\([	 ]*define[	 ][	 ]*\)'
-ac_dB='[	 ].*$,\1#\2'
-ac_dC=' '
-ac_dD=',;t'
-# ac_u turns "#undef NAME" without trailing blanks into "#define NAME VALUE".
-ac_uA='s,^\([	 ]*\)#\([	 ]*\)undef\([	 ][	 ]*\)'
-ac_uB='$,\1#\2define\3'
-ac_uC=' '
-ac_uD=',;t'
-
-for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
-  # Support "outfile[:infile[:infile...]]", defaulting infile="outfile.in".
-  case $ac_file in
-  - | *:- | *:-:* ) # input from stdin
-	cat >$tmp/stdin
-	ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  *:* ) ac_file_in=`echo "$ac_file" | sed 's,[^:]*:,,'`
-	ac_file=`echo "$ac_file" | sed 's,:.*,,'` ;;
-  * )   ac_file_in=$ac_file.in ;;
-  esac
-
-  test x"$ac_file" != x- && { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-
-  # First look for the input files in the build tree, otherwise in the
-  # src tree.
-  ac_file_inputs=`IFS=:
-    for f in $ac_file_in; do
-      case $f in
-      -) echo $tmp/stdin ;;
-      [\\/$]*)
-	 # Absolute (can't be DOS-style, as IFS=:)
-	 test -f "$f" || { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 # Do quote $f, to prevent DOS paths from being IFS'd.
-	 echo "$f";;
-      *) # Relative
-	 if test -f "$f"; then
-	   # Build tree
-	   echo "$f"
-	 elif test -f "$srcdir/$f"; then
-	   # Source tree
-	   echo "$srcdir/$f"
-	 else
-	   # /dev/null tree
-	   { { echo "$as_me:$LINENO: error: cannot find input file: $f" >&5
-echo "$as_me: error: cannot find input file: $f" >&2;}
-   { (exit 1); exit 1; }; }
-	 fi;;
-      esac
-    done` || { (exit 1); exit 1; }
-  # Remove the trailing spaces.
-  sed 's/[	 ]*$//' $ac_file_inputs >$tmp/in
-
-_ACEOF
-
-# Transform confdefs.h into two sed scripts, `conftest.defines' and
-# `conftest.undefs', that substitutes the proper values into
-# config.h.in to produce config.h.  The first handles `#define'
-# templates, and the second `#undef' templates.
-# And first: Protect against being on the right side of a sed subst in
-# config.status.  Protect against being in an unquoted here document
-# in config.status.
-rm -f conftest.defines conftest.undefs
-# Using a here document instead of a string reduces the quoting nightmare.
-# Putting comments in sed scripts is not portable.
-#
-# `end' is used to avoid that the second main sed command (meant for
-# 0-ary CPP macros) applies to n-ary macro definitions.
-# See the Autoconf documentation for `clear'.
-cat >confdef2sed.sed <<\_ACEOF
-s/[\\&,]/\\&/g
-s,[\\$`],\\&,g
-t clear
-: clear
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 (][^	 (]*\)\(([^)]*)\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1\2${ac_dC}\3${ac_dD},gp
-t end
-s,^[	 ]*#[	 ]*define[	 ][	 ]*\([^	 ][^	 ]*\)[	 ]*\(.*\)$,${ac_dA}\1${ac_dB}\1${ac_dC}\2${ac_dD},gp
-: end
-_ACEOF
-# If some macros were called several times there might be several times
-# the same #defines, which is useless.  Nevertheless, we may not want to
-# sort them, since we want the *last* AC-DEFINE to be honored.
-uniq confdefs.h | sed -n -f confdef2sed.sed >conftest.defines
-sed 's/ac_d/ac_u/g' conftest.defines >conftest.undefs
-rm -f confdef2sed.sed
-
-# This sed command replaces #undef with comments.  This is necessary, for
-# example, in the case of _POSIX_SOURCE, which is predefined and required
-# on some systems where configure will not decide to define it.
-cat >>conftest.undefs <<\_ACEOF
-s,^[	 ]*#[	 ]*undef[	 ][	 ]*[a-zA-Z_][a-zA-Z_0-9]*,/* & */,
-_ACEOF
-
-# Break up conftest.defines because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo '  # Handle all the #define templates only if necessary.' >>$CONFIG_STATUS
-echo '  if grep "^[	 ]*#[	 ]*define" $tmp/in >/dev/null; then' >>$CONFIG_STATUS
-echo '  # If there are no defines, we may have an empty if/fi' >>$CONFIG_STATUS
-echo '  :' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.defines >/dev/null
-do
-  # Write a limited-size here document to $tmp/defines.sed.
-  echo '  cat >$tmp/defines.sed <<CEOF' >>$CONFIG_STATUS
-  # Speed up: don't consider the non `#define' lines.
-  echo '/^[	 ]*#[	 ]*define/!b' >>$CONFIG_STATUS
-  # Work around the forget-to-reset-the-flag bug.
-  echo 't clr' >>$CONFIG_STATUS
-  echo ': clr' >>$CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.defines >>$CONFIG_STATUS
-  echo 'CEOF
-  sed -f $tmp/defines.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.defines >conftest.tail
-  rm -f conftest.defines
-  mv conftest.tail conftest.defines
-done
-rm -f conftest.defines
-echo '  fi # grep' >>$CONFIG_STATUS
-echo >>$CONFIG_STATUS
-
-# Break up conftest.undefs because some shells have a limit on the size
-# of here documents, and old seds have small limits too (100 cmds).
-echo '  # Handle all the #undef templates' >>$CONFIG_STATUS
-rm -f conftest.tail
-while grep . conftest.undefs >/dev/null
-do
-  # Write a limited-size here document to $tmp/undefs.sed.
-  echo '  cat >$tmp/undefs.sed <<CEOF' >>$CONFIG_STATUS
-  # Speed up: don't consider the non `#undef'
-  echo '/^[	 ]*#[	 ]*undef/!b' >>$CONFIG_STATUS
-  # Work around the forget-to-reset-the-flag bug.
-  echo 't clr' >>$CONFIG_STATUS
-  echo ': clr' >>$CONFIG_STATUS
-  sed ${ac_max_here_lines}q conftest.undefs >>$CONFIG_STATUS
-  echo 'CEOF
-  sed -f $tmp/undefs.sed $tmp/in >$tmp/out
-  rm -f $tmp/in
-  mv $tmp/out $tmp/in
-' >>$CONFIG_STATUS
-  sed 1,${ac_max_here_lines}d conftest.undefs >conftest.tail
-  rm -f conftest.undefs
-  mv conftest.tail conftest.undefs
-done
-rm -f conftest.undefs
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-  # Let's still pretend it is `configure' which instantiates (i.e., don't
-  # use $as_me), people would be surprised to read:
-  #    /* config.h.  Generated by config.status.  */
-  if test x"$ac_file" = x-; then
-    echo "/* Generated by configure.  */" >$tmp/config.h
-  else
-    echo "/* $ac_file.  Generated by configure.  */" >$tmp/config.h
-  fi
-  cat $tmp/in >>$tmp/config.h
-  rm -f $tmp/in
-  if test x"$ac_file" != x-; then
-    if diff $ac_file $tmp/config.h >/dev/null 2>&1; then
-      { echo "$as_me:$LINENO: $ac_file is unchanged" >&5
-echo "$as_me: $ac_file is unchanged" >&6;}
-    else
-      ac_dir=`(dirname "$ac_file") 2>/dev/null ||
-$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_file" : 'X\(//\)[^/]' \| \
-	 X"$ac_file" : 'X\(//\)$' \| \
-	 X"$ac_file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-      { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-      rm -f $ac_file
-      mv $tmp/config.h $ac_file
-    fi
-  else
-    cat $tmp/config.h
-    rm -f $tmp/config.h
-  fi
-# Compute $ac_file's index in $config_headers.
-_am_stamp_count=1
-for _am_header in $config_headers :; do
-  case $_am_header in
-    $ac_file | $ac_file:* )
-      break ;;
-    * )
-      _am_stamp_count=`expr $_am_stamp_count + 1` ;;
-  esac
-done
-echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X$ac_file : 'X\(//\)[^/]' \| \
-	 X$ac_file : 'X\(//\)$' \| \
-	 X$ac_file : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X$ac_file |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`/stamp-h$_am_stamp_count
-done
-_ACEOF
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-#
-# CONFIG_COMMANDS section.
-#
-for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
-  ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
-  ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
-  ac_dir=`(dirname "$ac_dest") 2>/dev/null ||
-$as_expr X"$ac_dest" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$ac_dest" : 'X\(//\)[^/]' \| \
-	 X"$ac_dest" : 'X\(//\)$' \| \
-	 X"$ac_dest" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$ac_dest" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  { if $as_mkdir_p; then
-    mkdir -p "$ac_dir"
-  else
-    as_dir="$ac_dir"
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory \"$ac_dir\"" >&5
-echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-  ac_builddir=.
-
-if test "$ac_dir" != .; then
-  ac_dir_suffix=/`echo "$ac_dir" | sed 's,^\.[\\/],,'`
-  # A "../" for each directory in $ac_dir_suffix.
-  ac_top_builddir=`echo "$ac_dir_suffix" | sed 's,/[^\\/]*,../,g'`
-else
-  ac_dir_suffix= ac_top_builddir=
-fi
-
-case $srcdir in
-  .)  # No --srcdir option.  We are building in place.
-    ac_srcdir=.
-    if test -z "$ac_top_builddir"; then
-       ac_top_srcdir=.
-    else
-       ac_top_srcdir=`echo $ac_top_builddir | sed 's,/$,,'`
-    fi ;;
-  [\\/]* | ?:[\\/]* )  # Absolute path.
-    ac_srcdir=$srcdir$ac_dir_suffix;
-    ac_top_srcdir=$srcdir ;;
-  *) # Relative path.
-    ac_srcdir=$ac_top_builddir$srcdir$ac_dir_suffix
-    ac_top_srcdir=$ac_top_builddir$srcdir ;;
-esac
-
-# Do not use `cd foo && pwd` to compute absolute paths, because
-# the directories may not exist.
-case `pwd` in
-.) ac_abs_builddir="$ac_dir";;
-*)
-  case "$ac_dir" in
-  .) ac_abs_builddir=`pwd`;;
-  [\\/]* | ?:[\\/]* ) ac_abs_builddir="$ac_dir";;
-  *) ac_abs_builddir=`pwd`/"$ac_dir";;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_builddir=${ac_top_builddir}.;;
-*)
-  case ${ac_top_builddir}. in
-  .) ac_abs_top_builddir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_builddir=${ac_top_builddir}.;;
-  *) ac_abs_top_builddir=$ac_abs_builddir/${ac_top_builddir}.;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_srcdir=$ac_srcdir;;
-*)
-  case $ac_srcdir in
-  .) ac_abs_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_srcdir=$ac_srcdir;;
-  *) ac_abs_srcdir=$ac_abs_builddir/$ac_srcdir;;
-  esac;;
-esac
-case $ac_abs_builddir in
-.) ac_abs_top_srcdir=$ac_top_srcdir;;
-*)
-  case $ac_top_srcdir in
-  .) ac_abs_top_srcdir=$ac_abs_builddir;;
-  [\\/]* | ?:[\\/]* ) ac_abs_top_srcdir=$ac_top_srcdir;;
-  *) ac_abs_top_srcdir=$ac_abs_builddir/$ac_top_srcdir;;
-  esac;;
-esac
-
-
-  { echo "$as_me:$LINENO: executing $ac_dest commands" >&5
-echo "$as_me: executing $ac_dest commands" >&6;}
-  case $ac_dest in
-    depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
-  # Strip MF so we end up with the name of the file.
-  mf=`echo "$mf" | sed -e 's/:.*$//'`
-  # Check whether this is an Automake generated Makefile or not.
-  # We used to match only the files named `Makefile.in', but
-  # some people rename them; so instead we look at the file content.
-  # Grep'ing the first line is not enough: some people post-process
-  # each Makefile.in and add a new line on top of each file to say so.
-  # So let's grep whole file.
-  if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
-    dirpart=`(dirname "$mf") 2>/dev/null ||
-$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$mf" : 'X\(//\)[^/]' \| \
-	 X"$mf" : 'X\(//\)$' \| \
-	 X"$mf" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$mf" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-  else
-    continue
-  fi
-  # Extract the definition of DEPDIR, am__include, and am__quote
-  # from the Makefile without running `make'.
-  DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"`
-  test -z "$DEPDIR" && continue
-  am__include=`sed -n 's/^am__include = //p' < "$mf"`
-  test -z "am__include" && continue
-  am__quote=`sed -n 's/^am__quote = //p' < "$mf"`
-  # When using ansi2knr, U may be empty or an underscore; expand it
-  U=`sed -n 's/^U = //p' < "$mf"`
-  # Find all dependency output files, they are included files with
-  # $(DEPDIR) in their names.  We invoke sed twice because it is the
-  # simplest approach to changing $(DEPDIR) to its actual value in the
-  # expansion.
-  for file in `sed -n "
-    s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \
-       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
-    # Make sure the directory exists.
-    test -f "$dirpart/$file" && continue
-    fdir=`(dirname "$file") 2>/dev/null ||
-$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$file" : 'X\(//\)[^/]' \| \
-	 X"$file" : 'X\(//\)$' \| \
-	 X"$file" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$file" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    { if $as_mkdir_p; then
-    mkdir -p $dirpart/$fdir
-  else
-    as_dir=$dirpart/$fdir
-    as_dirs=
-    while test ! -d "$as_dir"; do
-      as_dirs="$as_dir $as_dirs"
-      as_dir=`(dirname "$as_dir") 2>/dev/null ||
-$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-	 X"$as_dir" : 'X\(//\)[^/]' \| \
-	 X"$as_dir" : 'X\(//\)$' \| \
-	 X"$as_dir" : 'X\(/\)' \| \
-	 .     : '\(.\)' 2>/dev/null ||
-echo X"$as_dir" |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`
-    done
-    test ! -n "$as_dirs" || mkdir $as_dirs
-  fi || { { echo "$as_me:$LINENO: error: cannot create directory $dirpart/$fdir" >&5
-echo "$as_me: error: cannot create directory $dirpart/$fdir" >&2;}
-   { (exit 1); exit 1; }; }; }
-
-    # echo "creating $dirpart/$file"
-    echo '# dummy' > "$dirpart/$file"
-  done
-done
- ;;
-  esac
-done
-_ACEOF
-
-cat >>$CONFIG_STATUS <<\_ACEOF
-
-{ (exit 0); exit 0; }
-_ACEOF
-chmod +x $CONFIG_STATUS
-ac_clean_files=$ac_clean_files_save
-
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-
-
-# vim: set ts=2 sw=2 et cino=(0 :
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/configure.ac b/abs/mv-core/ghosd/ghosd-0.0.1/configure.ac
deleted file mode 100644
index a73e1ef..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/configure.ac
+++ /dev/null
@@ -1,60 +0,0 @@
-AC_PREREQ(2.54)
-
-AC_INIT(ghosd, 0.0.1, [martine@danga.com])
-AC_CONFIG_SRCDIR(ghosd/ghosd.c)
-AC_CONFIG_HEADERS(config.h)
-AM_INIT_AUTOMAKE([1.7])
-
-# libtool versioning information.
-# we're gonna break this API regularly until the first release, though.
-LT_CURRENT=0
-LT_REVISION=0
-LT_AGE=0
-
-VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
-AC_SUBST(VERSION_INFO)
-
-AM_MAINTAINER_MODE
-
-AC_PROG_CC
-AC_PROG_LIBTOOL
-
-WARN_CFLAGS=""
-if test "x$GCC" = "xyes"; then
-	WARN_CFLAGS="-Wall -Wpointer-arith -Wstrict-prototypes \
-               -Wmissing-prototypes -Wmissing-declarations \
-               -Wnested-externs -fno-strict-aliasing"
-fi
-
-CFLAGS="$CFLAGS $WARN_CFLAGS"
-
-GHOSD_PACKAGES="cairo"
-AC_ARG_ENABLE(pango,
-              [AC_HELP_STRING(--enable-pango, [use pango (default on)])],
-              , [enable_pango=yes])
-if test "$enable_pango" = "yes"; then
-  GHOSD_PACKAGES="$GHOSD_PACKAGES pangocairo"
-  AC_DEFINE([HAVE_PANGO], [], [we have pangocairo])
-fi
-AM_CONDITIONAL([PANGO], test "$enable_pango" = "yes")
-
-PKG_CHECK_MODULES([GHOSD], $GHOSD_PACKAGES)
-AC_SUBST(GHOSD_PACKAGES)
-AC_SUBST(GHOSD_CFLAGS)
-AC_SUBST(GHOSD_LIBS)
-
-PKG_CHECK_MODULES([GHOSD_EXAMPLE], $GHOSD_PACKAGES glib-2.0 >= 2.6)
-AC_SUBST(GHOSD_EXAMPLE_CFLAGS)
-AC_SUBST(GHOSD_EXAMPLE_LIBS)
-
-GTK_DOC_CHECK(1.3)
-
-AC_OUTPUT([
-Makefile
-ghosd.pc
-ghosd/Makefile
-examples/Makefile
-doc/Makefile
-])
-
-# vim: set ts=2 sw=2 et cino=(0 :
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/depcomp b/abs/mv-core/ghosd/ghosd-0.0.1/depcomp
deleted file mode 100755
index ffcd540..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/depcomp
+++ /dev/null
@@ -1,529 +0,0 @@
-#! /bin/sh
-# depcomp - compile a program generating dependencies as side-effects
-
-scriptversion=2005-02-09.22
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# Originally written by Alexandre Oliva <oliva@dcc.unicamp.br>.
-
-case $1 in
-  '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
-     exit 1;
-     ;;
-  -h | --h*)
-    cat <<\EOF
-Usage: depcomp [--help] [--version] PROGRAM [ARGS]
-
-Run PROGRAMS ARGS to compile a file, generating dependencies
-as side-effects.
-
-Environment variables:
-  depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
-  DEPDIR      directory where to store dependencies.
-  depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
-  libtool     Whether libtool is used (yes/no).
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
-    exit $?
-    ;;
-  -v | --v*)
-    echo "depcomp $scriptversion"
-    exit $?
-    ;;
-esac
-
-if test -z "$depmode" || test -z "$source" || test -z "$object"; then
-  echo "depcomp: Variables source, object and depmode must be set" 1>&2
-  exit 1
-fi
-
-# Dependencies for sub/bar.o or sub/bar.obj go into sub/.deps/bar.Po.
-depfile=${depfile-`echo "$object" |
-  sed 's|[^\\/]*$|'${DEPDIR-.deps}'/&|;s|\.\([^.]*\)$|.P\1|;s|Pobj$|Po|'`}
-tmpdepfile=${tmpdepfile-`echo "$depfile" | sed 's/\.\([^.]*\)$/.T\1/'`}
-
-rm -f "$tmpdepfile"
-
-# Some modes work just like other modes, but use different flags.  We
-# parameterize here, but still list the modes in the big case below,
-# to make depend.m4 easier to write.  Note that we *cannot* use a case
-# here, because this file can only contain one case statement.
-if test "$depmode" = hp; then
-  # HP compiler uses -M and no extra arg.
-  gccflag=-M
-  depmode=gcc
-fi
-
-if test "$depmode" = dashXmstdout; then
-   # This is just like dashmstdout with a different argument.
-   dashmflag=-xM
-   depmode=dashmstdout
-fi
-
-case "$depmode" in
-gcc3)
-## gcc 3 implements dependency tracking that does exactly what
-## we want.  Yay!  Note: for some reason libtool 1.4 doesn't like
-## it if -MD -MP comes after the -MF stuff.  Hmm.
-  "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  mv "$tmpdepfile" "$depfile"
-  ;;
-
-gcc)
-## There are various ways to get dependency output from gcc.  Here's
-## why we pick this rather obscure method:
-## - Don't want to use -MD because we'd like the dependencies to end
-##   up in a subdir.  Having to rename by hand is ugly.
-##   (We might end up doing this anyway to support other compilers.)
-## - The DEPENDENCIES_OUTPUT environment variable makes gcc act like
-##   -MM, not -M (despite what the docs say).
-## - Using -M directly means running the compiler twice (even worse
-##   than renaming).
-  if test -z "$gccflag"; then
-    gccflag=-MD,
-  fi
-  "$@" -Wp,"$gccflag$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  alpha=ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz
-## The second -e expression handles DOS-style file names with drive letters.
-  sed -e 's/^[^:]*: / /' \
-      -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
-## The problem is that when a header file which appears in a .P file
-## is deleted, the dependency causes make to die (because there is
-## typically no way to rebuild the header).  We avoid this by adding
-## dummy dependencies for each header file.  Too bad gcc doesn't do
-## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
-## that the space means something, we add a space to the output as
-## well.
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-hp)
-  # This case exists only to let depend.m4 do its work.  It works by
-  # looking at the text of this script.  This case will never be run,
-  # since it is checked for above.
-  exit 1
-  ;;
-
-sgi)
-  if test "$libtool" = yes; then
-    "$@" "-Wp,-MDupdate,$tmpdepfile"
-  else
-    "$@" -MDupdate "$tmpdepfile"
-  fi
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-
-  if test -f "$tmpdepfile"; then  # yes, the sourcefile depend on other files
-    echo "$object : \\" > "$depfile"
-
-    # Clip off the initial element (the dependent).  Don't try to be
-    # clever and replace this with sed code, as IRIX sed won't handle
-    # lines with more than a fixed number of characters (4096 in
-    # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
-    # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
-    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> $depfile
-    echo >> $depfile
-
-    # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
-   | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
-   >> $depfile
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-aix)
-  # The C for AIX Compiler uses -M and outputs the dependencies
-  # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
-  # start of each line; $object doesn't have directory information.
-  # Version 6 uses the directory in both cases.
-  stripped=`echo "$object" | sed 's/\(.*\)\..*$/\1/'`
-  tmpdepfile="$stripped.u"
-  if test "$libtool" = yes; then
-    "$@" -Wc,-M
-  else
-    "$@" -M
-  fi
-  stat=$?
-
-  if test -f "$tmpdepfile"; then :
-  else
-    stripped=`echo "$stripped" | sed 's,^.*/,,'`
-    tmpdepfile="$stripped.u"
-  fi
-
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-
-  if test -f "$tmpdepfile"; then
-    outname="$stripped.o"
-    # Each line is of the form `foo.o: dependent.h'.
-    # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
-    sed -e "s,^$outname:,$object :," < "$tmpdepfile" > "$depfile"
-    sed -e "s,^$outname: \(.*\)$,\1:," < "$tmpdepfile" >> "$depfile"
-  else
-    # The sourcefile does not contain any dependencies, so just
-    # store a dummy comment line, to avoid errors with the Makefile
-    # "include basename.Plo" scheme.
-    echo "#dummy" > "$depfile"
-  fi
-  rm -f "$tmpdepfile"
-  ;;
-
-icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
-  # ICC 7.0 will fill foo.d with something like
-  #    foo.o: sub/foo.c
-  #    foo.o: sub/foo.h
-  # which is wrong.  We want:
-  #    sub/foo.o: sub/foo.c
-  #    sub/foo.o: sub/foo.h
-  #    sub/foo.c:
-  #    sub/foo.h:
-  # ICC 7.1 will output
-  #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
-  #    foo.o: sub/foo.c ... \
-  #     sub/foo.h ... \
-  #     ...
-
-  "$@" -MD -MF "$tmpdepfile"
-  stat=$?
-  if test $stat -eq 0; then :
-  else
-    rm -f "$tmpdepfile"
-    exit $stat
-  fi
-  rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
-  # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-tru64)
-   # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
-   # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
-   # Subdirectories are respected.
-   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
-   test "x$dir" = "x$object" && dir=
-   base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
-
-   if test "$libtool" = yes; then
-      # With Tru64 cc, shared objects can also be used to make a
-      # static library.  This mecanism is used in libtool 1.4 series to
-      # handle both shared and static libraries in a single compilation.
-      # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
-      #
-      # With libtool 1.5 this exception was removed, and libtool now
-      # generates 2 separate objects for the 2 libraries.  These two
-      # compilations output dependencies in in $dir.libs/$base.o.d and
-      # in $dir$base.o.d.  We have to check for both files, because
-      # one of the two compilations can be disabled.  We should prefer
-      # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
-      # automatically cleaned when .libs/ is deleted, while ignoring
-      # the former would cause a distcleancheck panic.
-      tmpdepfile1=$dir.libs/$base.lo.d   # libtool 1.4
-      tmpdepfile2=$dir$base.o.d          # libtool 1.5
-      tmpdepfile3=$dir.libs/$base.o.d    # libtool 1.5
-      tmpdepfile4=$dir.libs/$base.d      # Compaq CCC V6.2-504
-      "$@" -Wc,-MD
-   else
-      tmpdepfile1=$dir$base.o.d
-      tmpdepfile2=$dir$base.d
-      tmpdepfile3=$dir$base.d
-      tmpdepfile4=$dir$base.d
-      "$@" -MD
-   fi
-
-   stat=$?
-   if test $stat -eq 0; then :
-   else
-      rm -f "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-      exit $stat
-   fi
-
-   for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2" "$tmpdepfile3" "$tmpdepfile4"
-   do
-     test -f "$tmpdepfile" && break
-   done
-   if test -f "$tmpdepfile"; then
-      sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a tab and a space in the [].
-      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
-   else
-      echo "#dummy" > "$depfile"
-   fi
-   rm -f "$tmpdepfile"
-   ;;
-
-#nosideeffect)
-  # This comment above is used by automake to tell side-effect
-  # dependency tracking mechanisms from slower ones.
-
-dashmstdout)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
-  # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
-  "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-dashXmstdout)
-  # This case only exists to satisfy depend.m4.  It is never actually
-  # run, as this mode is specially recognized in the preamble.
-  exit 1
-  ;;
-
-makedepend)
-  "$@" || exit $?
-  # Remove any Libtool call
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-  # X makedepend
-  shift
-  cleared=no
-  for arg in "$@"; do
-    case $cleared in
-    no)
-      set ""; shift
-      cleared=yes ;;
-    esac
-    case "$arg" in
-    -D*|-I*)
-      set fnord "$@" "$arg"; shift ;;
-    # Strip any option that makedepend may not understand.  Remove
-    # the object too, otherwise makedepend will parse it as a source file.
-    -*|$object)
-      ;;
-    *)
-      set fnord "$@" "$arg"; shift ;;
-    esac
-  done
-  obj_suffix="`echo $object | sed 's/^.*\././'`"
-  touch "$tmpdepfile"
-  ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
-  rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
-## Some versions of the HPUX 10.20 sed can't process this invocation
-## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile" "$tmpdepfile".bak
-  ;;
-
-cpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout.
-  "$@" || exit $?
-
-  # Remove the call to Libtool.
-  if test "$libtool" = yes; then
-    while test $1 != '--mode=compile'; do
-      shift
-    done
-    shift
-  fi
-
-  # Remove `-o $object'.
-  IFS=" "
-  for arg
-  do
-    case $arg in
-    -o)
-      shift
-      ;;
-    $object)
-      shift
-      ;;
-    *)
-      set fnord "$@" "$arg"
-      shift # fnord
-      shift # $arg
-      ;;
-    esac
-  done
-
-  "$@" -E |
-    sed -n '/^# [0-9][0-9]* "\([^"]*\)".*/ s:: \1 \\:p' |
-    sed '$ s: \\$::' > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  cat < "$tmpdepfile" >> "$depfile"
-  sed < "$tmpdepfile" '/^$/d;s/^ //;s/ \\$//;s/$/ :/' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-msvisualcpp)
-  # Important note: in order to support this mode, a compiler *must*
-  # always write the preprocessed file to stdout, regardless of -o,
-  # because we must use -o when running libtool.
-  "$@" || exit $?
-  IFS=" "
-  for arg
-  do
-    case "$arg" in
-    "-Gm"|"/Gm"|"-Gi"|"/Gi"|"-ZI"|"/ZI")
-	set fnord "$@"
-	shift
-	shift
-	;;
-    *)
-	set fnord "$@" "$arg"
-	shift
-	shift
-	;;
-    esac
-  done
-  "$@" -E |
-  sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::echo "`cygpath -u \\"\1\\"`":p' | sort | uniq > "$tmpdepfile"
-  rm -f "$depfile"
-  echo "$object : \\" > "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
-  . "$tmpdepfile" | sed 's% %\\ %g' | sed -n '/^\(.*\)$/ s::\1\::p' >> "$depfile"
-  rm -f "$tmpdepfile"
-  ;;
-
-none)
-  exec "$@"
-  ;;
-
-*)
-  echo "Unknown depmode $depmode" 1>&2
-  exit 1
-  ;;
-esac
-
-exit 0
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/doc/Makefile b/abs/mv-core/ghosd/ghosd-0.0.1/doc/Makefile
deleted file mode 100644
index 4edd465..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/doc/Makefile
+++ /dev/null
@@ -1,541 +0,0 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
-# doc/Makefile.  Generated from Makefile.in by configure.
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-# -*- mode: makefile -*-
-
-####################################
-# Everything below here is generic #
-####################################
-srcdir = .
-top_srcdir = ..
-
-pkgdatadir = $(datadir)/ghosd
-pkglibdir = $(libdir)/ghosd
-pkgincludedir = $(includedir)/ghosd
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = /bin/install -c
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = i686-pc-linux-gnu
-host_triplet = i686-pc-linux-gnu
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/gtk-doc.make
-subdir = doc
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /data/local/jams/ghosd-0.0.1/missing --run aclocal-1.9
-AMDEP_FALSE = #
-AMDEP_TRUE = 
-AMTAR = ${SHELL} /data/local/jams/ghosd-0.0.1/missing --run tar
-AR = ar
-AUTOCONF = ${SHELL} /data/local/jams/ghosd-0.0.1/missing --run autoconf
-AUTOHEADER = ${SHELL} /data/local/jams/ghosd-0.0.1/missing --run autoheader
-AUTOMAKE = ${SHELL} /data/local/jams/ghosd-0.0.1/missing --run automake-1.9
-AWK = gawk
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2 -Wall -Wpointer-arith -Wstrict-prototypes                -Wmissing-prototypes -Wmissing-declarations                -Wnested-externs -fno-strict-aliasing
-CPP = gcc -E
-CPPFLAGS = 
-CXX = g++
-CXXCPP = g++ -E
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2
-CYGPATH_W = echo
-DEFS = -DHAVE_CONFIG_H
-DEPDIR = .deps
-ECHO = echo
-ECHO_C = 
-ECHO_N = -n
-ECHO_T = 
-EGREP = grep -E
-ENABLE_GTK_DOC_FALSE = 
-ENABLE_GTK_DOC_TRUE = #
-EXEEXT = 
-F77 = 
-FFLAGS = 
-GHOSD_CFLAGS = -I/usr/include/cairo -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
-GHOSD_EXAMPLE_CFLAGS = -I/usr/include/cairo -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
-GHOSD_EXAMPLE_LIBS = -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  
-GHOSD_LIBS = -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  
-GHOSD_PACKAGES = cairo pangocairo
-GTK_DOC_USE_LIBTOOL_FALSE = #
-GTK_DOC_USE_LIBTOOL_TRUE = 
-HTML_DIR = ${datadir}/gtk-doc/html
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
-LDFLAGS = 
-LIBOBJS = 
-LIBS = 
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LN_S = ln -s
-LTLIBOBJS = 
-MAINT = #
-MAINTAINER_MODE_FALSE = 
-MAINTAINER_MODE_TRUE = #
-MAKEINFO = ${SHELL} /data/local/jams/ghosd-0.0.1/missing --run makeinfo
-OBJEXT = o
-PACKAGE = ghosd
-PACKAGE_BUGREPORT = martine@danga.com
-PACKAGE_NAME = ghosd
-PACKAGE_STRING = ghosd 0.0.1
-PACKAGE_TARNAME = ghosd
-PACKAGE_VERSION = 0.0.1
-PANGO_FALSE = #
-PANGO_TRUE = 
-PATH_SEPARATOR = :
-PKG_CONFIG = /usr/bin/pkg-config
-RANLIB = ranlib
-SET_MAKE = 
-SHELL = /bin/sh
-STRIP = strip
-VERSION = 0.0.1
-VERSION_INFO = 0:0:0
-ac_ct_AR = ar
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_F77 = 
-ac_ct_RANLIB = ranlib
-ac_ct_STRIP = strip
-ac_pt_PKG_CONFIG = /usr/bin/pkg-config
-am__fastdepCC_FALSE = #
-am__fastdepCC_TRUE = 
-am__fastdepCXX_FALSE = #
-am__fastdepCXX_TRUE = 
-am__include = include
-am__leading_dot = .
-am__quote = 
-am__tar = ${AMTAR} chof - "$$tardir"
-am__untar = ${AMTAR} xf -
-bindir = ${exec_prefix}/bin
-build = i686-pc-linux-gnu
-build_alias = 
-build_cpu = i686
-build_os = linux-gnu
-build_vendor = pc
-datadir = ${prefix}/share
-exec_prefix = ${prefix}
-host = i686-pc-linux-gnu
-host_alias = 
-host_cpu = i686
-host_os = linux-gnu
-host_vendor = pc
-includedir = ${prefix}/include
-infodir = ${prefix}/info
-install_sh = /data/local/jams/ghosd-0.0.1/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localstatedir = ${prefix}/var
-mandir = ${prefix}/man
-mkdir_p = mkdir -p --
-oldincludedir = /usr/include
-prefix = /usr/local
-program_transform_name = s,x,x,
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-sysconfdir = ${prefix}/etc
-target_alias = 
-
-# We require automake 1.6 at least.
-AUTOMAKE_OPTIONS = 1.9
-# The name of the module, e.g. 'glib'.
-DOC_MODULE = ghosd
-
-# The top-level SGML file. You can change this if you want to.
-DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
-
-# The directory containing the source code. Relative to $(srcdir).
-# gtk-doc will search all .c & .h files beneath here for inline comments
-# documenting the functions and macros.
-# e.g. DOC_SOURCE_DIR=../../../gtk
-DOC_SOURCE_DIR = ../ghosd
-
-# Extra options to pass to gtkdoc-scangobj. Not normally needed.
-SCANGOBJ_OPTIONS = 
-
-# Extra options to supply to gtkdoc-scan.
-# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED" 
-SCAN_OPTIONS = 
-
-# Extra options to supply to gtkdoc-mkdb.
-# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
-MKDB_OPTIONS = --sgml-mode --output-format=xml
-
-# Extra options to supply to gtkdoc-mktmpl
-# e.g. MKTMPL_OPTIONS=--only-section-tmpl
-MKTMPL_OPTIONS = 
-
-# Extra options to supply to gtkdoc-fixref. Not normally needed.
-# e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
-FIXXREF_OPTIONS = 
-
-# Used for dependencies. The docs will be rebuilt if any of these change.
-# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
-# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB = $(top_srcdir)/ghosd/*.h
-CFILE_GLOB = $(top_srcdir)/ghosd/*.c
-
-# Header files to ignore when scanning.
-# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
-IGNORE_HFILES = ghosd-internal.h
-
-# Images to copy into HTML directory.
-# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
-HTML_IMAGES = 
-
-# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
-# e.g. content_files=running.sgml building.sgml changes-2.0.sgml
-content_files = 
-
-# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
-# These files must be listed here *and* in content_files
-# e.g. expand_content_files=running.sgml
-expand_content_files = 
-
-# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
-# Only needed if you are using gtkdoc-scangobj to dynamically query widget
-# signals and properties.
-# e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
-# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-INCLUDES = 
-GTKDOC_LIBS = 
-#GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-#GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
-GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
-
-# We set GPATH here; this gives us semantics for GNU make
-# which are more like other make's VPATH, when it comes to
-# whether a source that is a target of one rule is then
-# searched for in VPATH/GPATH.
-#
-GPATH = $(srcdir)
-TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
-
-# This includes the standard gtk-doc make rules, copied by gtkdocize.
-
-# Other files to distribute
-# e.g. EXTRA_DIST += version.xml.in
-EXTRA_DIST = $(content_files) $(HTML_IMAGES) $(DOC_MAIN_SGML_FILE) \
-	$(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
-	   $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
-
-SCANOBJ_FILES = \
-	$(DOC_MODULE).args 	 \
-	$(DOC_MODULE).hierarchy  \
-	$(DOC_MODULE).interfaces \
-	$(DOC_MODULE).prerequisites \
-	$(DOC_MODULE).signals
-
-CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODULE)-unused.txt $(DOC_STAMPS)
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am $(top_srcdir)/gtk-doc.make $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  doc/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: # $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): # $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/..
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	$(MAKE) $(AM_MAKEFLAGS) \
-	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
-	  dist-hook
-check-am: all-am
-check: check-am
-all-am: Makefile all-local
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-local mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am: install-data-local
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic \
-	maintainer-clean-local
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-local
-
-.PHONY: all all-am all-local check check-am clean clean-generic \
-	clean-libtool clean-local dist-hook distclean \
-	distclean-generic distclean-libtool distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-data-local install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic \
-	maintainer-clean-local mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am uninstall-local
-
-
-#all-local: html-build.stamp
-
-#### scan ####
-
-#scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
-#	@echo '*** Scanning header files ***'
-#	@-chmod -R u+w $(srcdir)
-#	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
-#	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
-#	else \
-#	    cd $(srcdir) ; \
-#	    for i in $(SCANOBJ_FILES) ; do \
-#               test -f $$i || touch $$i ; \
-#	    done \
-#	fi
-#	cd $(srcdir) && \
-#	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
-#	touch scan-build.stamp
-
-#$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
-#	@true
-
-#### templates ####
-
-#tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-#	@echo '*** Rebuilding template files ***'
-#	@-chmod -R u+w $(srcdir)
-#	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-#	touch tmpl-build.stamp
-
-#tmpl.stamp: tmpl-build.stamp
-#	@true
-
-#### xml ####
-
-#sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml $(expand_content_files)
-#	@echo '*** Building XML ***'
-#	@-chmod -R u+w $(srcdir)
-#	cd $(srcdir) && \
-#	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" $(MKDB_OPTIONS)
-#	touch sgml-build.stamp
-
-#sgml.stamp: sgml-build.stamp
-#	@true
-
-#### html ####
-
-#html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-#	@echo '*** Building HTML ***'
-#	@-chmod -R u+w $(srcdir)
-#	rm -rf $(srcdir)/html 
-#	mkdir $(srcdir)/html
-#	cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-#	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
-#	@echo '-- Fixing Crossreferences' 
-#	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-#	touch html-build.stamp
-all-local:
-
-##############
-
-clean-local:
-	rm -f *~ *.bak
-	rm -rf .libs
-
-maintainer-clean-local: clean
-	cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-
-install-data-local:
-	installfiles=`echo $(srcdir)/html/*`; \
-	if test "$$installfiles" = '$(srcdir)/html/*'; \
-	then echo '-- Nothing to install' ; \
-	else \
-	  $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \
-	  for i in $$installfiles; do \
-	    echo '-- Installing '$$i ; \
-	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
-	  done; \
-	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
-	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
-	fi
-
-uninstall-local:
-	rm -f $(DESTDIR)$(TARGET_DIR)/*
-
-#
-# Require gtk-doc when making dist
-#
-#dist-check-gtkdoc:
-dist-check-gtkdoc:
-	@echo "*** gtk-doc must be installed and enabled in order to make dist"
-	@false
-
-dist-hook: dist-check-gtkdoc dist-hook-local
-	mkdir $(distdir)/tmpl
-	mkdir $(distdir)/xml
-	mkdir $(distdir)/html
-	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-	-cp $(srcdir)/xml/*.xml $(distdir)/xml
-	-cp $(srcdir)/html/* $(distdir)/html
-	if test -f $(srcdir)/$(DOC_MODULE).types; then \
-	  cp $(srcdir)/$(DOC_MODULE).types $(distdir)/$(DOC_MODULE).types; \
-	fi
-
-.PHONY : dist-hook-local
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/doc/Makefile.am b/abs/mv-core/ghosd/ghosd-0.0.1/doc/Makefile.am
deleted file mode 100644
index 3388b5b..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/doc/Makefile.am
+++ /dev/null
@@ -1,72 +0,0 @@
-## Process this file with automake to produce Makefile.in
-
-# We require automake 1.6 at least.
-AUTOMAKE_OPTIONS = 1.9
-# The name of the module, e.g. 'glib'.
-DOC_MODULE=ghosd
-
-# The top-level SGML file. You can change this if you want to.
-DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.sgml
-
-# The directory containing the source code. Relative to $(srcdir).
-# gtk-doc will search all .c & .h files beneath here for inline comments
-# documenting the functions and macros.
-# e.g. DOC_SOURCE_DIR=../../../gtk
-DOC_SOURCE_DIR=../ghosd
-
-# Extra options to pass to gtkdoc-scangobj. Not normally needed.
-SCANGOBJ_OPTIONS=
-
-# Extra options to supply to gtkdoc-scan.
-# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED" 
-SCAN_OPTIONS=
-
-# Extra options to supply to gtkdoc-mkdb.
-# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
-MKDB_OPTIONS=--sgml-mode --output-format=xml
-
-# Extra options to supply to gtkdoc-mktmpl
-# e.g. MKTMPL_OPTIONS=--only-section-tmpl
-MKTMPL_OPTIONS=
-
-# Extra options to supply to gtkdoc-fixref. Not normally needed.
-# e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
-FIXXREF_OPTIONS=
-
-# Used for dependencies. The docs will be rebuilt if any of these change.
-# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
-# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB=$(top_srcdir)/ghosd/*.h
-CFILE_GLOB=$(top_srcdir)/ghosd/*.c
-
-# Header files to ignore when scanning.
-# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
-IGNORE_HFILES=ghosd-internal.h
-
-# Images to copy into HTML directory.
-# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
-HTML_IMAGES=
-
-# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
-# e.g. content_files=running.sgml building.sgml changes-2.0.sgml
-content_files=
-
-# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
-# These files must be listed here *and* in content_files
-# e.g. expand_content_files=running.sgml
-expand_content_files=
-
-# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
-# Only needed if you are using gtkdoc-scangobj to dynamically query widget
-# signals and properties.
-# e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
-# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-INCLUDES=
-GTKDOC_LIBS=
-
-# This includes the standard gtk-doc make rules, copied by gtkdocize.
-include $(top_srcdir)/gtk-doc.make
-
-# Other files to distribute
-# e.g. EXTRA_DIST += version.xml.in
-EXTRA_DIST += 
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/doc/Makefile.in b/abs/mv-core/ghosd/ghosd-0.0.1/doc/Makefile.in
deleted file mode 100644
index afd2099..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/doc/Makefile.in
+++ /dev/null
@@ -1,541 +0,0 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-# -*- mode: makefile -*-
-
-####################################
-# Everything below here is generic #
-####################################
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(top_srcdir)/gtk-doc.make
-subdir = doc
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-GHOSD_CFLAGS = @GHOSD_CFLAGS@
-GHOSD_EXAMPLE_CFLAGS = @GHOSD_EXAMPLE_CFLAGS@
-GHOSD_EXAMPLE_LIBS = @GHOSD_EXAMPLE_LIBS@
-GHOSD_LIBS = @GHOSD_LIBS@
-GHOSD_PACKAGES = @GHOSD_PACKAGES@
-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
-HTML_DIR = @HTML_DIR@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PANGO_FALSE = @PANGO_FALSE@
-PANGO_TRUE = @PANGO_TRUE@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-VERSION_INFO = @VERSION_INFO@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-
-# We require automake 1.6 at least.
-AUTOMAKE_OPTIONS = 1.9
-# The name of the module, e.g. 'glib'.
-DOC_MODULE = ghosd
-
-# The top-level SGML file. You can change this if you want to.
-DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
-
-# The directory containing the source code. Relative to $(srcdir).
-# gtk-doc will search all .c & .h files beneath here for inline comments
-# documenting the functions and macros.
-# e.g. DOC_SOURCE_DIR=../../../gtk
-DOC_SOURCE_DIR = ../ghosd
-
-# Extra options to pass to gtkdoc-scangobj. Not normally needed.
-SCANGOBJ_OPTIONS = 
-
-# Extra options to supply to gtkdoc-scan.
-# e.g. SCAN_OPTIONS=--deprecated-guards="GTK_DISABLE_DEPRECATED" 
-SCAN_OPTIONS = 
-
-# Extra options to supply to gtkdoc-mkdb.
-# e.g. MKDB_OPTIONS=--sgml-mode --output-format=xml
-MKDB_OPTIONS = --sgml-mode --output-format=xml
-
-# Extra options to supply to gtkdoc-mktmpl
-# e.g. MKTMPL_OPTIONS=--only-section-tmpl
-MKTMPL_OPTIONS = 
-
-# Extra options to supply to gtkdoc-fixref. Not normally needed.
-# e.g. FIXXREF_OPTIONS=--extra-dir=../gdk-pixbuf/html --extra-dir=../gdk/html
-FIXXREF_OPTIONS = 
-
-# Used for dependencies. The docs will be rebuilt if any of these change.
-# e.g. HFILE_GLOB=$(top_srcdir)/gtk/*.h
-# e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
-HFILE_GLOB = $(top_srcdir)/ghosd/*.h
-CFILE_GLOB = $(top_srcdir)/ghosd/*.c
-
-# Header files to ignore when scanning.
-# e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
-IGNORE_HFILES = ghosd-internal.h
-
-# Images to copy into HTML directory.
-# e.g. HTML_IMAGES=$(top_srcdir)/gtk/stock-icons/stock_about_24.png
-HTML_IMAGES = 
-
-# Extra SGML files that are included by $(DOC_MAIN_SGML_FILE).
-# e.g. content_files=running.sgml building.sgml changes-2.0.sgml
-content_files = 
-
-# SGML files where gtk-doc abbrevations (#GtkWidget) are expanded
-# These files must be listed here *and* in content_files
-# e.g. expand_content_files=running.sgml
-expand_content_files = 
-
-# CFLAGS and LDFLAGS for compiling gtkdoc-scangobj with your library.
-# Only needed if you are using gtkdoc-scangobj to dynamically query widget
-# signals and properties.
-# e.g. INCLUDES=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS)
-# e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib)
-INCLUDES = 
-GTKDOC_LIBS = 
-@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-@GTK_DOC_USE_LIBTOOL_FALSE@GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
-@GTK_DOC_USE_LIBTOOL_TRUE@GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
-
-# We set GPATH here; this gives us semantics for GNU make
-# which are more like other make's VPATH, when it comes to
-# whether a source that is a target of one rule is then
-# searched for in VPATH/GPATH.
-#
-GPATH = $(srcdir)
-TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
-
-# This includes the standard gtk-doc make rules, copied by gtkdocize.
-
-# Other files to distribute
-# e.g. EXTRA_DIST += version.xml.in
-EXTRA_DIST = $(content_files) $(HTML_IMAGES) $(DOC_MAIN_SGML_FILE) \
-	$(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-DOC_STAMPS = scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
-	   $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
-
-SCANOBJ_FILES = \
-	$(DOC_MODULE).args 	 \
-	$(DOC_MODULE).hierarchy  \
-	$(DOC_MODULE).interfaces \
-	$(DOC_MODULE).prerequisites \
-	$(DOC_MODULE).signals
-
-CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODULE)-unused.txt $(DOC_STAMPS)
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/gtk-doc.make $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  doc/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  doc/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-tags: TAGS
-TAGS:
-
-ctags: CTAGS
-CTAGS:
-
-
-distdir: $(DISTFILES)
-	$(mkdir_p) $(distdir)/..
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-	$(MAKE) $(AM_MAKEFLAGS) \
-	  top_distdir="$(top_distdir)" distdir="$(distdir)" \
-	  dist-hook
-check-am: all-am
-check: check-am
-all-am: Makefile all-local
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-local mostlyclean-am
-
-distclean: distclean-am
-	-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am: install-data-local
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic \
-	maintainer-clean-local
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-local
-
-.PHONY: all all-am all-local check check-am clean clean-generic \
-	clean-libtool clean-local dist-hook distclean \
-	distclean-generic distclean-libtool distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-data-local install-exec \
-	install-exec-am install-info install-info-am install-man \
-	install-strip installcheck installcheck-am installdirs \
-	maintainer-clean maintainer-clean-generic \
-	maintainer-clean-local mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
-	uninstall-info-am uninstall-local
-
-
-@ENABLE_GTK_DOC_TRUE@all-local: html-build.stamp
-
-#### scan ####
-
-@ENABLE_GTK_DOC_TRUE@scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
-@ENABLE_GTK_DOC_TRUE@	@echo '*** Scanning header files ***'
-@ENABLE_GTK_DOC_TRUE@	@-chmod -R u+w $(srcdir)
-@ENABLE_GTK_DOC_TRUE@	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
-@ENABLE_GTK_DOC_TRUE@	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
-@ENABLE_GTK_DOC_TRUE@	else \
-@ENABLE_GTK_DOC_TRUE@	    cd $(srcdir) ; \
-@ENABLE_GTK_DOC_TRUE@	    for i in $(SCANOBJ_FILES) ; do \
-@ENABLE_GTK_DOC_TRUE@               test -f $$i || touch $$i ; \
-@ENABLE_GTK_DOC_TRUE@	    done \
-@ENABLE_GTK_DOC_TRUE@	fi
-@ENABLE_GTK_DOC_TRUE@	cd $(srcdir) && \
-@ENABLE_GTK_DOC_TRUE@	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
-@ENABLE_GTK_DOC_TRUE@	touch scan-build.stamp
-
-@ENABLE_GTK_DOC_TRUE@$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
-@ENABLE_GTK_DOC_TRUE@	@true
-
-#### templates ####
-
-@ENABLE_GTK_DOC_TRUE@tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-@ENABLE_GTK_DOC_TRUE@	@echo '*** Rebuilding template files ***'
-@ENABLE_GTK_DOC_TRUE@	@-chmod -R u+w $(srcdir)
-@ENABLE_GTK_DOC_TRUE@	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-@ENABLE_GTK_DOC_TRUE@	touch tmpl-build.stamp
-
-@ENABLE_GTK_DOC_TRUE@tmpl.stamp: tmpl-build.stamp
-@ENABLE_GTK_DOC_TRUE@	@true
-
-#### xml ####
-
-@ENABLE_GTK_DOC_TRUE@sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml $(expand_content_files)
-@ENABLE_GTK_DOC_TRUE@	@echo '*** Building XML ***'
-@ENABLE_GTK_DOC_TRUE@	@-chmod -R u+w $(srcdir)
-@ENABLE_GTK_DOC_TRUE@	cd $(srcdir) && \
-@ENABLE_GTK_DOC_TRUE@	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" $(MKDB_OPTIONS)
-@ENABLE_GTK_DOC_TRUE@	touch sgml-build.stamp
-
-@ENABLE_GTK_DOC_TRUE@sgml.stamp: sgml-build.stamp
-@ENABLE_GTK_DOC_TRUE@	@true
-
-#### html ####
-
-@ENABLE_GTK_DOC_TRUE@html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-@ENABLE_GTK_DOC_TRUE@	@echo '*** Building HTML ***'
-@ENABLE_GTK_DOC_TRUE@	@-chmod -R u+w $(srcdir)
-@ENABLE_GTK_DOC_TRUE@	rm -rf $(srcdir)/html 
-@ENABLE_GTK_DOC_TRUE@	mkdir $(srcdir)/html
-@ENABLE_GTK_DOC_TRUE@	cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-@ENABLE_GTK_DOC_TRUE@	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
-@ENABLE_GTK_DOC_TRUE@	@echo '-- Fixing Crossreferences' 
-@ENABLE_GTK_DOC_TRUE@	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-@ENABLE_GTK_DOC_TRUE@	touch html-build.stamp
-@ENABLE_GTK_DOC_FALSE@all-local:
-
-##############
-
-clean-local:
-	rm -f *~ *.bak
-	rm -rf .libs
-
-maintainer-clean-local: clean
-	cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-
-install-data-local:
-	installfiles=`echo $(srcdir)/html/*`; \
-	if test "$$installfiles" = '$(srcdir)/html/*'; \
-	then echo '-- Nothing to install' ; \
-	else \
-	  $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \
-	  for i in $$installfiles; do \
-	    echo '-- Installing '$$i ; \
-	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
-	  done; \
-	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
-	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
-	fi
-
-uninstall-local:
-	rm -f $(DESTDIR)$(TARGET_DIR)/*
-
-#
-# Require gtk-doc when making dist
-#
-@ENABLE_GTK_DOC_TRUE@dist-check-gtkdoc:
-@ENABLE_GTK_DOC_FALSE@dist-check-gtkdoc:
-@ENABLE_GTK_DOC_FALSE@	@echo "*** gtk-doc must be installed and enabled in order to make dist"
-@ENABLE_GTK_DOC_FALSE@	@false
-
-dist-hook: dist-check-gtkdoc dist-hook-local
-	mkdir $(distdir)/tmpl
-	mkdir $(distdir)/xml
-	mkdir $(distdir)/html
-	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-	-cp $(srcdir)/xml/*.xml $(distdir)/xml
-	-cp $(srcdir)/html/* $(distdir)/html
-	if test -f $(srcdir)/$(DOC_MODULE).types; then \
-	  cp $(srcdir)/$(DOC_MODULE).types $(distdir)/$(DOC_MODULE).types; \
-	fi
-
-.PHONY : dist-hook-local
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/doc/ghosd-docs.sgml b/abs/mv-core/ghosd/ghosd-0.0.1/doc/ghosd-docs.sgml
deleted file mode 100644
index 034bd1c..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/doc/ghosd-docs.sgml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
-<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
-  <bookinfo>
-    <title>Ghosd Manual</title>
-    <author><firstname>Evan</firstname><surname>Martin</surname></author>
-    <copyright><year>2006</year><holder>Evan Martin</holder></copyright>
-  </bookinfo>
-
-  <chapter>
-    <title>Reference</title>
-    <xi:include href="xml/ghosd.xml"/>
-    <xi:include href="xml/main-loop.xml"/>
-    <xi:include href="xml/text.xml"/>
-  </chapter>
-</book>
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/doc/ghosd-overrides.txt b/abs/mv-core/ghosd/ghosd-0.0.1/doc/ghosd-overrides.txt
deleted file mode 100644
index e69de29..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/doc/ghosd-overrides.txt
+++ /dev/null
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/doc/ghosd-sections.txt b/abs/mv-core/ghosd/ghosd-0.0.1/doc/ghosd-sections.txt
deleted file mode 100644
index 3a68cf3..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/doc/ghosd-sections.txt
+++ /dev/null
@@ -1,32 +0,0 @@
-<INCLUDE>ghosd/ghosd.h</INCLUDE>
-<SECTION>
-<FILE>ghosd</FILE>
-<TITLE>Basics</TITLE>
-Ghosd
-GhosdRenderFunc
-ghosd_new
-ghosd_set_transparent
-GHOSD_COORD_CENTER
-ghosd_set_position
-ghosd_set_render
-ghosd_render
-ghosd_show
-</SECTION>
-
-<INCLUDE>ghosd/ghosd.h</INCLUDE>
-<SECTION>
-<FILE>main-loop</FILE>
-<TITLE>Main Loop</TITLE>
-ghosd_main_iterations
-ghosd_main_until
-ghosd_flash
-ghosd_get_socket
-</SECTION>
-
-<INCLUDE>ghosd/ghosd-text.h</INCLUDE>
-<TITLE>Text</TITLE>
-<SECTION>
-<FILE>text</FILE>
-ghosd_text_set_position
-</SECTION>
-
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/doc/html/ch01.html b/abs/mv-core/ghosd/ghosd-0.0.1/doc/html/ch01.html
deleted file mode 100644
index a5bdc7b..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/doc/html/ch01.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Reference</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.68.1">
-<link rel="start" href="index.html" title="Ghosd Manual">
-<link rel="up" href="index.html" title="Ghosd Manual">
-<link rel="prev" href="index.html" title="Ghosd Manual">
-<link rel="next" href="ghosd-Basics.html" title="Basics">
-<meta name="generator" content="GTK-Doc V1.4 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-<link rel="chapter" href="ch01.html" title="Reference">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td><a accesskey="p" href="index.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">Ghosd Manual</th>
-<td><a accesskey="n" href="ghosd-Basics.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr></table>
-<div class="chapter" lang="en">
-<div class="titlepage"><div><div><h2 class="title">
-<a name="id2506024"></a>Reference</h2></div></div></div>
-<div class="toc"><dl>
-<dt>
-<span class="refentrytitle"><a href="ghosd-Basics.html">Basics</a></span><span class="refpurpose"> - Creation, rendering, destruction.</span>
-</dt>
-<dt>
-<span class="refentrytitle"><a href="ghosd-Main-Loop.html">Main Loop</a></span><span class="refpurpose"> - Running an app using Ghosd.</span>
-</dt>
-<dt>
-<span class="refentrytitle"><a href="ghosd-Text.html">Text</a></span><span class="refpurpose"> - Rendering text.</span>
-</dt>
-</dl></div>
-</div>
-<table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="0"><tr valign="middle">
-<td align="left"><a accesskey="p" href="index.html"><b>&lt;&lt;&#160;Ghosd Manual</b></a></td>
-<td align="right"><a accesskey="n" href="ghosd-Basics.html"><b>Basics&#160;&gt;&gt;</b></a></td>
-</tr></table>
-</body>
-</html>
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/doc/html/ghosd-Basics.html b/abs/mv-core/ghosd/ghosd-0.0.1/doc/html/ghosd-Basics.html
deleted file mode 100644
index 3076b10..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/doc/html/ghosd-Basics.html
+++ /dev/null
@@ -1,313 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Basics</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.68.1">
-<link rel="start" href="index.html" title="Ghosd Manual">
-<link rel="up" href="ch01.html" title="Reference">
-<link rel="prev" href="ch01.html" title="Reference">
-<link rel="next" href="ghosd-Main-Loop.html" title="Main Loop">
-<meta name="generator" content="GTK-Doc V1.4 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-<link rel="chapter" href="ch01.html" title="Reference">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td><a accesskey="p" href="ch01.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">Ghosd Manual</th>
-<td><a accesskey="n" href="ghosd-Main-Loop.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr></table>
-<div class="refentry" lang="en">
-<a name="ghosd-Basics"></a><div class="titlepage"></div>
-<div class="refnamediv"><table width="100%"><tr>
-<td valign="top">
-<h2><span class="refentrytitle">Basics</span></h2>
-<p>Basics &#8212; Creation, rendering, destruction.</p>
-</td>
-<td valign="top" align="right"></td>
-</tr></table></div>
-<div class="refsynopsisdiv">
-<h2>Synopsis</h2>
-<pre class="synopsis">
-
-#include &lt;ghosd/ghosd.h&gt;
-
-
-            <a href="ghosd-Basics.html#Ghosd">Ghosd</a>;
-void        (<a href="ghosd-Basics.html#GhosdRenderFunc">*GhosdRenderFunc</a>)              (<a href="ghosd-Basics.html#Ghosd">Ghosd</a> *ghosd,
-                                             cairo_t *cr,
-                                             void *user_data);
-<a href="ghosd-Basics.html#Ghosd">Ghosd</a>*      <a href="ghosd-Basics.html#ghosd-new">ghosd_new</a>                       (void);
-void        <a href="ghosd-Basics.html#ghosd-set-transparent">ghosd_set_transparent</a>           (<a href="ghosd-Basics.html#Ghosd">Ghosd</a> *ghosd,
-                                             int transparent);
-#define     <a href="ghosd-Basics.html#GHOSD-COORD-CENTER:CAPS">GHOSD_COORD_CENTER</a>
-void        <a href="ghosd-Basics.html#ghosd-set-position">ghosd_set_position</a>              (<a href="ghosd-Basics.html#Ghosd">Ghosd</a> *ghosd,
-                                             int x,
-                                             int y,
-                                             int width,
-                                             int height);
-void        <a href="ghosd-Basics.html#ghosd-set-render">ghosd_set_render</a>                (<a href="ghosd-Basics.html#Ghosd">Ghosd</a> *ghosd,
-                                             <a href="ghosd-Basics.html#GhosdRenderFunc">GhosdRenderFunc</a> render_func,
-                                             void *data);
-void        <a href="ghosd-Basics.html#ghosd-render">ghosd_render</a>                    (<a href="ghosd-Basics.html#Ghosd">Ghosd</a> *ghosd);
-void        <a href="ghosd-Basics.html#ghosd-show">ghosd_show</a>                      (<a href="ghosd-Basics.html#Ghosd">Ghosd</a> *ghosd);
-</pre>
-</div>
-<div class="refsect1" lang="en">
-<a name="id2492107"></a><h2>Description</h2>
-<p>
-
-</p>
-</div>
-<div class="refsect1" lang="en">
-<a name="id2492118"></a><h2>Details</h2>
-<div class="refsect2" lang="en">
-<a name="id2492124"></a><h3>
-<a name="Ghosd"></a>Ghosd</h3>
-<a class="indexterm" name="id2492134"></a><pre class="programlisting">typedef struct _Ghosd Ghosd;</pre>
-<p>
-An opaque Ghosd object.  Think of it as the window that the content is
-displayed in.
-</p>
-</div>
-<hr>
-<div class="refsect2" lang="en">
-<a name="id2492151"></a><h3>
-<a name="GhosdRenderFunc"></a>GhosdRenderFunc ()</h3>
-<a class="indexterm" name="id2492161"></a><pre class="programlisting">void        (*GhosdRenderFunc)              (<a href="ghosd-Basics.html#Ghosd">Ghosd</a> *ghosd,
-                                             cairo_t *cr,
-                                             void *user_data);</pre>
-<p>
-The type of callback called when Ghosd needs to render the content.
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>ghosd</code></em>&#160;:</span></td>
-<td>A <a href="ghosd-Basics.html#Ghosd"><span class="type">Ghosd</span></a> object.
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>cr</code></em>&#160;:</span></td>
-<td>A <span class="type">cairo_t</span> to draw on.
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>user_data</code></em>&#160;:</span></td>
-<td>User data that was passed to <a href="ghosd-Basics.html#ghosd-set-render"><code class="function">ghosd_set_render()</code></a>.
-
-
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" lang="en">
-<a name="id2534054"></a><h3>
-<a name="ghosd-new"></a>ghosd_new ()</h3>
-<a class="indexterm" name="id2534064"></a><pre class="programlisting"><a href="ghosd-Basics.html#Ghosd">Ghosd</a>*      ghosd_new                       (void);</pre>
-<p>
-Create a new <a href="ghosd-Basics.html#Ghosd"><span class="type">Ghosd</span></a> object.
-</p>
-<p>
-Can return <code class="literal">NULL</code> if unable to connect to the X server.</p>
-<p>
-
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td>
-<span class="term"><span class="emphasis"><em>Returns</em></span>&#160;:</span></td>
-<td> a new <a href="ghosd-Basics.html#Ghosd"><span class="type">Ghosd</span></a> object.
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" lang="en">
-<a name="id2534128"></a><h3>
-<a name="ghosd-set-transparent"></a>ghosd_set_transparent ()</h3>
-<a class="indexterm" name="id2534137"></a><pre class="programlisting">void        ghosd_set_transparent           (<a href="ghosd-Basics.html#Ghosd">Ghosd</a> *ghosd,
-                                             int transparent);</pre>
-<p>
-Change the "transparent" setting.  Setting <em class="parameter"><code>transparent</code></em> to <code class="literal">FALSE</code> is
-mostly useful for debugging.</p>
-<p>
-
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>ghosd</code></em>&#160;:</span></td>
-<td> a <a href="ghosd-Basics.html#Ghosd"><span class="type">Ghosd</span></a> object.
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>transparent</code></em>&#160;:</span></td>
-<td> a boolean indicating the transparent setting.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" lang="en">
-<a name="id2534227"></a><h3>
-<a name="GHOSD-COORD-CENTER:CAPS"></a>GHOSD_COORD_CENTER</h3>
-<a class="indexterm" name="id2534236"></a><pre class="programlisting">#define GHOSD_COORD_CENTER MAXINT
-</pre>
-<p>
-Pass this as a coordinate to <a href="ghosd-Basics.html#ghosd-set-position"><code class="function">ghosd_set_position()</code></a> to center along that axis.
-</p>
-</div>
-<hr>
-<div class="refsect2" lang="en">
-<a name="id2534260"></a><h3>
-<a name="ghosd-set-position"></a>ghosd_set_position ()</h3>
-<a class="indexterm" name="id2534270"></a><pre class="programlisting">void        ghosd_set_position              (<a href="ghosd-Basics.html#Ghosd">Ghosd</a> *ghosd,
-                                             int x,
-                                             int y,
-                                             int width,
-                                             int height);</pre>
-<p>
-Position the initial <a href="ghosd-Basics.html#Ghosd"><span class="type">Ghosd</span></a>.  Must be called before <a href="ghosd-Basics.html#ghosd-render"><code class="function">ghosd_render()</code></a> and
-<a href="ghosd-Basics.html#ghosd-show"><code class="function">ghosd_show()</code></a>, and can only be called once.
-</p>
-<p>
-Positive x,y are interpreted as normal coordinates.
-Pass <code class="literal">GHOSD_COORD_CENTER</code> to center on a given dimension,
-and negative coordinates right-align (like CSS right).</p>
-<p>
-
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>ghosd</code></em>&#160;:</span></td>
-<td> a <a href="ghosd-Basics.html#Ghosd"><span class="type">Ghosd</span></a> object.
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>x</code></em>&#160;:</span></td>
-<td> x coordinate in screen pixels.
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>y</code></em>&#160;:</span></td>
-<td> y coordinate in screen pixels.
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>width</code></em>&#160;:</span></td>
-<td> width in screen pixels.
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>height</code></em>&#160;:</span></td>
-<td> width in screen pixels.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" lang="en">
-<a name="id2469726"></a><h3>
-<a name="ghosd-set-render"></a>ghosd_set_render ()</h3>
-<a class="indexterm" name="id2469736"></a><pre class="programlisting">void        ghosd_set_render                (<a href="ghosd-Basics.html#Ghosd">Ghosd</a> *ghosd,
-                                             <a href="ghosd-Basics.html#GhosdRenderFunc">GhosdRenderFunc</a> render_func,
-                                             void *data);</pre>
-<p>
-Register a function to draw on the <a href="ghosd-Basics.html#Ghosd"><span class="type">Ghosd</span></a>.</p>
-<p>
-
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>ghosd</code></em>&#160;:</span></td>
-<td> a <a href="ghosd-Basics.html#Ghosd"><span class="type">Ghosd</span></a> object.
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>render_func</code></em>&#160;:</span></td>
-<td> a <a href="ghosd-Basics.html#GhosdRenderFunc"><span class="type">GhosdRenderFunc</span></a> callback.
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>data</code></em>&#160;:</span></td>
-<td> user data to pass to the callback.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" lang="en">
-<a name="id2556720"></a><h3>
-<a name="ghosd-render"></a>ghosd_render ()</h3>
-<a class="indexterm" name="id2556729"></a><pre class="programlisting">void        ghosd_render                    (<a href="ghosd-Basics.html#Ghosd">Ghosd</a> *ghosd);</pre>
-<p>
-Makes the Ghosd redraw itself.</p>
-<p>
-
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td>
-<span class="term"><em class="parameter"><code>ghosd</code></em>&#160;:</span></td>
-<td> a <a href="ghosd-Basics.html#Ghosd"><span class="type">Ghosd</span></a> object.
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" lang="en">
-<a name="id2556779"></a><h3>
-<a name="ghosd-show"></a>ghosd_show ()</h3>
-<a class="indexterm" name="id2556787"></a><pre class="programlisting">void        ghosd_show                      (<a href="ghosd-Basics.html#Ghosd">Ghosd</a> *ghosd);</pre>
-<p>
-Show the <a href="ghosd-Basics.html#Ghosd"><span class="type">Ghosd</span></a>.</p>
-<p>
-
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td>
-<span class="term"><em class="parameter"><code>ghosd</code></em>&#160;:</span></td>
-<td> a <a href="ghosd-Basics.html#Ghosd"><span class="type">Ghosd</span></a> object.
-</td>
-</tr></tbody>
-</table></div>
-</div>
-</div>
-</div>
-<table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="0"><tr valign="middle">
-<td align="left"><a accesskey="p" href="ch01.html"><b>&lt;&lt;&#160;Reference</b></a></td>
-<td align="right"><a accesskey="n" href="ghosd-Main-Loop.html"><b>Main Loop&#160;&gt;&gt;</b></a></td>
-</tr></table>
-</body>
-</html>
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/doc/html/ghosd-Main-Loop.html b/abs/mv-core/ghosd/ghosd-0.0.1/doc/html/ghosd-Main-Loop.html
deleted file mode 100644
index 07a6e51..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/doc/html/ghosd-Main-Loop.html
+++ /dev/null
@@ -1,183 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Main Loop</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.68.1">
-<link rel="start" href="index.html" title="Ghosd Manual">
-<link rel="up" href="ch01.html" title="Reference">
-<link rel="prev" href="ghosd-Basics.html" title="Basics">
-<link rel="next" href="ghosd-Text.html" title="Text">
-<meta name="generator" content="GTK-Doc V1.4 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-<link rel="chapter" href="ch01.html" title="Reference">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td><a accesskey="p" href="ghosd-Basics.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">Ghosd Manual</th>
-<td><a accesskey="n" href="ghosd-Text.html"><img src="right.png" width="24" height="24" border="0" alt="Next"></a></td>
-</tr></table>
-<div class="refentry" lang="en">
-<a name="ghosd-Main-Loop"></a><div class="titlepage"></div>
-<div class="refnamediv"><table width="100%"><tr>
-<td valign="top">
-<h2><span class="refentrytitle">Main Loop</span></h2>
-<p>Main Loop &#8212; Running an app using Ghosd.</p>
-</td>
-<td valign="top" align="right"></td>
-</tr></table></div>
-<div class="refsynopsisdiv">
-<h2>Synopsis</h2>
-<pre class="synopsis">
-
-#include &lt;ghosd/ghosd.h&gt;
-
-
-void        <a href="ghosd-Main-Loop.html#ghosd-main-iterations">ghosd_main_iterations</a>           (<a href="ghosd-Basics.html#Ghosd">Ghosd</a> *ghosd);
-void        <a href="ghosd-Main-Loop.html#ghosd-main-until">ghosd_main_until</a>                (<a href="ghosd-Basics.html#Ghosd">Ghosd</a> *ghosd,
-                                             struct timeval *until);
-void        <a href="ghosd-Main-Loop.html#ghosd-flash">ghosd_flash</a>                     (<a href="ghosd-Basics.html#Ghosd">Ghosd</a> *ghosd,
-                                             int fade_ms,
-                                             int total_display_ms);
-int         <a href="ghosd-Main-Loop.html#ghosd-get-socket">ghosd_get_socket</a>                (<a href="ghosd-Basics.html#Ghosd">Ghosd</a> *ghosd);
-</pre>
-</div>
-<div class="refsect1" lang="en">
-<a name="id2545628"></a><h2>Description</h2>
-<p>
-
-</p>
-</div>
-<div class="refsect1" lang="en">
-<a name="id2545639"></a><h2>Details</h2>
-<div class="refsect2" lang="en">
-<a name="id2545646"></a><h3>
-<a name="ghosd-main-iterations"></a>ghosd_main_iterations ()</h3>
-<a class="indexterm" name="id2545654"></a><pre class="programlisting">void        ghosd_main_iterations           (<a href="ghosd-Basics.html#Ghosd">Ghosd</a> *ghosd);</pre>
-<p>
-Iterate the main loop on the <a href="ghosd-Basics.html#Ghosd"><span class="type">Ghosd</span></a>, handling all pending X events.
-This function does not wait for X events, so it returns immediately
-unless there are already events pending.</p>
-<p>
-
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody><tr>
-<td>
-<span class="term"><em class="parameter"><code>ghosd</code></em>&#160;:</span></td>
-<td> a <a href="ghosd-Basics.html#Ghosd"><span class="type">Ghosd</span></a> object.
-</td>
-</tr></tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" lang="en">
-<a name="id2545719"></a><h3>
-<a name="ghosd-main-until"></a>ghosd_main_until ()</h3>
-<a class="indexterm" name="id2545729"></a><pre class="programlisting">void        ghosd_main_until                (<a href="ghosd-Basics.html#Ghosd">Ghosd</a> *ghosd,
-                                             struct timeval *until);</pre>
-<p>
-Efficiently iterate the main loop on the <a href="ghosd-Basics.html#Ghosd"><span class="type">Ghosd</span></a>, handling all pending X
-events, until the current time reaches the time specified in <em class="parameter"><code>until</code></em>.</p>
-<p>
-
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>ghosd</code></em>&#160;:</span></td>
-<td> a <a href="ghosd-Basics.html#Ghosd"><span class="type">Ghosd</span></a> object.
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>until</code></em>&#160;:</span></td>
-<td> a pointer to a timeval to update until.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" lang="en">
-<a name="id2540527"></a><h3>
-<a name="ghosd-flash"></a>ghosd_flash ()</h3>
-<a class="indexterm" name="id2540537"></a><pre class="programlisting">void        ghosd_flash                     (<a href="ghosd-Basics.html#Ghosd">Ghosd</a> *ghosd,
-                                             int fade_ms,
-                                             int total_display_ms);</pre>
-<p>
-Fade in a <a href="ghosd-Basics.html#Ghosd"><span class="type">Ghosd</span></a>, display at full opacity for a while, fade out, and then
-return.
-This is easy enough to implement using <a href="ghosd-Main-Loop.html#ghosd-main-until"><code class="function">ghosd_main_until()</code></a>, but is a 
-a common enough use of Ghosd to make it a builtin.</p>
-<p>
-
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>ghosd</code></em>&#160;:</span></td>
-<td> a <a href="ghosd-Basics.html#Ghosd"><span class="type">Ghosd</span></a> object.
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>fade_ms</code></em>&#160;:</span></td>
-<td> how long to fade, in milliseconds.
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>total_display_ms</code></em>&#160;:</span></td>
-<td> total display time, including fades, in milliseconds.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-<hr>
-<div class="refsect2" lang="en">
-<a name="id2552181"></a><h3>
-<a name="ghosd-get-socket"></a>ghosd_get_socket ()</h3>
-<a class="indexterm" name="id2552191"></a><pre class="programlisting">int         ghosd_get_socket                (<a href="ghosd-Basics.html#Ghosd">Ghosd</a> *ghosd);</pre>
-<p>
-Get the file descriptor of the Ghosd X socket.  When this file descriptor
-has data available, call <a href="ghosd-Main-Loop.html#ghosd-main-iterations"><code class="function">ghosd_main_iterations()</code></a> to process the pending X
-events.  Use this with <code class="function">select()</code>/<code class="function">poll()</code> etc. to multiplex Ghosd with other
-processing.</p>
-<p>
-
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>ghosd</code></em>&#160;:</span></td>
-<td> a <a href="ghosd-Basics.html#Ghosd"><span class="type">Ghosd</span></a> object.
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><span class="emphasis"><em>Returns</em></span>&#160;:</span></td>
-<td> a file descriptor, suitable for use in <code class="function">select()</code> or <code class="function">poll()</code>.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-</div>
-</div>
-<table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="0"><tr valign="middle">
-<td align="left"><a accesskey="p" href="ghosd-Basics.html"><b>&lt;&lt;&#160;Basics</b></a></td>
-<td align="right"><a accesskey="n" href="ghosd-Text.html"><b>Text&#160;&gt;&gt;</b></a></td>
-</tr></table>
-</body>
-</html>
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/doc/html/ghosd-Text.html b/abs/mv-core/ghosd/ghosd-0.0.1/doc/html/ghosd-Text.html
deleted file mode 100644
index 5305068..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/doc/html/ghosd-Text.html
+++ /dev/null
@@ -1,100 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Text</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.68.1">
-<link rel="start" href="index.html" title="Ghosd Manual">
-<link rel="up" href="ch01.html" title="Reference">
-<link rel="prev" href="ghosd-Main-Loop.html" title="Main Loop">
-<meta name="generator" content="GTK-Doc V1.4 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-<link rel="chapter" href="ch01.html" title="Reference">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<table class="navigation" width="100%" summary="Navigation header" cellpadding="2" cellspacing="2"><tr valign="middle">
-<td><a accesskey="p" href="ghosd-Main-Loop.html"><img src="left.png" width="24" height="24" border="0" alt="Prev"></a></td>
-<td><a accesskey="u" href="ch01.html"><img src="up.png" width="24" height="24" border="0" alt="Up"></a></td>
-<td><a accesskey="h" href="index.html"><img src="home.png" width="24" height="24" border="0" alt="Home"></a></td>
-<th width="100%" align="center">Ghosd Manual</th>
-</tr></table>
-<div class="refentry" lang="en">
-<a name="ghosd-Text"></a><div class="titlepage"></div>
-<div class="refnamediv"><table width="100%"><tr>
-<td valign="top">
-<h2><span class="refentrytitle">Text</span></h2>
-<p>Text &#8212; Rendering text.</p>
-</td>
-<td valign="top" align="right"></td>
-</tr></table></div>
-<div class="refsynopsisdiv">
-<h2>Synopsis</h2>
-<pre class="synopsis">
-
-#include &lt;ghosd/ghosd-text.h&gt;
-
-
-void        <a href="ghosd-Text.html#ghosd-text-set-position">ghosd_text_set_position</a>         (<a href="ghosd-Basics.html#Ghosd">Ghosd</a> *ghosd,
-                                             int x,
-                                             int y,
-                                             PangoLayout *layout);
-</pre>
-</div>
-<div class="refsect1" lang="en">
-<a name="id2525288"></a><h2>Description</h2>
-<p>
-I expect to flesh out this API, so this is mostly a placeholder for now.
-</p>
-</div>
-<div class="refsect1" lang="en">
-<a name="id2530080"></a><h2>Details</h2>
-<div class="refsect2" lang="en">
-<a name="id2530087"></a><h3>
-<a name="ghosd-text-set-position"></a>ghosd_text_set_position ()</h3>
-<a class="indexterm" name="id2530096"></a><pre class="programlisting">void        ghosd_text_set_position         (<a href="ghosd-Basics.html#Ghosd">Ghosd</a> *ghosd,
-                                             int x,
-                                             int y,
-                                             PangoLayout *layout);</pre>
-<p>
-Set ghosd dimensions based on a <span class="type">PangoLayout</span>.
-See <a href="ghosd-Basics.html#ghosd-set-position"><code class="function">ghosd_set_position()</code></a> for interpretation of the x and y coordinates.</p>
-<p>
-
-</p>
-<div class="variablelist"><table border="0">
-<col align="left" valign="top">
-<tbody>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>ghosd</code></em>&#160;:</span></td>
-<td> a <a href="ghosd-Basics.html#Ghosd"><span class="type">Ghosd</span></a> object;
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>x</code></em>&#160;:</span></td>
-<td> x coordinate in screen pixels.
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>y</code></em>&#160;:</span></td>
-<td> y coordinate in screen pixels.
-</td>
-</tr>
-<tr>
-<td>
-<span class="term"><em class="parameter"><code>layout</code></em>&#160;:</span></td>
-<td> the <span class="type">PangoLayout</span> to draw.
-</td>
-</tr>
-</tbody>
-</table></div>
-</div>
-</div>
-</div>
-<table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="0"><tr valign="middle">
-<td align="left"><a accesskey="p" href="ghosd-Main-Loop.html"><b>&lt;&lt;&#160;Main Loop</b></a></td>
-<td align="right"></td>
-</tr></table>
-</body>
-</html>
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/doc/html/ghosd.devhelp b/abs/mv-core/ghosd/ghosd-0.0.1/doc/html/ghosd.devhelp
deleted file mode 100644
index 77d7ea1..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/doc/html/ghosd.devhelp
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="no"?>
-<book xmlns="http://www.devhelp.net/book" title="Ghosd Manual" link="index.html" author="" name="ghosd">
-  <chapters>
-    <sub name="Reference" link="ch01.html">
-      <sub name="Basics" link="ghosd-Basics.html"/>
-      <sub name="Main Loop" link="ghosd-Main-Loop.html"/>
-      <sub name="Text" link="ghosd-Text.html"/>
-    </sub>
-  </chapters>
-  <functions>
-    <function name="Ghosd" link="ghosd-Basics.html#Ghosd"/>
-    <function name="GhosdRenderFunc ()" link="ghosd-Basics.html#GhosdRenderFunc"/>
-    <function name="ghosd_new ()" link="ghosd-Basics.html#ghosd-new"/>
-    <function name="ghosd_set_transparent ()" link="ghosd-Basics.html#ghosd-set-transparent"/>
-    <function name="GHOSD_COORD_CENTER" link="ghosd-Basics.html#GHOSD-COORD-CENTER:CAPS"/>
-    <function name="ghosd_set_position ()" link="ghosd-Basics.html#ghosd-set-position"/>
-    <function name="ghosd_set_render ()" link="ghosd-Basics.html#ghosd-set-render"/>
-    <function name="ghosd_render ()" link="ghosd-Basics.html#ghosd-render"/>
-    <function name="ghosd_show ()" link="ghosd-Basics.html#ghosd-show"/>
-    <function name="ghosd_main_iterations ()" link="ghosd-Main-Loop.html#ghosd-main-iterations"/>
-    <function name="ghosd_main_until ()" link="ghosd-Main-Loop.html#ghosd-main-until"/>
-    <function name="ghosd_flash ()" link="ghosd-Main-Loop.html#ghosd-flash"/>
-    <function name="ghosd_get_socket ()" link="ghosd-Main-Loop.html#ghosd-get-socket"/>
-    <function name="ghosd_text_set_position ()" link="ghosd-Text.html#ghosd-text-set-position"/>
-  </functions>
-</book>
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/doc/html/home.png b/abs/mv-core/ghosd/ghosd-0.0.1/doc/html/home.png
deleted file mode 100644
index 1700361..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/doc/html/home.png
+++ /dev/null
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/doc/html/index.html b/abs/mv-core/ghosd/ghosd-0.0.1/doc/html/index.html
deleted file mode 100644
index b724335..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/doc/html/index.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=US-ASCII">
-<title>Ghosd Manual</title>
-<meta name="generator" content="DocBook XSL Stylesheets V1.68.1">
-<link rel="start" href="index.html" title="Ghosd Manual">
-<link rel="next" href="ch01.html" title="Reference">
-<meta name="generator" content="GTK-Doc V1.4 (XML mode)">
-<link rel="stylesheet" href="style.css" type="text/css">
-<link rel="chapter" href="ch01.html" title="Reference">
-</head>
-<body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
-<div class="book" lang="en">
-<div class="titlepage">
-<div>
-<div><table class="navigation" width="100%" cellpadding="2" cellspacing="0"><tr><th valign="middle"><p class="title">Ghosd Manual</p></th></tr></table></div>
-<div><div class="author"><h3 class="author">
-<span class="firstname">Evan</span> <span class="surname">Martin</span>
-</h3></div></div>
-<div><p class="copyright">Copyright &#169; 2006 Evan Martin</p></div>
-</div>
-<hr>
-</div>
-<div class="toc">
-<p><b>Table of Contents</b></p>
-<dl>
-<dt><span class="chapter"><a href="ch01.html">Reference</a></span></dt>
-<dd><dl>
-<dt>
-<span class="refentrytitle"><a href="ghosd-Basics.html">Basics</a></span><span class="refpurpose"> - Creation, rendering, destruction.</span>
-</dt>
-<dt>
-<span class="refentrytitle"><a href="ghosd-Main-Loop.html">Main Loop</a></span><span class="refpurpose"> - Running an app using Ghosd.</span>
-</dt>
-<dt>
-<span class="refentrytitle"><a href="ghosd-Text.html">Text</a></span><span class="refpurpose"> - Rendering text.</span>
-</dt>
-</dl></dd>
-</dl>
-</div>
-</div>
-<table class="navigation" width="100%" summary="Navigation footer" cellpadding="2" cellspacing="0"><tr valign="middle">
-<td align="left"></td>
-<td align="right"><a accesskey="n" href="ch01.html"><b>Reference&#160;&gt;&gt;</b></a></td>
-</tr></table>
-</body>
-</html>
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/doc/html/index.sgml b/abs/mv-core/ghosd/ghosd-0.0.1/doc/html/index.sgml
deleted file mode 100644
index c82e15a..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/doc/html/index.sgml
+++ /dev/null
@@ -1,17 +0,0 @@
-<ANCHOR id="ghosd-Basics" href="ghosd/ghosd-Basics.html">
-<ANCHOR id="Ghosd" href="ghosd/ghosd-Basics.html#Ghosd">
-<ANCHOR id="GhosdRenderFunc" href="ghosd/ghosd-Basics.html#GhosdRenderFunc">
-<ANCHOR id="ghosd-new" href="ghosd/ghosd-Basics.html#ghosd-new">
-<ANCHOR id="ghosd-set-transparent" href="ghosd/ghosd-Basics.html#ghosd-set-transparent">
-<ANCHOR id="GHOSD-COORD-CENTER:CAPS" href="ghosd/ghosd-Basics.html#GHOSD-COORD-CENTER:CAPS">
-<ANCHOR id="ghosd-set-position" href="ghosd/ghosd-Basics.html#ghosd-set-position">
-<ANCHOR id="ghosd-set-render" href="ghosd/ghosd-Basics.html#ghosd-set-render">
-<ANCHOR id="ghosd-render" href="ghosd/ghosd-Basics.html#ghosd-render">
-<ANCHOR id="ghosd-show" href="ghosd/ghosd-Basics.html#ghosd-show">
-<ANCHOR id="ghosd-Main-Loop" href="ghosd/ghosd-Main-Loop.html">
-<ANCHOR id="ghosd-main-iterations" href="ghosd/ghosd-Main-Loop.html#ghosd-main-iterations">
-<ANCHOR id="ghosd-main-until" href="ghosd/ghosd-Main-Loop.html#ghosd-main-until">
-<ANCHOR id="ghosd-flash" href="ghosd/ghosd-Main-Loop.html#ghosd-flash">
-<ANCHOR id="ghosd-get-socket" href="ghosd/ghosd-Main-Loop.html#ghosd-get-socket">
-<ANCHOR id="ghosd-Text" href="ghosd/ghosd-Text.html">
-<ANCHOR id="ghosd-text-set-position" href="ghosd/ghosd-Text.html#ghosd-text-set-position">
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/doc/html/left.png b/abs/mv-core/ghosd/ghosd-0.0.1/doc/html/left.png
deleted file mode 100644
index 2d05b3d..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/doc/html/left.png
+++ /dev/null
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/doc/html/right.png b/abs/mv-core/ghosd/ghosd-0.0.1/doc/html/right.png
deleted file mode 100644
index 92832e3..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/doc/html/right.png
+++ /dev/null
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/doc/html/style.css b/abs/mv-core/ghosd/ghosd-0.0.1/doc/html/style.css
deleted file mode 100644
index c9cabe7..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/doc/html/style.css
+++ /dev/null
@@ -1,66 +0,0 @@
-.synopsis, .classsynopsis 
-{
-  background: #eeeeee;
-  border: solid 1px #aaaaaa;
-  padding: 0.5em;
-}
-.programlisting 
-{
-  background: #eeeeff;
-  border: solid 1px #aaaaff;
-  padding: 0.5em;
-}
-.variablelist 
-{
-  padding: 4px;
-  margin-left: 3em;
-}
-.variablelist td:first-child
-{
-  vertical-align: top;
-}
-table.navigation 
-{
-  background: #ffeeee;
-  border: solid 1px #ffaaaa;
-  margin-top: 0.5em;
-  margin-bottom: 0.5em;
-}
-.navigation a 
-{
-  color: #770000;
-}
-.navigation a:visited 
-{
-  color: #550000;
-}
-.navigation .title 
-{
-  font-size: 200%;
-}
-div.refnamediv 
-{
-  margin-top: 2em;
-}
-div.gallery-float 
-{
-  float: left;
-  padding: 10px;
-}
-div.gallery-float img 
-{
-  border-style: none;
-}
-div.gallery-spacer 
-{
-  clear: both;
-}
-a
-{
-  text-decoration: none;
-}
-a:hover
-{
-  text-decoration: underline;
-  color: #FF0000;
-}
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/doc/html/up.png b/abs/mv-core/ghosd/ghosd-0.0.1/doc/html/up.png
deleted file mode 100644
index 85b3e2a..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/doc/html/up.png
+++ /dev/null
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/doc/tmpl/ghosd-unused.sgml b/abs/mv-core/ghosd/ghosd-0.0.1/doc/tmpl/ghosd-unused.sgml
deleted file mode 100644
index e69de29..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/doc/tmpl/ghosd-unused.sgml
+++ /dev/null
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/doc/tmpl/ghosd.sgml b/abs/mv-core/ghosd/ghosd-0.0.1/doc/tmpl/ghosd.sgml
deleted file mode 100644
index a0f740c..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/doc/tmpl/ghosd.sgml
+++ /dev/null
@@ -1,98 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Basics
-
-<!-- ##### SECTION Short_Description ##### -->
-Creation, rendering, destruction.
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### STRUCT Ghosd ##### -->
-<para>
-An opaque Ghosd object.  Think of it as the window that the content is
-displayed in.
-</para>
-
-
-<!-- ##### USER_FUNCTION GhosdRenderFunc ##### -->
-<para>
-The type of callback called when Ghosd needs to render the content.
-</para>
-
-@ghosd: A #Ghosd object.
-@cr: A #cairo_t to draw on.
-@user_data: User data that was passed to ghosd_set_render().
-
-
-<!-- ##### FUNCTION ghosd_new ##### -->
-<para>
-
-</para>
-
-@Returns: 
-
-
-<!-- ##### FUNCTION ghosd_set_transparent ##### -->
-<para>
-
-</para>
-
-@ghosd: 
-@transparent: 
-
-
-<!-- ##### MACRO GHOSD_COORD_CENTER ##### -->
-<para>
-Pass this as a coordinate to ghosd_set_position() to center along that axis.
-</para>
-
-
-
-<!-- ##### FUNCTION ghosd_set_position ##### -->
-<para>
-
-</para>
-
-@ghosd: 
-@x: 
-@y: 
-@width: 
-@height: 
-
-
-<!-- ##### FUNCTION ghosd_set_render ##### -->
-<para>
-
-</para>
-
-@ghosd: 
-@render_func: 
-@data: 
-
-
-<!-- ##### FUNCTION ghosd_render ##### -->
-<para>
-
-</para>
-
-@ghosd: 
-
-
-<!-- ##### FUNCTION ghosd_show ##### -->
-<para>
-
-</para>
-
-@ghosd: 
-
-
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/doc/tmpl/main-loop.sgml b/abs/mv-core/ghosd/ghosd-0.0.1/doc/tmpl/main-loop.sgml
deleted file mode 100644
index ed4708d..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/doc/tmpl/main-loop.sgml
+++ /dev/null
@@ -1,55 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Main Loop
-
-<!-- ##### SECTION Short_Description ##### -->
-Running an app using Ghosd.
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### FUNCTION ghosd_main_iterations ##### -->
-<para>
-
-</para>
-
-@ghosd: 
-
-
-<!-- ##### FUNCTION ghosd_main_until ##### -->
-<para>
-
-</para>
-
-@ghosd: 
-@until: 
-
-
-<!-- ##### FUNCTION ghosd_flash ##### -->
-<para>
-
-</para>
-
-@ghosd: 
-@fade_ms: 
-@total_display_ms: 
-
-
-<!-- ##### FUNCTION ghosd_get_socket ##### -->
-<para>
-
-</para>
-
-@ghosd: 
-@Returns: 
-
-
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/doc/tmpl/text.sgml b/abs/mv-core/ghosd/ghosd-0.0.1/doc/tmpl/text.sgml
deleted file mode 100644
index 4ea3b68..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/doc/tmpl/text.sgml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!-- ##### SECTION Title ##### -->
-Text
-
-<!-- ##### SECTION Short_Description ##### -->
-Rendering text.
-
-<!-- ##### SECTION Long_Description ##### -->
-<para>
-I expect to flesh out this API, so this is mostly a placeholder for now.
-</para>
-
-<!-- ##### SECTION See_Also ##### -->
-<para>
-
-</para>
-
-<!-- ##### SECTION Stability_Level ##### -->
-
-
-<!-- ##### FUNCTION ghosd_text_set_position ##### -->
-<para>
-
-</para>
-
-@ghosd: 
-@x: 
-@y: 
-@layout: 
-
-
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/doc/xml/ghosd.xml b/abs/mv-core/ghosd/ghosd-0.0.1/doc/xml/ghosd.xml
deleted file mode 100644
index 5aac1c0..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/doc/xml/ghosd.xml
+++ /dev/null
@@ -1,209 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
-<refentry id="ghosd-Basics">
-<refmeta>
-<refentrytitle>Basics</refentrytitle>
-<manvolnum>3</manvolnum>
-<refmiscinfo>GHOSD Library</refmiscinfo>
-</refmeta>
-
-<refnamediv>
-<refname>Basics</refname><refpurpose>Creation, rendering, destruction.</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv><title>Synopsis</title>
-
-<synopsis>
-
-#include &lt;ghosd/ghosd.h&gt;
-
-
-            <link linkend="Ghosd">Ghosd</link>;
-<link linkend="void">void</link>        (<link linkend="GhosdRenderFunc">*GhosdRenderFunc</link>)              (<link linkend="Ghosd">Ghosd</link> *ghosd,
-                                             <link linkend="cairo-t">cairo_t</link> *cr,
-                                             <link linkend="void">void</link> *user_data);
-<link linkend="Ghosd">Ghosd</link>*      <link linkend="ghosd-new">ghosd_new</link>                       (void);
-<link linkend="void">void</link>        <link linkend="ghosd-set-transparent">ghosd_set_transparent</link>           (<link linkend="Ghosd">Ghosd</link> *ghosd,
-                                             <link linkend="int">int</link> transparent);
-#define     <link linkend="GHOSD-COORD-CENTER:CAPS">GHOSD_COORD_CENTER</link>
-<link linkend="void">void</link>        <link linkend="ghosd-set-position">ghosd_set_position</link>              (<link linkend="Ghosd">Ghosd</link> *ghosd,
-                                             <link linkend="int">int</link> x,
-                                             <link linkend="int">int</link> y,
-                                             <link linkend="int">int</link> width,
-                                             <link linkend="int">int</link> height);
-<link linkend="void">void</link>        <link linkend="ghosd-set-render">ghosd_set_render</link>                (<link linkend="Ghosd">Ghosd</link> *ghosd,
-                                             <link linkend="GhosdRenderFunc">GhosdRenderFunc</link> render_func,
-                                             <link linkend="void">void</link> *data);
-<link linkend="void">void</link>        <link linkend="ghosd-render">ghosd_render</link>                    (<link linkend="Ghosd">Ghosd</link> *ghosd);
-<link linkend="void">void</link>        <link linkend="ghosd-show">ghosd_show</link>                      (<link linkend="Ghosd">Ghosd</link> *ghosd);
-</synopsis>
-</refsynopsisdiv>
-
-
-
-
-
-
-
-
-
-<refsect1>
-<title>Description</title>
-<para>
-
-</para>
-</refsect1>
-
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="Ghosd"/>Ghosd</title>
-<indexterm><primary>Ghosd</primary></indexterm><programlisting>typedef struct _Ghosd Ghosd;</programlisting>
-<para>
-An opaque Ghosd object.  Think of it as the window that the content is
-displayed in.
-</para></refsect2>
-<refsect2>
-<title><anchor id="GhosdRenderFunc"/>GhosdRenderFunc ()</title>
-<indexterm><primary>GhosdRenderFunc</primary></indexterm><programlisting><link linkend="void">void</link>        (*GhosdRenderFunc)              (<link linkend="Ghosd">Ghosd</link> *ghosd,
-                                             <link linkend="cairo-t">cairo_t</link> *cr,
-                                             <link linkend="void">void</link> *user_data);</programlisting>
-<para>
-The type of callback called when Ghosd needs to render the content.
-</para><variablelist role="params">
-<varlistentry><term><parameter>ghosd</parameter>&nbsp;:</term>
-<listitem><simpara>A <link linkend="Ghosd"><type>Ghosd</type></link> object.
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>cr</parameter>&nbsp;:</term>
-<listitem><simpara>A <link linkend="cairo-t"><type>cairo_t</type></link> to draw on.
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>user_data</parameter>&nbsp;:</term>
-<listitem><simpara>User data that was passed to <link linkend="ghosd-set-render"><function>ghosd_set_render()</function></link>.
-
-
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="ghosd-new"/>ghosd_new ()</title>
-<indexterm><primary>ghosd_new</primary></indexterm><programlisting><link linkend="Ghosd">Ghosd</link>*      ghosd_new                       (void);</programlisting>
-<para>
-Create a new <link linkend="Ghosd"><type>Ghosd</type></link> object.
-</para>
-<para>
-Can return <literal>NULL</literal> if unable to connect to the X server.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara> a new <link linkend="Ghosd"><type>Ghosd</type></link> object.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="ghosd-set-transparent"/>ghosd_set_transparent ()</title>
-<indexterm><primary>ghosd_set_transparent</primary></indexterm><programlisting><link linkend="void">void</link>        ghosd_set_transparent           (<link linkend="Ghosd">Ghosd</link> *ghosd,
-                                             <link linkend="int">int</link> transparent);</programlisting>
-<para>
-Change the "transparent" setting.  Setting <parameter>transparent</parameter> to <literal>FALSE</literal> is
-mostly useful for debugging.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>ghosd</parameter>&nbsp;:</term>
-<listitem><simpara> a <link linkend="Ghosd"><type>Ghosd</type></link> object.
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>transparent</parameter>&nbsp;:</term>
-<listitem><simpara> a boolean indicating the transparent setting.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="GHOSD-COORD-CENTER:CAPS"/>GHOSD_COORD_CENTER</title>
-<indexterm><primary>GHOSD_COORD_CENTER</primary></indexterm><programlisting>#define GHOSD_COORD_CENTER MAXINT
-</programlisting>
-<para>
-Pass this as a coordinate to <link linkend="ghosd-set-position"><function>ghosd_set_position()</function></link> to center along that axis.
-</para></refsect2>
-<refsect2>
-<title><anchor id="ghosd-set-position"/>ghosd_set_position ()</title>
-<indexterm><primary>ghosd_set_position</primary></indexterm><programlisting><link linkend="void">void</link>        ghosd_set_position              (<link linkend="Ghosd">Ghosd</link> *ghosd,
-                                             <link linkend="int">int</link> x,
-                                             <link linkend="int">int</link> y,
-                                             <link linkend="int">int</link> width,
-                                             <link linkend="int">int</link> height);</programlisting>
-<para>
-Position the initial <link linkend="Ghosd"><type>Ghosd</type></link>.  Must be called before <link linkend="ghosd-render"><function>ghosd_render()</function></link> and
-<link linkend="ghosd-show"><function>ghosd_show()</function></link>, and can only be called once.
-</para>
-<para>
-Positive x,y are interpreted as normal coordinates.
-Pass <literal>GHOSD_COORD_CENTER</literal> to center on a given dimension,
-and negative coordinates right-align (like CSS right).</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>ghosd</parameter>&nbsp;:</term>
-<listitem><simpara> a <link linkend="Ghosd"><type>Ghosd</type></link> object.
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>x</parameter>&nbsp;:</term>
-<listitem><simpara> x coordinate in screen pixels.
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>y</parameter>&nbsp;:</term>
-<listitem><simpara> y coordinate in screen pixels.
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>width</parameter>&nbsp;:</term>
-<listitem><simpara> width in screen pixels.
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>height</parameter>&nbsp;:</term>
-<listitem><simpara> width in screen pixels.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="ghosd-set-render"/>ghosd_set_render ()</title>
-<indexterm><primary>ghosd_set_render</primary></indexterm><programlisting><link linkend="void">void</link>        ghosd_set_render                (<link linkend="Ghosd">Ghosd</link> *ghosd,
-                                             <link linkend="GhosdRenderFunc">GhosdRenderFunc</link> render_func,
-                                             <link linkend="void">void</link> *data);</programlisting>
-<para>
-Register a function to draw on the <link linkend="Ghosd"><type>Ghosd</type></link>.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>ghosd</parameter>&nbsp;:</term>
-<listitem><simpara> a <link linkend="Ghosd"><type>Ghosd</type></link> object.
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>render_func</parameter>&nbsp;:</term>
-<listitem><simpara> a <link linkend="GhosdRenderFunc"><type>GhosdRenderFunc</type></link> callback.
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>data</parameter>&nbsp;:</term>
-<listitem><simpara> user data to pass to the callback.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="ghosd-render"/>ghosd_render ()</title>
-<indexterm><primary>ghosd_render</primary></indexterm><programlisting><link linkend="void">void</link>        ghosd_render                    (<link linkend="Ghosd">Ghosd</link> *ghosd);</programlisting>
-<para>
-Makes the Ghosd redraw itself.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>ghosd</parameter>&nbsp;:</term>
-<listitem><simpara> a <link linkend="Ghosd"><type>Ghosd</type></link> object.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="ghosd-show"/>ghosd_show ()</title>
-<indexterm><primary>ghosd_show</primary></indexterm><programlisting><link linkend="void">void</link>        ghosd_show                      (<link linkend="Ghosd">Ghosd</link> *ghosd);</programlisting>
-<para>
-Show the <link linkend="Ghosd"><type>Ghosd</type></link>.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>ghosd</parameter>&nbsp;:</term>
-<listitem><simpara> a <link linkend="Ghosd"><type>Ghosd</type></link> object.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-
-</refsect1>
-
-
-
-
-</refentry>
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/doc/xml/main-loop.xml b/abs/mv-core/ghosd/ghosd-0.0.1/doc/xml/main-loop.xml
deleted file mode 100644
index 645bd96..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/doc/xml/main-loop.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
-<refentry id="ghosd-Main-Loop">
-<refmeta>
-<refentrytitle>Main Loop</refentrytitle>
-<manvolnum>3</manvolnum>
-<refmiscinfo>GHOSD Library</refmiscinfo>
-</refmeta>
-
-<refnamediv>
-<refname>Main Loop</refname><refpurpose>Running an app using Ghosd.</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv><title>Synopsis</title>
-
-<synopsis>
-
-#include &lt;ghosd/ghosd.h&gt;
-
-
-<link linkend="void">void</link>        <link linkend="ghosd-main-iterations">ghosd_main_iterations</link>           (<link linkend="Ghosd">Ghosd</link> *ghosd);
-<link linkend="void">void</link>        <link linkend="ghosd-main-until">ghosd_main_until</link>                (<link linkend="Ghosd">Ghosd</link> *ghosd,
-                                             struct <link linkend="timeval">timeval</link> *until);
-<link linkend="void">void</link>        <link linkend="ghosd-flash">ghosd_flash</link>                     (<link linkend="Ghosd">Ghosd</link> *ghosd,
-                                             <link linkend="int">int</link> fade_ms,
-                                             <link linkend="int">int</link> total_display_ms);
-<link linkend="int">int</link>         <link linkend="ghosd-get-socket">ghosd_get_socket</link>                (<link linkend="Ghosd">Ghosd</link> *ghosd);
-</synopsis>
-</refsynopsisdiv>
-
-
-
-
-
-
-
-
-
-<refsect1>
-<title>Description</title>
-<para>
-
-</para>
-</refsect1>
-
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="ghosd-main-iterations"/>ghosd_main_iterations ()</title>
-<indexterm><primary>ghosd_main_iterations</primary></indexterm><programlisting><link linkend="void">void</link>        ghosd_main_iterations           (<link linkend="Ghosd">Ghosd</link> *ghosd);</programlisting>
-<para>
-Iterate the main loop on the <link linkend="Ghosd"><type>Ghosd</type></link>, handling all pending X events.
-This function does not wait for X events, so it returns immediately
-unless there are already events pending.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>ghosd</parameter>&nbsp;:</term>
-<listitem><simpara> a <link linkend="Ghosd"><type>Ghosd</type></link> object.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="ghosd-main-until"/>ghosd_main_until ()</title>
-<indexterm><primary>ghosd_main_until</primary></indexterm><programlisting><link linkend="void">void</link>        ghosd_main_until                (<link linkend="Ghosd">Ghosd</link> *ghosd,
-                                             struct <link linkend="timeval">timeval</link> *until);</programlisting>
-<para>
-Efficiently iterate the main loop on the <link linkend="Ghosd"><type>Ghosd</type></link>, handling all pending X
-events, until the current time reaches the time specified in <parameter>until</parameter>.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>ghosd</parameter>&nbsp;:</term>
-<listitem><simpara> a <link linkend="Ghosd"><type>Ghosd</type></link> object.
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>until</parameter>&nbsp;:</term>
-<listitem><simpara> a pointer to a timeval to update until.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="ghosd-flash"/>ghosd_flash ()</title>
-<indexterm><primary>ghosd_flash</primary></indexterm><programlisting><link linkend="void">void</link>        ghosd_flash                     (<link linkend="Ghosd">Ghosd</link> *ghosd,
-                                             <link linkend="int">int</link> fade_ms,
-                                             <link linkend="int">int</link> total_display_ms);</programlisting>
-<para>
-Fade in a <link linkend="Ghosd"><type>Ghosd</type></link>, display at full opacity for a while, fade out, and then
-return.
-This is easy enough to implement using <link linkend="ghosd-main-until"><function>ghosd_main_until()</function></link>, but is a 
-a common enough use of Ghosd to make it a builtin.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>ghosd</parameter>&nbsp;:</term>
-<listitem><simpara> a <link linkend="Ghosd"><type>Ghosd</type></link> object.
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>fade_ms</parameter>&nbsp;:</term>
-<listitem><simpara> how long to fade, in milliseconds.
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>total_display_ms</parameter>&nbsp;:</term>
-<listitem><simpara> total display time, including fades, in milliseconds.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-<refsect2>
-<title><anchor id="ghosd-get-socket"/>ghosd_get_socket ()</title>
-<indexterm><primary>ghosd_get_socket</primary></indexterm><programlisting><link linkend="int">int</link>         ghosd_get_socket                (<link linkend="Ghosd">Ghosd</link> *ghosd);</programlisting>
-<para>
-Get the file descriptor of the Ghosd X socket.  When this file descriptor
-has data available, call <link linkend="ghosd-main-iterations"><function>ghosd_main_iterations()</function></link> to process the pending X
-events.  Use this with <link linkend="select"><function>select()</function></link>/<link linkend="poll"><function>poll()</function></link> etc. to multiplex Ghosd with other
-processing.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>ghosd</parameter>&nbsp;:</term>
-<listitem><simpara> a <link linkend="Ghosd"><type>Ghosd</type></link> object.
-</simpara></listitem></varlistentry>
-<varlistentry><term><emphasis>Returns</emphasis>&nbsp;:</term><listitem><simpara> a file descriptor, suitable for use in <link linkend="select"><function>select()</function></link> or <link linkend="poll"><function>poll()</function></link>.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-
-</refsect1>
-
-
-
-
-</refentry>
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/doc/xml/text.xml b/abs/mv-core/ghosd/ghosd-0.0.1/doc/xml/text.xml
deleted file mode 100644
index 777d78b..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/doc/xml/text.xml
+++ /dev/null
@@ -1,77 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
-               "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd">
-<refentry id="ghosd-Text">
-<refmeta>
-<refentrytitle>Text</refentrytitle>
-<manvolnum>3</manvolnum>
-<refmiscinfo>GHOSD Library</refmiscinfo>
-</refmeta>
-
-<refnamediv>
-<refname>Text</refname><refpurpose>Rendering text.</refpurpose>
-</refnamediv>
-
-<refsynopsisdiv><title>Synopsis</title>
-
-<synopsis>
-
-#include &lt;ghosd/ghosd-text.h&gt;
-
-
-<link linkend="void">void</link>        <link linkend="ghosd-text-set-position">ghosd_text_set_position</link>         (<link linkend="Ghosd">Ghosd</link> *ghosd,
-                                             <link linkend="int">int</link> x,
-                                             <link linkend="int">int</link> y,
-                                             <link linkend="PangoLayout">PangoLayout</link> *layout);
-</synopsis>
-</refsynopsisdiv>
-
-
-
-
-
-
-
-
-
-<refsect1>
-<title>Description</title>
-<para>
-I expect to flesh out this API, so this is mostly a placeholder for now.
-</para>
-</refsect1>
-
-<refsect1>
-<title>Details</title>
-<refsect2>
-<title><anchor id="ghosd-text-set-position"/>ghosd_text_set_position ()</title>
-<indexterm><primary>ghosd_text_set_position</primary></indexterm><programlisting><link linkend="void">void</link>        ghosd_text_set_position         (<link linkend="Ghosd">Ghosd</link> *ghosd,
-                                             <link linkend="int">int</link> x,
-                                             <link linkend="int">int</link> y,
-                                             <link linkend="PangoLayout">PangoLayout</link> *layout);</programlisting>
-<para>
-Set ghosd dimensions based on a <link linkend="PangoLayout"><type>PangoLayout</type></link>.
-See <link linkend="ghosd-set-position"><function>ghosd_set_position()</function></link> for interpretation of the x and y coordinates.</para>
-<para>
-
-</para><variablelist role="params">
-<varlistentry><term><parameter>ghosd</parameter>&nbsp;:</term>
-<listitem><simpara> a <link linkend="Ghosd"><type>Ghosd</type></link> object;
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>x</parameter>&nbsp;:</term>
-<listitem><simpara> x coordinate in screen pixels.
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>y</parameter>&nbsp;:</term>
-<listitem><simpara> y coordinate in screen pixels.
-</simpara></listitem></varlistentry>
-<varlistentry><term><parameter>layout</parameter>&nbsp;:</term>
-<listitem><simpara> the <link linkend="PangoLayout"><type>PangoLayout</type></link> to draw.
-</simpara></listitem></varlistentry>
-</variablelist></refsect2>
-
-</refsect1>
-
-
-
-
-</refentry>
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/examples/.deps/animation.Po b/abs/mv-core/ghosd/ghosd-0.0.1/examples/.deps/animation.Po
deleted file mode 100644
index ff514dc..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/examples/.deps/animation.Po
+++ /dev/null
@@ -1,101 +0,0 @@
-animation.o animation.o: animation.c /usr/include/stdio.h \
-  /usr/include/features.h /usr/include/sys/cdefs.h \
-  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
-  /usr/include/gnu/stubs-32.h \
-  /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/stddef.h \
-  /usr/include/bits/types.h /usr/include/bits/typesizes.h \
-  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
-  /usr/include/bits/wchar.h /usr/include/gconv.h \
-  /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/stdarg.h \
-  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h /usr/include/sys/time.h /usr/include/time.h \
-  /usr/include/bits/time.h /usr/include/sys/select.h \
-  /usr/include/bits/select.h /usr/include/bits/sigset.h \
-  /usr/include/sys/poll.h /usr/include/bits/poll.h \
-  /usr/include/cairo/cairo.h /usr/include/cairo/cairo-features.h \
-  /usr/include/cairo/cairo-deprecated.h ../ghosd/ghosd.h \
-  /usr/include/values.h \
-  /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/limits.h \
-  /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/syslimits.h \
-  /usr/include/limits.h /usr/include/bits/posix1_lim.h \
-  /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
-  /usr/include/bits/posix2_lim.h \
-  /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/float.h
-
-/usr/include/stdio.h:
-
-/usr/include/features.h:
-
-/usr/include/sys/cdefs.h:
-
-/usr/include/bits/wordsize.h:
-
-/usr/include/gnu/stubs.h:
-
-/usr/include/gnu/stubs-32.h:
-
-/usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/stddef.h:
-
-/usr/include/bits/types.h:
-
-/usr/include/bits/typesizes.h:
-
-/usr/include/libio.h:
-
-/usr/include/_G_config.h:
-
-/usr/include/wchar.h:
-
-/usr/include/bits/wchar.h:
-
-/usr/include/gconv.h:
-
-/usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/stdarg.h:
-
-/usr/include/bits/stdio_lim.h:
-
-/usr/include/bits/sys_errlist.h:
-
-/usr/include/bits/stdio.h:
-
-/usr/include/sys/time.h:
-
-/usr/include/time.h:
-
-/usr/include/bits/time.h:
-
-/usr/include/sys/select.h:
-
-/usr/include/bits/select.h:
-
-/usr/include/bits/sigset.h:
-
-/usr/include/sys/poll.h:
-
-/usr/include/bits/poll.h:
-
-/usr/include/cairo/cairo.h:
-
-/usr/include/cairo/cairo-features.h:
-
-/usr/include/cairo/cairo-deprecated.h:
-
-../ghosd/ghosd.h:
-
-/usr/include/values.h:
-
-/usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/limits.h:
-
-/usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/syslimits.h:
-
-/usr/include/limits.h:
-
-/usr/include/bits/posix1_lim.h:
-
-/usr/include/bits/local_lim.h:
-
-/usr/include/linux/limits.h:
-
-/usr/include/bits/posix2_lim.h:
-
-/usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/float.h:
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/examples/.deps/example-shared.Plo b/abs/mv-core/ghosd/ghosd-0.0.1/examples/.deps/example-shared.Plo
deleted file mode 100644
index bbd71e1..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/examples/.deps/example-shared.Plo
+++ /dev/null
@@ -1,240 +0,0 @@
-example-shared.lo example-shared.o: example-shared.c \
-  /usr/include/glib-2.0/glib.h /usr/include/glib-2.0/glib/galloca.h \
-  /usr/include/glib-2.0/glib/gtypes.h \
-  /usr/lib/glib-2.0/include/glibconfig.h \
-  /usr/include/glib-2.0/glib/gmacros.h \
-  /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/stddef.h \
-  /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/limits.h \
-  /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/syslimits.h \
-  /usr/include/limits.h /usr/include/features.h /usr/include/sys/cdefs.h \
-  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
-  /usr/include/gnu/stubs-32.h /usr/include/bits/posix1_lim.h \
-  /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
-  /usr/include/bits/posix2_lim.h \
-  /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/float.h \
-  /usr/include/glib-2.0/glib/garray.h \
-  /usr/include/glib-2.0/glib/gasyncqueue.h \
-  /usr/include/glib-2.0/glib/gthread.h \
-  /usr/include/glib-2.0/glib/gerror.h /usr/include/glib-2.0/glib/gquark.h \
-  /usr/include/glib-2.0/glib/gutils.h \
-  /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/stdarg.h \
-  /usr/include/glib-2.0/glib/gatomic.h \
-  /usr/include/glib-2.0/glib/gbacktrace.h \
-  /usr/include/glib-2.0/glib/gbase64.h \
-  /usr/include/glib-2.0/glib/gbookmarkfile.h /usr/include/time.h \
-  /usr/include/bits/time.h /usr/include/bits/types.h \
-  /usr/include/bits/typesizes.h /usr/include/glib-2.0/glib/gcache.h \
-  /usr/include/glib-2.0/glib/glist.h /usr/include/glib-2.0/glib/gmem.h \
-  /usr/include/glib-2.0/glib/gslice.h \
-  /usr/include/glib-2.0/glib/gcompletion.h \
-  /usr/include/glib-2.0/glib/gconvert.h \
-  /usr/include/glib-2.0/glib/gdataset.h \
-  /usr/include/glib-2.0/glib/gdate.h /usr/include/glib-2.0/glib/gdir.h \
-  /usr/include/glib-2.0/glib/gfileutils.h \
-  /usr/include/glib-2.0/glib/ghash.h /usr/include/glib-2.0/glib/ghook.h \
-  /usr/include/glib-2.0/glib/giochannel.h \
-  /usr/include/glib-2.0/glib/gmain.h /usr/include/glib-2.0/glib/gslist.h \
-  /usr/include/glib-2.0/glib/gstring.h \
-  /usr/include/glib-2.0/glib/gunicode.h \
-  /usr/include/glib-2.0/glib/gkeyfile.h \
-  /usr/include/glib-2.0/glib/gmappedfile.h \
-  /usr/include/glib-2.0/glib/gmarkup.h \
-  /usr/include/glib-2.0/glib/gmessages.h \
-  /usr/include/glib-2.0/glib/gnode.h /usr/include/glib-2.0/glib/goption.h \
-  /usr/include/glib-2.0/glib/gpattern.h \
-  /usr/include/glib-2.0/glib/gprimes.h \
-  /usr/include/glib-2.0/glib/gqsort.h /usr/include/glib-2.0/glib/gqueue.h \
-  /usr/include/glib-2.0/glib/grand.h /usr/include/glib-2.0/glib/grel.h \
-  /usr/include/glib-2.0/glib/gregex.h \
-  /usr/include/glib-2.0/glib/gscanner.h \
-  /usr/include/glib-2.0/glib/gsequence.h \
-  /usr/include/glib-2.0/glib/gshell.h /usr/include/glib-2.0/glib/gspawn.h \
-  /usr/include/glib-2.0/glib/gstrfuncs.h \
-  /usr/include/glib-2.0/glib/gthreadpool.h \
-  /usr/include/glib-2.0/glib/gtimer.h /usr/include/glib-2.0/glib/gtree.h \
-  /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/endian.h \
-  /usr/include/bits/endian.h /usr/include/sys/select.h \
-  /usr/include/bits/select.h /usr/include/bits/sigset.h \
-  /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
-  /usr/include/alloca.h ../ghosd/ghosd.h /usr/include/cairo/cairo.h \
-  /usr/include/cairo/cairo-features.h \
-  /usr/include/cairo/cairo-deprecated.h /usr/include/values.h \
-  /usr/include/sys/time.h example-shared.h
-
-/usr/include/glib-2.0/glib.h:
-
-/usr/include/glib-2.0/glib/galloca.h:
-
-/usr/include/glib-2.0/glib/gtypes.h:
-
-/usr/lib/glib-2.0/include/glibconfig.h:
-
-/usr/include/glib-2.0/glib/gmacros.h:
-
-/usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/stddef.h:
-
-/usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/limits.h:
-
-/usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/syslimits.h:
-
-/usr/include/limits.h:
-
-/usr/include/features.h:
-
-/usr/include/sys/cdefs.h:
-
-/usr/include/bits/wordsize.h:
-
-/usr/include/gnu/stubs.h:
-
-/usr/include/gnu/stubs-32.h:
-
-/usr/include/bits/posix1_lim.h:
-
-/usr/include/bits/local_lim.h:
-
-/usr/include/linux/limits.h:
-
-/usr/include/bits/posix2_lim.h:
-
-/usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/float.h:
-
-/usr/include/glib-2.0/glib/garray.h:
-
-/usr/include/glib-2.0/glib/gasyncqueue.h:
-
-/usr/include/glib-2.0/glib/gthread.h:
-
-/usr/include/glib-2.0/glib/gerror.h:
-
-/usr/include/glib-2.0/glib/gquark.h:
-
-/usr/include/glib-2.0/glib/gutils.h:
-
-/usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/stdarg.h:
-
-/usr/include/glib-2.0/glib/gatomic.h:
-
-/usr/include/glib-2.0/glib/gbacktrace.h:
-
-/usr/include/glib-2.0/glib/gbase64.h:
-
-/usr/include/glib-2.0/glib/gbookmarkfile.h:
-
-/usr/include/time.h:
-
-/usr/include/bits/time.h:
-
-/usr/include/bits/types.h:
-
-/usr/include/bits/typesizes.h:
-
-/usr/include/glib-2.0/glib/gcache.h:
-
-/usr/include/glib-2.0/glib/glist.h:
-
-/usr/include/glib-2.0/glib/gmem.h:
-
-/usr/include/glib-2.0/glib/gslice.h:
-
-/usr/include/glib-2.0/glib/gcompletion.h:
-
-/usr/include/glib-2.0/glib/gconvert.h:
-
-/usr/include/glib-2.0/glib/gdataset.h:
-
-/usr/include/glib-2.0/glib/gdate.h:
-
-/usr/include/glib-2.0/glib/gdir.h:
-
-/usr/include/glib-2.0/glib/gfileutils.h:
-
-/usr/include/glib-2.0/glib/ghash.h:
-
-/usr/include/glib-2.0/glib/ghook.h:
-
-/usr/include/glib-2.0/glib/giochannel.h:
-
-/usr/include/glib-2.0/glib/gmain.h:
-
-/usr/include/glib-2.0/glib/gslist.h:
-
-/usr/include/glib-2.0/glib/gstring.h:
-
-/usr/include/glib-2.0/glib/gunicode.h:
-
-/usr/include/glib-2.0/glib/gkeyfile.h:
-
-/usr/include/glib-2.0/glib/gmappedfile.h:
-
-/usr/include/glib-2.0/glib/gmarkup.h:
-
-/usr/include/glib-2.0/glib/gmessages.h:
-
-/usr/include/glib-2.0/glib/gnode.h:
-
-/usr/include/glib-2.0/glib/goption.h:
-
-/usr/include/glib-2.0/glib/gpattern.h:
-
-/usr/include/glib-2.0/glib/gprimes.h:
-
-/usr/include/glib-2.0/glib/gqsort.h:
-
-/usr/include/glib-2.0/glib/gqueue.h:
-
-/usr/include/glib-2.0/glib/grand.h:
-
-/usr/include/glib-2.0/glib/grel.h:
-
-/usr/include/glib-2.0/glib/gregex.h:
-
-/usr/include/glib-2.0/glib/gscanner.h:
-
-/usr/include/glib-2.0/glib/gsequence.h:
-
-/usr/include/glib-2.0/glib/gshell.h:
-
-/usr/include/glib-2.0/glib/gspawn.h:
-
-/usr/include/glib-2.0/glib/gstrfuncs.h:
-
-/usr/include/glib-2.0/glib/gthreadpool.h:
-
-/usr/include/glib-2.0/glib/gtimer.h:
-
-/usr/include/glib-2.0/glib/gtree.h:
-
-/usr/include/stdlib.h:
-
-/usr/include/sys/types.h:
-
-/usr/include/endian.h:
-
-/usr/include/bits/endian.h:
-
-/usr/include/sys/select.h:
-
-/usr/include/bits/select.h:
-
-/usr/include/bits/sigset.h:
-
-/usr/include/sys/sysmacros.h:
-
-/usr/include/bits/pthreadtypes.h:
-
-/usr/include/alloca.h:
-
-../ghosd/ghosd.h:
-
-/usr/include/cairo/cairo.h:
-
-/usr/include/cairo/cairo-features.h:
-
-/usr/include/cairo/cairo-deprecated.h:
-
-/usr/include/values.h:
-
-/usr/include/sys/time.h:
-
-example-shared.h:
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/examples/.deps/image.Po b/abs/mv-core/ghosd/ghosd-0.0.1/examples/.deps/image.Po
deleted file mode 100644
index 459b905..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/examples/.deps/image.Po
+++ /dev/null
@@ -1,266 +0,0 @@
-image.o image.o: image.c /usr/include/stdio.h /usr/include/features.h \
-  /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \
-  /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h \
-  /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/stddef.h \
-  /usr/include/bits/types.h /usr/include/bits/typesizes.h \
-  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
-  /usr/include/bits/wchar.h /usr/include/gconv.h \
-  /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/stdarg.h \
-  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h /usr/include/math.h \
-  /usr/include/bits/huge_val.h /usr/include/bits/mathdef.h \
-  /usr/include/bits/mathcalls.h /usr/include/bits/mathinline.h \
-  /usr/include/cairo/cairo.h /usr/include/cairo/cairo-features.h \
-  /usr/include/cairo/cairo-deprecated.h /usr/include/unistd.h \
-  /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
-  /usr/include/getopt.h ../ghosd/ghosd.h /usr/include/values.h \
-  /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/limits.h \
-  /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/syslimits.h \
-  /usr/include/limits.h /usr/include/bits/posix1_lim.h \
-  /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
-  /usr/include/bits/posix2_lim.h \
-  /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/float.h \
-  /usr/include/sys/time.h /usr/include/time.h /usr/include/bits/time.h \
-  /usr/include/sys/select.h /usr/include/bits/select.h \
-  /usr/include/bits/sigset.h example-shared.h \
-  /usr/include/glib-2.0/glib.h /usr/include/glib-2.0/glib/galloca.h \
-  /usr/include/glib-2.0/glib/gtypes.h \
-  /usr/lib/glib-2.0/include/glibconfig.h \
-  /usr/include/glib-2.0/glib/gmacros.h \
-  /usr/include/glib-2.0/glib/garray.h \
-  /usr/include/glib-2.0/glib/gasyncqueue.h \
-  /usr/include/glib-2.0/glib/gthread.h \
-  /usr/include/glib-2.0/glib/gerror.h /usr/include/glib-2.0/glib/gquark.h \
-  /usr/include/glib-2.0/glib/gutils.h \
-  /usr/include/glib-2.0/glib/gatomic.h \
-  /usr/include/glib-2.0/glib/gbacktrace.h \
-  /usr/include/glib-2.0/glib/gbase64.h \
-  /usr/include/glib-2.0/glib/gbookmarkfile.h \
-  /usr/include/glib-2.0/glib/gcache.h /usr/include/glib-2.0/glib/glist.h \
-  /usr/include/glib-2.0/glib/gmem.h /usr/include/glib-2.0/glib/gslice.h \
-  /usr/include/glib-2.0/glib/gcompletion.h \
-  /usr/include/glib-2.0/glib/gconvert.h \
-  /usr/include/glib-2.0/glib/gdataset.h \
-  /usr/include/glib-2.0/glib/gdate.h /usr/include/glib-2.0/glib/gdir.h \
-  /usr/include/glib-2.0/glib/gfileutils.h \
-  /usr/include/glib-2.0/glib/ghash.h /usr/include/glib-2.0/glib/ghook.h \
-  /usr/include/glib-2.0/glib/giochannel.h \
-  /usr/include/glib-2.0/glib/gmain.h /usr/include/glib-2.0/glib/gslist.h \
-  /usr/include/glib-2.0/glib/gstring.h \
-  /usr/include/glib-2.0/glib/gunicode.h \
-  /usr/include/glib-2.0/glib/gkeyfile.h \
-  /usr/include/glib-2.0/glib/gmappedfile.h \
-  /usr/include/glib-2.0/glib/gmarkup.h \
-  /usr/include/glib-2.0/glib/gmessages.h \
-  /usr/include/glib-2.0/glib/gnode.h /usr/include/glib-2.0/glib/goption.h \
-  /usr/include/glib-2.0/glib/gpattern.h \
-  /usr/include/glib-2.0/glib/gprimes.h \
-  /usr/include/glib-2.0/glib/gqsort.h /usr/include/glib-2.0/glib/gqueue.h \
-  /usr/include/glib-2.0/glib/grand.h /usr/include/glib-2.0/glib/grel.h \
-  /usr/include/glib-2.0/glib/gregex.h \
-  /usr/include/glib-2.0/glib/gscanner.h \
-  /usr/include/glib-2.0/glib/gsequence.h \
-  /usr/include/glib-2.0/glib/gshell.h /usr/include/glib-2.0/glib/gspawn.h \
-  /usr/include/glib-2.0/glib/gstrfuncs.h \
-  /usr/include/glib-2.0/glib/gthreadpool.h \
-  /usr/include/glib-2.0/glib/gtimer.h /usr/include/glib-2.0/glib/gtree.h
-
-/usr/include/stdio.h:
-
-/usr/include/features.h:
-
-/usr/include/sys/cdefs.h:
-
-/usr/include/bits/wordsize.h:
-
-/usr/include/gnu/stubs.h:
-
-/usr/include/gnu/stubs-32.h:
-
-/usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/stddef.h:
-
-/usr/include/bits/types.h:
-
-/usr/include/bits/typesizes.h:
-
-/usr/include/libio.h:
-
-/usr/include/_G_config.h:
-
-/usr/include/wchar.h:
-
-/usr/include/bits/wchar.h:
-
-/usr/include/gconv.h:
-
-/usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/stdarg.h:
-
-/usr/include/bits/stdio_lim.h:
-
-/usr/include/bits/sys_errlist.h:
-
-/usr/include/bits/stdio.h:
-
-/usr/include/math.h:
-
-/usr/include/bits/huge_val.h:
-
-/usr/include/bits/mathdef.h:
-
-/usr/include/bits/mathcalls.h:
-
-/usr/include/bits/mathinline.h:
-
-/usr/include/cairo/cairo.h:
-
-/usr/include/cairo/cairo-features.h:
-
-/usr/include/cairo/cairo-deprecated.h:
-
-/usr/include/unistd.h:
-
-/usr/include/bits/posix_opt.h:
-
-/usr/include/bits/confname.h:
-
-/usr/include/getopt.h:
-
-../ghosd/ghosd.h:
-
-/usr/include/values.h:
-
-/usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/limits.h:
-
-/usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/syslimits.h:
-
-/usr/include/limits.h:
-
-/usr/include/bits/posix1_lim.h:
-
-/usr/include/bits/local_lim.h:
-
-/usr/include/linux/limits.h:
-
-/usr/include/bits/posix2_lim.h:
-
-/usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/float.h:
-
-/usr/include/sys/time.h:
-
-/usr/include/time.h:
-
-/usr/include/bits/time.h:
-
-/usr/include/sys/select.h:
-
-/usr/include/bits/select.h:
-
-/usr/include/bits/sigset.h:
-
-example-shared.h:
-
-/usr/include/glib-2.0/glib.h:
-
-/usr/include/glib-2.0/glib/galloca.h:
-
-/usr/include/glib-2.0/glib/gtypes.h:
-
-/usr/lib/glib-2.0/include/glibconfig.h:
-
-/usr/include/glib-2.0/glib/gmacros.h:
-
-/usr/include/glib-2.0/glib/garray.h:
-
-/usr/include/glib-2.0/glib/gasyncqueue.h:
-
-/usr/include/glib-2.0/glib/gthread.h:
-
-/usr/include/glib-2.0/glib/gerror.h:
-
-/usr/include/glib-2.0/glib/gquark.h:
-
-/usr/include/glib-2.0/glib/gutils.h:
-
-/usr/include/glib-2.0/glib/gatomic.h:
-
-/usr/include/glib-2.0/glib/gbacktrace.h:
-
-/usr/include/glib-2.0/glib/gbase64.h:
-
-/usr/include/glib-2.0/glib/gbookmarkfile.h:
-
-/usr/include/glib-2.0/glib/gcache.h:
-
-/usr/include/glib-2.0/glib/glist.h:
-
-/usr/include/glib-2.0/glib/gmem.h:
-
-/usr/include/glib-2.0/glib/gslice.h:
-
-/usr/include/glib-2.0/glib/gcompletion.h:
-
-/usr/include/glib-2.0/glib/gconvert.h:
-
-/usr/include/glib-2.0/glib/gdataset.h:
-
-/usr/include/glib-2.0/glib/gdate.h:
-
-/usr/include/glib-2.0/glib/gdir.h:
-
-/usr/include/glib-2.0/glib/gfileutils.h:
-
-/usr/include/glib-2.0/glib/ghash.h:
-
-/usr/include/glib-2.0/glib/ghook.h:
-
-/usr/include/glib-2.0/glib/giochannel.h:
-
-/usr/include/glib-2.0/glib/gmain.h:
-
-/usr/include/glib-2.0/glib/gslist.h:
-
-/usr/include/glib-2.0/glib/gstring.h:
-
-/usr/include/glib-2.0/glib/gunicode.h:
-
-/usr/include/glib-2.0/glib/gkeyfile.h:
-
-/usr/include/glib-2.0/glib/gmappedfile.h:
-
-/usr/include/glib-2.0/glib/gmarkup.h:
-
-/usr/include/glib-2.0/glib/gmessages.h:
-
-/usr/include/glib-2.0/glib/gnode.h:
-
-/usr/include/glib-2.0/glib/goption.h:
-
-/usr/include/glib-2.0/glib/gpattern.h:
-
-/usr/include/glib-2.0/glib/gprimes.h:
-
-/usr/include/glib-2.0/glib/gqsort.h:
-
-/usr/include/glib-2.0/glib/gqueue.h:
-
-/usr/include/glib-2.0/glib/grand.h:
-
-/usr/include/glib-2.0/glib/grel.h:
-
-/usr/include/glib-2.0/glib/gregex.h:
-
-/usr/include/glib-2.0/glib/gscanner.h:
-
-/usr/include/glib-2.0/glib/gsequence.h:
-
-/usr/include/glib-2.0/glib/gshell.h:
-
-/usr/include/glib-2.0/glib/gspawn.h:
-
-/usr/include/glib-2.0/glib/gstrfuncs.h:
-
-/usr/include/glib-2.0/glib/gthreadpool.h:
-
-/usr/include/glib-2.0/glib/gtimer.h:
-
-/usr/include/glib-2.0/glib/gtree.h:
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/examples/.deps/text.Po b/abs/mv-core/ghosd/ghosd-0.0.1/examples/.deps/text.Po
deleted file mode 100644
index c6f3f50..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/examples/.deps/text.Po
+++ /dev/null
@@ -1,383 +0,0 @@
-text.o text.o: text.c /usr/include/stdio.h /usr/include/features.h \
-  /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \
-  /usr/include/gnu/stubs.h /usr/include/gnu/stubs-32.h \
-  /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/stddef.h \
-  /usr/include/bits/types.h /usr/include/bits/typesizes.h \
-  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
-  /usr/include/bits/wchar.h /usr/include/gconv.h \
-  /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/stdarg.h \
-  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h /usr/include/cairo/cairo.h \
-  /usr/include/cairo/cairo-features.h \
-  /usr/include/cairo/cairo-deprecated.h \
-  /usr/include/pango-1.0/pango/pangocairo.h \
-  /usr/include/pango-1.0/pango/pango-context.h \
-  /usr/include/pango-1.0/pango/pango-font.h \
-  /usr/include/pango-1.0/pango/pango-coverage.h \
-  /usr/include/glib-2.0/glib.h /usr/include/glib-2.0/glib/galloca.h \
-  /usr/include/glib-2.0/glib/gtypes.h \
-  /usr/lib/glib-2.0/include/glibconfig.h \
-  /usr/include/glib-2.0/glib/gmacros.h \
-  /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/limits.h \
-  /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/syslimits.h \
-  /usr/include/limits.h /usr/include/bits/posix1_lim.h \
-  /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
-  /usr/include/bits/posix2_lim.h \
-  /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/float.h \
-  /usr/include/glib-2.0/glib/garray.h \
-  /usr/include/glib-2.0/glib/gasyncqueue.h \
-  /usr/include/glib-2.0/glib/gthread.h \
-  /usr/include/glib-2.0/glib/gerror.h /usr/include/glib-2.0/glib/gquark.h \
-  /usr/include/glib-2.0/glib/gutils.h \
-  /usr/include/glib-2.0/glib/gatomic.h \
-  /usr/include/glib-2.0/glib/gbacktrace.h \
-  /usr/include/glib-2.0/glib/gbase64.h \
-  /usr/include/glib-2.0/glib/gbookmarkfile.h /usr/include/time.h \
-  /usr/include/bits/time.h /usr/include/glib-2.0/glib/gcache.h \
-  /usr/include/glib-2.0/glib/glist.h /usr/include/glib-2.0/glib/gmem.h \
-  /usr/include/glib-2.0/glib/gslice.h \
-  /usr/include/glib-2.0/glib/gcompletion.h \
-  /usr/include/glib-2.0/glib/gconvert.h \
-  /usr/include/glib-2.0/glib/gdataset.h \
-  /usr/include/glib-2.0/glib/gdate.h /usr/include/glib-2.0/glib/gdir.h \
-  /usr/include/glib-2.0/glib/gfileutils.h \
-  /usr/include/glib-2.0/glib/ghash.h /usr/include/glib-2.0/glib/ghook.h \
-  /usr/include/glib-2.0/glib/giochannel.h \
-  /usr/include/glib-2.0/glib/gmain.h /usr/include/glib-2.0/glib/gslist.h \
-  /usr/include/glib-2.0/glib/gstring.h \
-  /usr/include/glib-2.0/glib/gunicode.h \
-  /usr/include/glib-2.0/glib/gkeyfile.h \
-  /usr/include/glib-2.0/glib/gmappedfile.h \
-  /usr/include/glib-2.0/glib/gmarkup.h \
-  /usr/include/glib-2.0/glib/gmessages.h \
-  /usr/include/glib-2.0/glib/gnode.h /usr/include/glib-2.0/glib/goption.h \
-  /usr/include/glib-2.0/glib/gpattern.h \
-  /usr/include/glib-2.0/glib/gprimes.h \
-  /usr/include/glib-2.0/glib/gqsort.h /usr/include/glib-2.0/glib/gqueue.h \
-  /usr/include/glib-2.0/glib/grand.h /usr/include/glib-2.0/glib/grel.h \
-  /usr/include/glib-2.0/glib/gregex.h \
-  /usr/include/glib-2.0/glib/gscanner.h \
-  /usr/include/glib-2.0/glib/gsequence.h \
-  /usr/include/glib-2.0/glib/gshell.h /usr/include/glib-2.0/glib/gspawn.h \
-  /usr/include/glib-2.0/glib/gstrfuncs.h \
-  /usr/include/glib-2.0/glib/gthreadpool.h \
-  /usr/include/glib-2.0/glib/gtimer.h /usr/include/glib-2.0/glib/gtree.h \
-  /usr/include/pango-1.0/pango/pango-types.h \
-  /usr/include/glib-2.0/glib-object.h \
-  /usr/include/glib-2.0/gobject/gboxed.h \
-  /usr/include/glib-2.0/gobject/gtype.h \
-  /usr/include/glib-2.0/gobject/genums.h \
-  /usr/include/glib-2.0/gobject/gobject.h \
-  /usr/include/glib-2.0/gobject/gvalue.h \
-  /usr/include/glib-2.0/gobject/gparam.h \
-  /usr/include/glib-2.0/gobject/gclosure.h \
-  /usr/include/glib-2.0/gobject/gsignal.h \
-  /usr/include/glib-2.0/gobject/gmarshal.h \
-  /usr/include/glib-2.0/gobject/gparamspecs.h \
-  /usr/include/glib-2.0/gobject/gsourceclosure.h \
-  /usr/include/glib-2.0/gobject/gtypemodule.h \
-  /usr/include/glib-2.0/gobject/gtypeplugin.h \
-  /usr/include/glib-2.0/gobject/gvaluearray.h \
-  /usr/include/glib-2.0/gobject/gvaluetypes.h \
-  /usr/include/pango-1.0/pango/pango-gravity.h \
-  /usr/include/pango-1.0/pango/pango-matrix.h \
-  /usr/include/pango-1.0/pango/pango-script.h \
-  /usr/include/pango-1.0/pango/pango-language.h \
-  /usr/include/pango-1.0/pango/pango-fontmap.h \
-  /usr/include/pango-1.0/pango/pango-fontset.h \
-  /usr/include/pango-1.0/pango/pango-attributes.h \
-  /usr/include/pango-1.0/pango/pango-layout.h \
-  /usr/include/pango-1.0/pango/pango-glyph-item.h \
-  /usr/include/pango-1.0/pango/pango-break.h \
-  /usr/include/pango-1.0/pango/pango-item.h \
-  /usr/include/pango-1.0/pango/pango-glyph.h \
-  /usr/include/pango-1.0/pango/pango-tabs.h /usr/include/cairo/cairo.h \
-  /usr/include/unistd.h /usr/include/bits/posix_opt.h \
-  /usr/include/bits/confname.h /usr/include/getopt.h example-shared.h \
-  /usr/include/X11/Xlib.h /usr/include/sys/types.h /usr/include/endian.h \
-  /usr/include/bits/endian.h /usr/include/sys/select.h \
-  /usr/include/bits/select.h /usr/include/bits/sigset.h \
-  /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
-  /usr/include/X11/X.h /usr/include/X11/Xfuncproto.h \
-  /usr/include/X11/Xosdefs.h ../ghosd/ghosd.h /usr/include/values.h \
-  /usr/include/sys/time.h ../ghosd/ghosd-text.h
-
-/usr/include/stdio.h:
-
-/usr/include/features.h:
-
-/usr/include/sys/cdefs.h:
-
-/usr/include/bits/wordsize.h:
-
-/usr/include/gnu/stubs.h:
-
-/usr/include/gnu/stubs-32.h:
-
-/usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/stddef.h:
-
-/usr/include/bits/types.h:
-
-/usr/include/bits/typesizes.h:
-
-/usr/include/libio.h:
-
-/usr/include/_G_config.h:
-
-/usr/include/wchar.h:
-
-/usr/include/bits/wchar.h:
-
-/usr/include/gconv.h:
-
-/usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/stdarg.h:
-
-/usr/include/bits/stdio_lim.h:
-
-/usr/include/bits/sys_errlist.h:
-
-/usr/include/bits/stdio.h:
-
-/usr/include/cairo/cairo.h:
-
-/usr/include/cairo/cairo-features.h:
-
-/usr/include/cairo/cairo-deprecated.h:
-
-/usr/include/pango-1.0/pango/pangocairo.h:
-
-/usr/include/pango-1.0/pango/pango-context.h:
-
-/usr/include/pango-1.0/pango/pango-font.h:
-
-/usr/include/pango-1.0/pango/pango-coverage.h:
-
-/usr/include/glib-2.0/glib.h:
-
-/usr/include/glib-2.0/glib/galloca.h:
-
-/usr/include/glib-2.0/glib/gtypes.h:
-
-/usr/lib/glib-2.0/include/glibconfig.h:
-
-/usr/include/glib-2.0/glib/gmacros.h:
-
-/usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/limits.h:
-
-/usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/syslimits.h:
-
-/usr/include/limits.h:
-
-/usr/include/bits/posix1_lim.h:
-
-/usr/include/bits/local_lim.h:
-
-/usr/include/linux/limits.h:
-
-/usr/include/bits/posix2_lim.h:
-
-/usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/float.h:
-
-/usr/include/glib-2.0/glib/garray.h:
-
-/usr/include/glib-2.0/glib/gasyncqueue.h:
-
-/usr/include/glib-2.0/glib/gthread.h:
-
-/usr/include/glib-2.0/glib/gerror.h:
-
-/usr/include/glib-2.0/glib/gquark.h:
-
-/usr/include/glib-2.0/glib/gutils.h:
-
-/usr/include/glib-2.0/glib/gatomic.h:
-
-/usr/include/glib-2.0/glib/gbacktrace.h:
-
-/usr/include/glib-2.0/glib/gbase64.h:
-
-/usr/include/glib-2.0/glib/gbookmarkfile.h:
-
-/usr/include/time.h:
-
-/usr/include/bits/time.h:
-
-/usr/include/glib-2.0/glib/gcache.h:
-
-/usr/include/glib-2.0/glib/glist.h:
-
-/usr/include/glib-2.0/glib/gmem.h:
-
-/usr/include/glib-2.0/glib/gslice.h:
-
-/usr/include/glib-2.0/glib/gcompletion.h:
-
-/usr/include/glib-2.0/glib/gconvert.h:
-
-/usr/include/glib-2.0/glib/gdataset.h:
-
-/usr/include/glib-2.0/glib/gdate.h:
-
-/usr/include/glib-2.0/glib/gdir.h:
-
-/usr/include/glib-2.0/glib/gfileutils.h:
-
-/usr/include/glib-2.0/glib/ghash.h:
-
-/usr/include/glib-2.0/glib/ghook.h:
-
-/usr/include/glib-2.0/glib/giochannel.h:
-
-/usr/include/glib-2.0/glib/gmain.h:
-
-/usr/include/glib-2.0/glib/gslist.h:
-
-/usr/include/glib-2.0/glib/gstring.h:
-
-/usr/include/glib-2.0/glib/gunicode.h:
-
-/usr/include/glib-2.0/glib/gkeyfile.h:
-
-/usr/include/glib-2.0/glib/gmappedfile.h:
-
-/usr/include/glib-2.0/glib/gmarkup.h:
-
-/usr/include/glib-2.0/glib/gmessages.h:
-
-/usr/include/glib-2.0/glib/gnode.h:
-
-/usr/include/glib-2.0/glib/goption.h:
-
-/usr/include/glib-2.0/glib/gpattern.h:
-
-/usr/include/glib-2.0/glib/gprimes.h:
-
-/usr/include/glib-2.0/glib/gqsort.h:
-
-/usr/include/glib-2.0/glib/gqueue.h:
-
-/usr/include/glib-2.0/glib/grand.h:
-
-/usr/include/glib-2.0/glib/grel.h:
-
-/usr/include/glib-2.0/glib/gregex.h:
-
-/usr/include/glib-2.0/glib/gscanner.h:
-
-/usr/include/glib-2.0/glib/gsequence.h:
-
-/usr/include/glib-2.0/glib/gshell.h:
-
-/usr/include/glib-2.0/glib/gspawn.h:
-
-/usr/include/glib-2.0/glib/gstrfuncs.h:
-
-/usr/include/glib-2.0/glib/gthreadpool.h:
-
-/usr/include/glib-2.0/glib/gtimer.h:
-
-/usr/include/glib-2.0/glib/gtree.h:
-
-/usr/include/pango-1.0/pango/pango-types.h:
-
-/usr/include/glib-2.0/glib-object.h:
-
-/usr/include/glib-2.0/gobject/gboxed.h:
-
-/usr/include/glib-2.0/gobject/gtype.h:
-
-/usr/include/glib-2.0/gobject/genums.h:
-
-/usr/include/glib-2.0/gobject/gobject.h:
-
-/usr/include/glib-2.0/gobject/gvalue.h:
-
-/usr/include/glib-2.0/gobject/gparam.h:
-
-/usr/include/glib-2.0/gobject/gclosure.h:
-
-/usr/include/glib-2.0/gobject/gsignal.h:
-
-/usr/include/glib-2.0/gobject/gmarshal.h:
-
-/usr/include/glib-2.0/gobject/gparamspecs.h:
-
-/usr/include/glib-2.0/gobject/gsourceclosure.h:
-
-/usr/include/glib-2.0/gobject/gtypemodule.h:
-
-/usr/include/glib-2.0/gobject/gtypeplugin.h:
-
-/usr/include/glib-2.0/gobject/gvaluearray.h:
-
-/usr/include/glib-2.0/gobject/gvaluetypes.h:
-
-/usr/include/pango-1.0/pango/pango-gravity.h:
-
-/usr/include/pango-1.0/pango/pango-matrix.h:
-
-/usr/include/pango-1.0/pango/pango-script.h:
-
-/usr/include/pango-1.0/pango/pango-language.h:
-
-/usr/include/pango-1.0/pango/pango-fontmap.h:
-
-/usr/include/pango-1.0/pango/pango-fontset.h:
-
-/usr/include/pango-1.0/pango/pango-attributes.h:
-
-/usr/include/pango-1.0/pango/pango-layout.h:
-
-/usr/include/pango-1.0/pango/pango-glyph-item.h:
-
-/usr/include/pango-1.0/pango/pango-break.h:
-
-/usr/include/pango-1.0/pango/pango-item.h:
-
-/usr/include/pango-1.0/pango/pango-glyph.h:
-
-/usr/include/pango-1.0/pango/pango-tabs.h:
-
-/usr/include/cairo/cairo.h:
-
-/usr/include/unistd.h:
-
-/usr/include/bits/posix_opt.h:
-
-/usr/include/bits/confname.h:
-
-/usr/include/getopt.h:
-
-example-shared.h:
-
-/usr/include/X11/Xlib.h:
-
-/usr/include/sys/types.h:
-
-/usr/include/endian.h:
-
-/usr/include/bits/endian.h:
-
-/usr/include/sys/select.h:
-
-/usr/include/bits/select.h:
-
-/usr/include/bits/sigset.h:
-
-/usr/include/sys/sysmacros.h:
-
-/usr/include/bits/pthreadtypes.h:
-
-/usr/include/X11/X.h:
-
-/usr/include/X11/Xfuncproto.h:
-
-/usr/include/X11/Xosdefs.h:
-
-../ghosd/ghosd.h:
-
-/usr/include/values.h:
-
-/usr/include/sys/time.h:
-
-../ghosd/ghosd-text.h:
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/examples/.libs/animation b/abs/mv-core/ghosd/ghosd-0.0.1/examples/.libs/animation
deleted file mode 100755
index 3d340e3..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/examples/.libs/animation
+++ /dev/null
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/examples/.libs/image b/abs/mv-core/ghosd/ghosd-0.0.1/examples/.libs/image
deleted file mode 100755
index 9ac9177..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/examples/.libs/image
+++ /dev/null
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/examples/.libs/lt-image b/abs/mv-core/ghosd/ghosd-0.0.1/examples/.libs/lt-image
deleted file mode 100755
index e44e961..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/examples/.libs/lt-image
+++ /dev/null
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/examples/.libs/text b/abs/mv-core/ghosd/ghosd-0.0.1/examples/.libs/text
deleted file mode 100755
index 835b99f..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/examples/.libs/text
+++ /dev/null
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/examples/Makefile b/abs/mv-core/ghosd/ghosd-0.0.1/examples/Makefile
deleted file mode 100644
index 4238e94..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/examples/Makefile
+++ /dev/null
@@ -1,486 +0,0 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
-# examples/Makefile.  Generated from Makefile.in by configure.
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-
-SOURCES = $(libexample_la_SOURCES) $(animation_SOURCES) $(image_SOURCES) $(text_SOURCES)
-
-srcdir = .
-top_srcdir = ..
-
-pkgdatadir = $(datadir)/ghosd
-pkglibdir = $(libdir)/ghosd
-pkgincludedir = $(includedir)/ghosd
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = /bin/install -c
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = i686-pc-linux-gnu
-host_triplet = i686-pc-linux-gnu
-#noinst_PROGRAMS = image$(EXEEXT) animation$(EXEEXT)
-noinst_PROGRAMS = image$(EXEEXT) text$(EXEEXT) \
-	animation$(EXEEXT)
-subdir = examples
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-libexample_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	../ghosd/libghosd.la
-am_libexample_la_OBJECTS = example-shared.lo
-libexample_la_OBJECTS = $(am_libexample_la_OBJECTS)
-PROGRAMS = $(noinst_PROGRAMS)
-am_animation_OBJECTS = animation.$(OBJEXT)
-animation_OBJECTS = $(am_animation_OBJECTS)
-animation_DEPENDENCIES = libexample.la
-am_image_OBJECTS = image.$(OBJEXT)
-image_OBJECTS = $(am_image_OBJECTS)
-image_DEPENDENCIES = libexample.la
-am__text_SOURCES_DIST = text.c
-am_text_OBJECTS = text.$(OBJEXT)
-text_OBJECTS = $(am_text_OBJECTS)
-text_DEPENDENCIES = libexample.la
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libexample_la_SOURCES) $(animation_SOURCES) \
-	$(image_SOURCES) $(text_SOURCES)
-DIST_SOURCES = $(libexample_la_SOURCES) $(animation_SOURCES) \
-	$(image_SOURCES) $(am__text_SOURCES_DIST)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /data/local/jams/ghosd-0.0.1/missing --run aclocal-1.9
-AMDEP_FALSE = #
-AMDEP_TRUE = 
-AMTAR = ${SHELL} /data/local/jams/ghosd-0.0.1/missing --run tar
-AR = ar
-AUTOCONF = ${SHELL} /data/local/jams/ghosd-0.0.1/missing --run autoconf
-AUTOHEADER = ${SHELL} /data/local/jams/ghosd-0.0.1/missing --run autoheader
-AUTOMAKE = ${SHELL} /data/local/jams/ghosd-0.0.1/missing --run automake-1.9
-AWK = gawk
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2 -Wall -Wpointer-arith -Wstrict-prototypes                -Wmissing-prototypes -Wmissing-declarations                -Wnested-externs -fno-strict-aliasing
-CPP = gcc -E
-CPPFLAGS = 
-CXX = g++
-CXXCPP = g++ -E
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2
-CYGPATH_W = echo
-DEFS = -DHAVE_CONFIG_H
-DEPDIR = .deps
-ECHO = echo
-ECHO_C = 
-ECHO_N = -n
-ECHO_T = 
-EGREP = grep -E
-ENABLE_GTK_DOC_FALSE = 
-ENABLE_GTK_DOC_TRUE = #
-EXEEXT = 
-F77 = 
-FFLAGS = 
-GHOSD_CFLAGS = -I/usr/include/cairo -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
-GHOSD_EXAMPLE_CFLAGS = -I/usr/include/cairo -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
-GHOSD_EXAMPLE_LIBS = -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  
-GHOSD_LIBS = -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  
-GHOSD_PACKAGES = cairo pangocairo
-GTK_DOC_USE_LIBTOOL_FALSE = #
-GTK_DOC_USE_LIBTOOL_TRUE = 
-HTML_DIR = ${datadir}/gtk-doc/html
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
-LDFLAGS = 
-LIBOBJS = 
-LIBS = 
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LN_S = ln -s
-LTLIBOBJS = 
-MAINT = #
-MAINTAINER_MODE_FALSE = 
-MAINTAINER_MODE_TRUE = #
-MAKEINFO = ${SHELL} /data/local/jams/ghosd-0.0.1/missing --run makeinfo
-OBJEXT = o
-PACKAGE = ghosd
-PACKAGE_BUGREPORT = martine@danga.com
-PACKAGE_NAME = ghosd
-PACKAGE_STRING = ghosd 0.0.1
-PACKAGE_TARNAME = ghosd
-PACKAGE_VERSION = 0.0.1
-PANGO_FALSE = #
-PANGO_TRUE = 
-PATH_SEPARATOR = :
-PKG_CONFIG = /usr/bin/pkg-config
-RANLIB = ranlib
-SET_MAKE = 
-SHELL = /bin/sh
-STRIP = strip
-VERSION = 0.0.1
-VERSION_INFO = 0:0:0
-ac_ct_AR = ar
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_F77 = 
-ac_ct_RANLIB = ranlib
-ac_ct_STRIP = strip
-ac_pt_PKG_CONFIG = /usr/bin/pkg-config
-am__fastdepCC_FALSE = #
-am__fastdepCC_TRUE = 
-am__fastdepCXX_FALSE = #
-am__fastdepCXX_TRUE = 
-am__include = include
-am__leading_dot = .
-am__quote = 
-am__tar = ${AMTAR} chof - "$$tardir"
-am__untar = ${AMTAR} xf -
-bindir = ${exec_prefix}/bin
-build = i686-pc-linux-gnu
-build_alias = 
-build_cpu = i686
-build_os = linux-gnu
-build_vendor = pc
-datadir = ${prefix}/share
-exec_prefix = ${prefix}
-host = i686-pc-linux-gnu
-host_alias = 
-host_cpu = i686
-host_os = linux-gnu
-host_vendor = pc
-includedir = ${prefix}/include
-infodir = ${prefix}/info
-install_sh = /data/local/jams/ghosd-0.0.1/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localstatedir = ${prefix}/var
-mandir = ${prefix}/man
-mkdir_p = mkdir -p --
-oldincludedir = /usr/include
-prefix = /usr/local
-program_transform_name = s,x,x,
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-sysconfdir = ${prefix}/etc
-target_alias = 
-INCLUDES = -I$(top_srcdir) $(GHOSD_EXAMPLE_CFLAGS)
-noinst_LTLIBRARIES = libexample.la
-libexample_la_SOURCES = example-shared.c example-shared.h
-libexample_la_LIBADD = $(GHOSD_EXAMPLE_LIBS) ../ghosd/libghosd.la
-image_SOURCES = image.c 
-image_LDADD = libexample.la
-animation_SOURCES = animation.c
-animation_LDADD = libexample.la
-text_SOURCES = text.c
-text_LDADD = libexample.la
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  examples/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  examples/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: # $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): # $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libexample.la: $(libexample_la_OBJECTS) $(libexample_la_DEPENDENCIES) 
-	$(LINK)  $(libexample_la_LDFLAGS) $(libexample_la_OBJECTS) $(libexample_la_LIBADD) $(LIBS)
-
-clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
-animation$(EXEEXT): $(animation_OBJECTS) $(animation_DEPENDENCIES) 
-	@rm -f animation$(EXEEXT)
-	$(LINK) $(animation_LDFLAGS) $(animation_OBJECTS) $(animation_LDADD) $(LIBS)
-image$(EXEEXT): $(image_OBJECTS) $(image_DEPENDENCIES) 
-	@rm -f image$(EXEEXT)
-	$(LINK) $(image_LDFLAGS) $(image_OBJECTS) $(image_LDADD) $(LIBS)
-text$(EXEEXT): $(text_OBJECTS) $(text_DEPENDENCIES) 
-	@rm -f text$(EXEEXT)
-	$(LINK) $(text_LDFLAGS) $(text_OBJECTS) $(text_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-include ./$(DEPDIR)/animation.Po
-include ./$(DEPDIR)/example-shared.Plo
-include ./$(DEPDIR)/image.Po
-include ./$(DEPDIR)/text.Po
-
-.c.o:
-	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-#	source='$<' object='$@' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(COMPILE) -c $<
-
-.c.obj:
-	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-#	source='$<' object='$@' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-#	source='$<' object='$@' libtool=yes \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS)
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-	clean-noinstPROGRAMS mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \
-	ctags distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am
-
-
-# vim: set ts=2 sw=2 et cino=(0 :
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/examples/Makefile.am b/abs/mv-core/ghosd/ghosd-0.0.1/examples/Makefile.am
deleted file mode 100644
index 991417f..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/examples/Makefile.am
+++ /dev/null
@@ -1,21 +0,0 @@
-INCLUDES = -I$(top_srcdir) $(GHOSD_EXAMPLE_CFLAGS)
-
-noinst_LTLIBRARIES = libexample.la
-libexample_la_SOURCES = example-shared.c example-shared.h
-libexample_la_LIBADD = $(GHOSD_EXAMPLE_LIBS) ../ghosd/libghosd.la
-
-image_SOURCES = image.c 
-image_LDADD = libexample.la
-
-animation_SOURCES = animation.c
-animation_LDADD = libexample.la
-
-if PANGO
-text_SOURCES = text.c
-text_LDADD = libexample.la
-noinst_PROGRAMS = image text animation
-else
-noinst_PROGRAMS = image animation
-endif
-
-# vim: set ts=2 sw=2 et cino=(0 :
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/examples/Makefile.in b/abs/mv-core/ghosd/ghosd-0.0.1/examples/Makefile.in
deleted file mode 100644
index 99f1a05..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/examples/Makefile.in
+++ /dev/null
@@ -1,486 +0,0 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-SOURCES = $(libexample_la_SOURCES) $(animation_SOURCES) $(image_SOURCES) $(text_SOURCES)
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-@PANGO_FALSE@noinst_PROGRAMS = image$(EXEEXT) animation$(EXEEXT)
-@PANGO_TRUE@noinst_PROGRAMS = image$(EXEEXT) text$(EXEEXT) \
-@PANGO_TRUE@	animation$(EXEEXT)
-subdir = examples
-DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-LTLIBRARIES = $(noinst_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-libexample_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-	../ghosd/libghosd.la
-am_libexample_la_OBJECTS = example-shared.lo
-libexample_la_OBJECTS = $(am_libexample_la_OBJECTS)
-PROGRAMS = $(noinst_PROGRAMS)
-am_animation_OBJECTS = animation.$(OBJEXT)
-animation_OBJECTS = $(am_animation_OBJECTS)
-animation_DEPENDENCIES = libexample.la
-am_image_OBJECTS = image.$(OBJEXT)
-image_OBJECTS = $(am_image_OBJECTS)
-image_DEPENDENCIES = libexample.la
-am__text_SOURCES_DIST = text.c
-@PANGO_TRUE@am_text_OBJECTS = text.$(OBJEXT)
-text_OBJECTS = $(am_text_OBJECTS)
-@PANGO_TRUE@text_DEPENDENCIES = libexample.la
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libexample_la_SOURCES) $(animation_SOURCES) \
-	$(image_SOURCES) $(text_SOURCES)
-DIST_SOURCES = $(libexample_la_SOURCES) $(animation_SOURCES) \
-	$(image_SOURCES) $(am__text_SOURCES_DIST)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-GHOSD_CFLAGS = @GHOSD_CFLAGS@
-GHOSD_EXAMPLE_CFLAGS = @GHOSD_EXAMPLE_CFLAGS@
-GHOSD_EXAMPLE_LIBS = @GHOSD_EXAMPLE_LIBS@
-GHOSD_LIBS = @GHOSD_LIBS@
-GHOSD_PACKAGES = @GHOSD_PACKAGES@
-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
-HTML_DIR = @HTML_DIR@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PANGO_FALSE = @PANGO_FALSE@
-PANGO_TRUE = @PANGO_TRUE@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-VERSION_INFO = @VERSION_INFO@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-INCLUDES = -I$(top_srcdir) $(GHOSD_EXAMPLE_CFLAGS)
-noinst_LTLIBRARIES = libexample.la
-libexample_la_SOURCES = example-shared.c example-shared.h
-libexample_la_LIBADD = $(GHOSD_EXAMPLE_LIBS) ../ghosd/libghosd.la
-image_SOURCES = image.c 
-image_LDADD = libexample.la
-animation_SOURCES = animation.c
-animation_LDADD = libexample.la
-@PANGO_TRUE@text_SOURCES = text.c
-@PANGO_TRUE@text_LDADD = libexample.la
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  examples/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  examples/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-clean-noinstLTLIBRARIES:
-	-test -z "$(noinst_LTLIBRARIES)" || rm -f $(noinst_LTLIBRARIES)
-	@list='$(noinst_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libexample.la: $(libexample_la_OBJECTS) $(libexample_la_DEPENDENCIES) 
-	$(LINK)  $(libexample_la_LDFLAGS) $(libexample_la_OBJECTS) $(libexample_la_LIBADD) $(LIBS)
-
-clean-noinstPROGRAMS:
-	@list='$(noinst_PROGRAMS)'; for p in $$list; do \
-	  f=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
-	  echo " rm -f $$p $$f"; \
-	  rm -f $$p $$f ; \
-	done
-animation$(EXEEXT): $(animation_OBJECTS) $(animation_DEPENDENCIES) 
-	@rm -f animation$(EXEEXT)
-	$(LINK) $(animation_LDFLAGS) $(animation_OBJECTS) $(animation_LDADD) $(LIBS)
-image$(EXEEXT): $(image_OBJECTS) $(image_DEPENDENCIES) 
-	@rm -f image$(EXEEXT)
-	$(LINK) $(image_LDFLAGS) $(image_OBJECTS) $(image_LDADD) $(LIBS)
-text$(EXEEXT): $(text_OBJECTS) $(text_DEPENDENCIES) 
-	@rm -f text$(EXEEXT)
-	$(LINK) $(text_LDFLAGS) $(text_OBJECTS) $(text_LDADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/animation.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/example-shared.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/image.Po@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/text.Po@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(PROGRAMS)
-installdirs:
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libtool clean-noinstLTLIBRARIES \
-	clean-noinstPROGRAMS mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am:
-
-install-exec-am:
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libtool clean-noinstLTLIBRARIES clean-noinstPROGRAMS \
-	ctags distclean distclean-compile distclean-generic \
-	distclean-libtool distclean-tags distdir dvi dvi-am html \
-	html-am info info-am install install-am install-data \
-	install-data-am install-exec install-exec-am install-info \
-	install-info-am install-man install-strip installcheck \
-	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
-	tags uninstall uninstall-am uninstall-info-am
-
-
-# vim: set ts=2 sw=2 et cino=(0 :
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/examples/animation b/abs/mv-core/ghosd/ghosd-0.0.1/examples/animation
deleted file mode 100755
index 0b06c86..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/examples/animation
+++ /dev/null
@@ -1,117 +0,0 @@
-#! /bin/sh
-
-# animation - temporary wrapper script for .libs/animation
-# Generated by ltmain.sh - GNU libtool 1.5.6 (1.1220.2.95 2004/04/11 05:50:42) Debian: 224 $
-#
-# The animation program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='/bin/sed -e 1s/^X//'
-sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test "${CDPATH+set}" = set; then CDPATH=:; export CDPATH; fi
-
-relink_command="(cd /data/local/package/src/packages/local/x11/ghosd/ghosd-0.0.1/examples; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; PATH=\"/bin:/usr/bin:/sbin:/usr/sbin:/usr/X11R6/bin:/opt/bin:/usr/local/bin:/opt/e17/bin:/opt/kde/bin:/opt/mozilla/bin:/usr/local/bin:/opt/qt/bin:/data/local/jams/bin\"; export PATH; gcc -g -O2 -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -fno-strict-aliasing -o \$progdir/\$file animation.o  ./.libs/libexample.a /data/local/package/src/packages/local/x11/ghosd/ghosd-0.0.1/ghosd/.libs/libghosd.so -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -Wl,--rpath -Wl,/data/local/package/src/packages/local/x11/ghosd/ghosd-0.0.1/ghosd/.libs)"
-
-# This environment variable determines our operation mode.
-if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then
-  # install mode needs the following variable:
-  notinst_deplibs=' /data/local/package/src/packages/local/x11/ghosd/ghosd-0.0.1/ghosd/libghosd.la'
-else
-  # When we are sourced in execute mode, $file and $echo are already set.
-  if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
-    echo="echo"
-    file="$0"
-    # Make sure echo works.
-    if test "X$1" = X--no-reexec; then
-      # Discard the --no-reexec flag, and continue.
-      shift
-    elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-      # Yippee, $echo works!
-      :
-    else
-      # Restart under the correct shell, and then maybe $echo will work.
-      exec /bin/sh "$0" --no-reexec ${1+"$@"}
-    fi
-  fi
-
-  # Find the directory that this script lives in.
-  thisdir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-  test "x$thisdir" = "x$file" && thisdir=.
-
-  # Follow symbolic links until we get to the real thisdir.
-  file=`ls -ld "$file" | /bin/sed -n 's/.*-> //p'`
-  while test -n "$file"; do
-    destdir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-
-    # If there was a directory component, then change thisdir.
-    if test "x$destdir" != "x$file"; then
-      case "$destdir" in
-      [\\/]* | [A-Za-z]:[\\/]*) thisdir="$destdir" ;;
-      *) thisdir="$thisdir/$destdir" ;;
-      esac
-    fi
-
-    file=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-    file=`ls -ld "$thisdir/$file" | /bin/sed -n 's/.*-> //p'`
-  done
-
-  # Try to get the absolute directory name.
-  absdir=`cd "$thisdir" && pwd`
-  test -n "$absdir" && thisdir="$absdir"
-
-  program=lt-'animation'
-  progdir="$thisdir/.libs"
-
-  if test ! -f "$progdir/$program" || \
-     { file=`ls -1dt "$progdir/$program" "$progdir/../$program" 2>/dev/null | /bin/sed 1q`; \
-       test "X$file" != "X$progdir/$program"; }; then
-
-    file="$$-$program"
-
-    if test ! -d "$progdir"; then
-      mkdir "$progdir"
-    else
-      rm -f "$progdir/$file"
-    fi
-
-    # relink executable if necessary
-    if test -n "$relink_command"; then
-      if relink_command_output=`eval $relink_command 2>&1`; then :
-      else
-	echo "$relink_command_output" >&2
-	rm -f "$progdir/$file"
-	exit 1
-      fi
-    fi
-
-    mv -f "$progdir/$file" "$progdir/$program" 2>/dev/null ||
-    { rm -f "$progdir/$program";
-      mv -f "$progdir/$file" "$progdir/$program"; }
-    rm -f "$progdir/$file"
-  fi
-
-  if test -f "$progdir/$program"; then
-    if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
-      # Run the actual program with our arguments.
-
-      exec $progdir/$program ${1+"$@"}
-
-      $echo "$0: cannot exec $program ${1+"$@"}"
-      exit 1
-    fi
-  else
-    # The program doesn't exist.
-    $echo "$0: error: $progdir/$program does not exist" 1>&2
-    $echo "This script is just a wrapper for $program." 1>&2
-    echo "See the libtool documentation for more information." 1>&2
-    exit 1
-  fi
-fi
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/examples/animation.c b/abs/mv-core/ghosd/ghosd-0.0.1/examples/animation.c
deleted file mode 100644
index 8c1a2c5..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/examples/animation.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/* ghosd -- OSD with fake transparency, cairo, and pango.
- * Copyright (C) 2006 Evan Martin <martine@danga.com>
- */
-
-#include <stdio.h>
-#include <sys/time.h>
-#include <sys/poll.h>
-#include <time.h>
-
-#include <cairo/cairo.h>
-
-#include <ghosd/ghosd.h>
-
-typedef struct {
-  cairo_surface_t* foot;
-  float alpha;
-} RenderData;
-
-static void
-round_rect(cairo_t *cr, int x, int y, int w, int h, int r) {
-  cairo_move_to(cr, x+r, y);
-  cairo_line_to(cr, x+w-r, y); /* top edge */
-  cairo_curve_to(cr, x+w, y, x+w, y, x+w, y+r);
-  cairo_line_to(cr, x+w, y+h-r); /* right edge */
-  cairo_curve_to(cr, x+w, y+h, x+w, y+h, x+w-r, y+h);
-  cairo_line_to(cr, x+r, y+h); /* bottom edge */
-  cairo_curve_to(cr, x, y+h, x, y+h, x, y+h-r);
-  cairo_line_to(cr, x, y+r); /* left edge */
-  cairo_curve_to(cr, x, y, x, y, x+r, y);
-  cairo_close_path(cr);
-}
-
-#define RADIUS 20
-
-static void
-render(Ghosd *ghosd, cairo_t *cr, void* data) {
-  RenderData *rdata = data;
-
-  cairo_set_source_rgba(cr, rdata->alpha, 0, 0, 0.5);
-  cairo_new_path(cr);
-  round_rect(cr, 10, 10, 180, 230, RADIUS);
-  cairo_fill(cr);
-
-  cairo_set_source_rgba(cr, 1, 1, 1, 1.0);
-  cairo_new_path(cr);
-  round_rect(cr, 20, 20, 160, 210, RADIUS);
-  cairo_stroke(cr);
-
-  cairo_save(cr);
-  cairo_set_source_rgba(cr, 1, 1, 1, 1.0);
-  cairo_set_source_surface(cr, rdata->foot, 30, 30);
-  cairo_paint(cr);
-  cairo_restore(cr);
-}
-
-int main(int argc, char* argv[]) {
-  Ghosd *ghosd;
-  RenderData data = {0};
-
-  const char *image = "/usr/share/pixmaps/gnome-background-image.png";
-  data.foot = cairo_image_surface_create_from_png(image);
-  data.alpha = 0.5;
-
-  ghosd = ghosd_new();
-  ghosd_set_position(ghosd, 50, 50, 200, 240);
-  ghosd_set_render(ghosd, render, &data);
-  ghosd_render(ghosd);
-  ghosd_show(ghosd);
-
-  ghosd_main_iterations(ghosd);
-
-  const int STEP = 50;
-  float dalpha = 0.05;
-
-  struct timeval tv_nextupdate;
-
-  for (;;) {
-    gettimeofday(&tv_nextupdate, NULL);
-    tv_nextupdate.tv_usec += STEP*1000;
-
-    ghosd_main_until(ghosd, &tv_nextupdate);
-
-    data.alpha += dalpha;
-    if (data.alpha >= 1.0) {
-      data.alpha = 1.0;
-      dalpha = -dalpha;
-    } else if (data.alpha <= 0.0) {
-      data.alpha = 0.0;
-      dalpha = -dalpha;
-    }
-    ghosd_render(ghosd);
-  }
-
-  return 0;
-}
-
-/* vim: set ts=2 sw=2 et cino=(0 : */
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/examples/example-shared.c b/abs/mv-core/ghosd/ghosd-0.0.1/examples/example-shared.c
deleted file mode 100644
index fb4b7d4..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/examples/example-shared.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/* ghosd -- OSD with fake transparency, cairo, and pango.
- * Copyright (C) 2006 Evan Martin <martine@danga.com>
- */
-
-#include <glib.h>
-#include <stdlib.h>
-#include <ghosd/ghosd.h>
-
-#include "example-shared.h"
-
-ExampleOptions opts = {
-  TRUE,
-  50, -50
-};
-
-gboolean
-example_options_parse(int *argc, char ***argv, ...) {
-  GOptionEntry options[] = {
-    { "opaque", 0, G_OPTION_FLAG_REVERSE, G_OPTION_ARG_NONE,
-      (gpointer)&opts.transparent, "turn off transparent background" },
-    { "x", 'x', 0, G_OPTION_ARG_INT, (gpointer)&opts.x,
-      "x coordinate for window" },
-    { "y", 'y', 0, G_OPTION_ARG_INT, (gpointer)&opts.y,
-      "y coordinate for window" },
-    { NULL }
-  };
-  GOptionContext *ctx;
-  GOptionGroup *group;
-  gboolean ret;
-  va_list ap;
-
-  va_start(ap, argv);
-
-  ctx = g_option_context_new("");
-  g_option_context_add_main_entries(ctx, options, "bar");
-
-  while ((group = va_arg(ap, GOptionGroup*)) != NULL) {
-    g_option_context_add_group(ctx, group);
-  }
-  va_end(ap);
-
-  g_option_context_set_ignore_unknown_options(ctx, FALSE);
-  ret = g_option_context_parse(ctx, argc, argv, NULL);
-  g_option_context_free(ctx);
-
-  if (opts.x == 0) opts.x = GHOSD_COORD_CENTER;
-  if (opts.y == 0) opts.y = GHOSD_COORD_CENTER;
-
-  return ret;
-}
-
-void
-example_round_rect(cairo_t *cr, int x, int y, int w, int h, int r) {
-  cairo_move_to(cr, x+r, y);
-  cairo_line_to(cr, x+w-r, y); /* top edge */
-  cairo_curve_to(cr, x+w, y, x+w, y, x+w, y+r);
-  cairo_line_to(cr, x+w, y+h-r); /* right edge */
-  cairo_curve_to(cr, x+w, y+h, x+w, y+h, x+w-r, y+h);
-  cairo_line_to(cr, x+r, y+h); /* bottom edge */
-  cairo_curve_to(cr, x, y+h, x, y+h, x, y+h-r);
-  cairo_line_to(cr, x, y+r); /* left edge */
-  cairo_curve_to(cr, x, y, x, y, x+r, y);
-  cairo_close_path(cr);
-}
-
-/* vim: set ts=2 sw=2 et cino=(0 : */
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/examples/example-shared.h b/abs/mv-core/ghosd/ghosd-0.0.1/examples/example-shared.h
deleted file mode 100644
index 63ecea1..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/examples/example-shared.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/* ghosd -- OSD with fake transparency, cairo, and pango.
- * Copyright (C) 2006 Evan Martin <martine@danga.com>
- */
-
-#include <glib.h>
-#include <cairo/cairo.h>
-
-typedef struct {
-  gboolean transparent;
-  int x, y;
-} ExampleOptions;
-extern ExampleOptions opts;
-
-gboolean example_options_parse(int *argc, char ***argv, ...);
-void     example_round_rect(cairo_t *cr, int x, int y, int w, int h, int r);
-
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/examples/image b/abs/mv-core/ghosd/ghosd-0.0.1/examples/image
deleted file mode 100755
index e0c65f5..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/examples/image
+++ /dev/null
@@ -1,117 +0,0 @@
-#! /bin/sh
-
-# image - temporary wrapper script for .libs/image
-# Generated by ltmain.sh - GNU libtool 1.5.6 (1.1220.2.95 2004/04/11 05:50:42) Debian: 224 $
-#
-# The image program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='/bin/sed -e 1s/^X//'
-sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test "${CDPATH+set}" = set; then CDPATH=:; export CDPATH; fi
-
-relink_command="(cd /data/local/package/src/packages/local/x11/ghosd/ghosd-0.0.1/examples; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; PATH=\"/bin:/usr/bin:/sbin:/usr/sbin:/usr/X11R6/bin:/opt/bin:/usr/local/bin:/opt/e17/bin:/opt/kde/bin:/opt/mozilla/bin:/usr/local/bin:/opt/qt/bin:/data/local/jams/bin\"; export PATH; gcc -g -O2 -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -fno-strict-aliasing -o \$progdir/\$file image.o  ./.libs/libexample.a /data/local/package/src/packages/local/x11/ghosd/ghosd-0.0.1/ghosd/.libs/libghosd.so -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -Wl,--rpath -Wl,/data/local/package/src/packages/local/x11/ghosd/ghosd-0.0.1/ghosd/.libs)"
-
-# This environment variable determines our operation mode.
-if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then
-  # install mode needs the following variable:
-  notinst_deplibs=' /data/local/package/src/packages/local/x11/ghosd/ghosd-0.0.1/ghosd/libghosd.la'
-else
-  # When we are sourced in execute mode, $file and $echo are already set.
-  if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
-    echo="echo"
-    file="$0"
-    # Make sure echo works.
-    if test "X$1" = X--no-reexec; then
-      # Discard the --no-reexec flag, and continue.
-      shift
-    elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-      # Yippee, $echo works!
-      :
-    else
-      # Restart under the correct shell, and then maybe $echo will work.
-      exec /bin/sh "$0" --no-reexec ${1+"$@"}
-    fi
-  fi
-
-  # Find the directory that this script lives in.
-  thisdir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-  test "x$thisdir" = "x$file" && thisdir=.
-
-  # Follow symbolic links until we get to the real thisdir.
-  file=`ls -ld "$file" | /bin/sed -n 's/.*-> //p'`
-  while test -n "$file"; do
-    destdir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-
-    # If there was a directory component, then change thisdir.
-    if test "x$destdir" != "x$file"; then
-      case "$destdir" in
-      [\\/]* | [A-Za-z]:[\\/]*) thisdir="$destdir" ;;
-      *) thisdir="$thisdir/$destdir" ;;
-      esac
-    fi
-
-    file=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-    file=`ls -ld "$thisdir/$file" | /bin/sed -n 's/.*-> //p'`
-  done
-
-  # Try to get the absolute directory name.
-  absdir=`cd "$thisdir" && pwd`
-  test -n "$absdir" && thisdir="$absdir"
-
-  program=lt-'image'
-  progdir="$thisdir/.libs"
-
-  if test ! -f "$progdir/$program" || \
-     { file=`ls -1dt "$progdir/$program" "$progdir/../$program" 2>/dev/null | /bin/sed 1q`; \
-       test "X$file" != "X$progdir/$program"; }; then
-
-    file="$$-$program"
-
-    if test ! -d "$progdir"; then
-      mkdir "$progdir"
-    else
-      rm -f "$progdir/$file"
-    fi
-
-    # relink executable if necessary
-    if test -n "$relink_command"; then
-      if relink_command_output=`eval $relink_command 2>&1`; then :
-      else
-	echo "$relink_command_output" >&2
-	rm -f "$progdir/$file"
-	exit 1
-      fi
-    fi
-
-    mv -f "$progdir/$file" "$progdir/$program" 2>/dev/null ||
-    { rm -f "$progdir/$program";
-      mv -f "$progdir/$file" "$progdir/$program"; }
-    rm -f "$progdir/$file"
-  fi
-
-  if test -f "$progdir/$program"; then
-    if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
-      # Run the actual program with our arguments.
-
-      exec $progdir/$program ${1+"$@"}
-
-      $echo "$0: cannot exec $program ${1+"$@"}"
-      exit 1
-    fi
-  else
-    # The program doesn't exist.
-    $echo "$0: error: $progdir/$program does not exist" 1>&2
-    $echo "This script is just a wrapper for $program." 1>&2
-    echo "See the libtool documentation for more information." 1>&2
-    exit 1
-  fi
-fi
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/examples/image.c b/abs/mv-core/ghosd/ghosd-0.0.1/examples/image.c
deleted file mode 100644
index ed061af..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/examples/image.c
+++ /dev/null
@@ -1,113 +0,0 @@
-/* ghosd -- OSD with fake transparency, cairo, and pango.
- * Copyright (C) 2006 Evan Martin <martine@danga.com>
- */
-
-#include <stdio.h>
-#include <math.h>   
-#include <cairo/cairo.h>
-#include <unistd.h>
-#include <ghosd/ghosd.h>
-
-#include "example-shared.h"
-
-#define MARGIN 10
-#define RADIUS 20
-#define WIDTH 185
-#define HEIGHT 220
-
-int posX = 10;
-int posY = 10;
-char displayText[200] = "default message";
-float red = 1.0;
-float green = 1.0;
-float blue = 1.0;
-int ftSize = 30;
-int fadIn = 500; 
-int fadOt = 3300; 
-
-static void
-render(Ghosd *ghosd, cairo_t *cr, void* data) {
-  cairo_surface_t* image = data;
-  const int width  = cairo_image_surface_get_width(image);
-  const int height = cairo_image_surface_get_height(image);
-
-  cairo_set_source_rgba(cr, 0, 0, 0, 0.5);
-  cairo_new_path(cr);
-  example_round_rect(cr, 0, 0, width+(2*MARGIN), height+(2*MARGIN), RADIUS);
-  cairo_fill(cr);
-
-  cairo_save(cr);
-  cairo_set_source_surface(cr, image, MARGIN, MARGIN);
-
-
-
-
-  cairo_paint_with_alpha(cr, 0.9);
-  cairo_restore(cr);
-cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,
-                               CAIRO_FONT_WEIGHT_BOLD);
-cairo_set_font_size (cr, ftSize);
-
-// cairo_move_to (cr, 10.0, 135.0);
-// cairo_show_text (cr, "Hello");
-
-cairo_move_to (cr, posX, posY);
-cairo_text_path (cr, displayText);
-cairo_set_source_rgb (cr, red, green, blue);
-cairo_fill_preserve (cr);
-cairo_set_source_rgb (cr, 0, 0, 0);
-cairo_set_line_width (cr, 2.56);
-cairo_stroke (cr);
-}
-
-int main(int argc, char* argv[]) {
-  //g_type_init();
-
-  char *filename = NULL;
-  GOptionEntry options[] = {
-    { "image", 'i', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_STRING,
-      (gpointer)&filename, "image to display", "PATH" },
-    { NULL }
-  };
-  GOptionGroup *group = g_option_group_new("image", "Image Options", "image help",
-                                           NULL, NULL);
-  g_option_group_add_entries(group, options);
-  example_options_parse(&argc, &argv, group, NULL);
-
-  if (filename == NULL) {
-    printf("must specify image with -i flag.\n"
-           "try e.g. /usr/share/pixmaps/gnome-logo-large.png\n");
-    return 1;
-  }
-
- if( argc == 10 )
-  {
-    
-    posX = atoi(argv[1]);
-    posY = atoi(argv[2]);
-    red = atoi(argv[3]);
-    green = atoi(argv[4]);
-    blue = atoi(argv[5]);
-    ftSize = atoi(argv[6]);
-    fadIn = atoi(argv[7]);
-    fadOt = atoi(argv[8]);
-sprintf(displayText,	argv[9]);
-      }
- 
-
-  Ghosd *ghosd;
-  cairo_surface_t* image = cairo_image_surface_create_from_png(filename);
-  const int width  = cairo_image_surface_get_width(image);
-  const int height = cairo_image_surface_get_height(image);
-
-  ghosd = ghosd_new();
-  ghosd_set_transparent(ghosd, opts.transparent);
-  ghosd_set_position(ghosd, opts.x, opts.y,
-                     width+(2*MARGIN), height+(2*MARGIN));
-  ghosd_set_render(ghosd, render, image);
-
-  ghosd_flash(ghosd, fadIn, fadOt);
-  return 0;
-}
-
-/* vim: set ts=2 sw=2 et cino=(0 : */
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/examples/text b/abs/mv-core/ghosd/ghosd-0.0.1/examples/text
deleted file mode 100755
index 125e25b..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/examples/text
+++ /dev/null
@@ -1,117 +0,0 @@
-#! /bin/sh
-
-# text - temporary wrapper script for .libs/text
-# Generated by ltmain.sh - GNU libtool 1.5.6 (1.1220.2.95 2004/04/11 05:50:42) Debian: 224 $
-#
-# The text program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='/bin/sed -e 1s/^X//'
-sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test "${CDPATH+set}" = set; then CDPATH=:; export CDPATH; fi
-
-relink_command="(cd /data/local/package/src/packages/local/x11/ghosd/ghosd-0.0.1/examples; { test -z \"\${LIBRARY_PATH+set}\" || unset LIBRARY_PATH || { LIBRARY_PATH=; export LIBRARY_PATH; }; }; { test -z \"\${COMPILER_PATH+set}\" || unset COMPILER_PATH || { COMPILER_PATH=; export COMPILER_PATH; }; }; { test -z \"\${GCC_EXEC_PREFIX+set}\" || unset GCC_EXEC_PREFIX || { GCC_EXEC_PREFIX=; export GCC_EXEC_PREFIX; }; }; { test -z \"\${LD_RUN_PATH+set}\" || unset LD_RUN_PATH || { LD_RUN_PATH=; export LD_RUN_PATH; }; }; PATH=\"/bin:/usr/bin:/sbin:/usr/sbin:/usr/X11R6/bin:/opt/bin:/usr/local/bin:/opt/e17/bin:/opt/kde/bin:/opt/mozilla/bin:/usr/local/bin:/opt/qt/bin:/data/local/jams/bin\"; export PATH; gcc -g -O2 -Wall -Wpointer-arith -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations -Wnested-externs -fno-strict-aliasing -o \$progdir/\$file text.o  ./.libs/libexample.a /data/local/package/src/packages/local/x11/ghosd/ghosd-0.0.1/ghosd/.libs/libghosd.so -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0 -Wl,--rpath -Wl,/data/local/package/src/packages/local/x11/ghosd/ghosd-0.0.1/ghosd/.libs)"
-
-# This environment variable determines our operation mode.
-if test "$libtool_install_magic" = "%%%MAGIC variable%%%"; then
-  # install mode needs the following variable:
-  notinst_deplibs=' /data/local/package/src/packages/local/x11/ghosd/ghosd-0.0.1/ghosd/libghosd.la'
-else
-  # When we are sourced in execute mode, $file and $echo are already set.
-  if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
-    echo="echo"
-    file="$0"
-    # Make sure echo works.
-    if test "X$1" = X--no-reexec; then
-      # Discard the --no-reexec flag, and continue.
-      shift
-    elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-      # Yippee, $echo works!
-      :
-    else
-      # Restart under the correct shell, and then maybe $echo will work.
-      exec /bin/sh "$0" --no-reexec ${1+"$@"}
-    fi
-  fi
-
-  # Find the directory that this script lives in.
-  thisdir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-  test "x$thisdir" = "x$file" && thisdir=.
-
-  # Follow symbolic links until we get to the real thisdir.
-  file=`ls -ld "$file" | /bin/sed -n 's/.*-> //p'`
-  while test -n "$file"; do
-    destdir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-
-    # If there was a directory component, then change thisdir.
-    if test "x$destdir" != "x$file"; then
-      case "$destdir" in
-      [\\/]* | [A-Za-z]:[\\/]*) thisdir="$destdir" ;;
-      *) thisdir="$thisdir/$destdir" ;;
-      esac
-    fi
-
-    file=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-    file=`ls -ld "$thisdir/$file" | /bin/sed -n 's/.*-> //p'`
-  done
-
-  # Try to get the absolute directory name.
-  absdir=`cd "$thisdir" && pwd`
-  test -n "$absdir" && thisdir="$absdir"
-
-  program=lt-'text'
-  progdir="$thisdir/.libs"
-
-  if test ! -f "$progdir/$program" || \
-     { file=`ls -1dt "$progdir/$program" "$progdir/../$program" 2>/dev/null | /bin/sed 1q`; \
-       test "X$file" != "X$progdir/$program"; }; then
-
-    file="$$-$program"
-
-    if test ! -d "$progdir"; then
-      mkdir "$progdir"
-    else
-      rm -f "$progdir/$file"
-    fi
-
-    # relink executable if necessary
-    if test -n "$relink_command"; then
-      if relink_command_output=`eval $relink_command 2>&1`; then :
-      else
-	echo "$relink_command_output" >&2
-	rm -f "$progdir/$file"
-	exit 1
-      fi
-    fi
-
-    mv -f "$progdir/$file" "$progdir/$program" 2>/dev/null ||
-    { rm -f "$progdir/$program";
-      mv -f "$progdir/$file" "$progdir/$program"; }
-    rm -f "$progdir/$file"
-  fi
-
-  if test -f "$progdir/$program"; then
-    if test "$libtool_execute_magic" != "%%%MAGIC variable%%%"; then
-      # Run the actual program with our arguments.
-
-      exec $progdir/$program ${1+"$@"}
-
-      $echo "$0: cannot exec $program ${1+"$@"}"
-      exit 1
-    fi
-  else
-    # The program doesn't exist.
-    $echo "$0: error: $progdir/$program does not exist" 1>&2
-    $echo "This script is just a wrapper for $program." 1>&2
-    echo "See the libtool documentation for more information." 1>&2
-    exit 1
-  fi
-fi
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/examples/text.c b/abs/mv-core/ghosd/ghosd-0.0.1/examples/text.c
deleted file mode 100644
index 77f59cd..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/examples/text.c
+++ /dev/null
@@ -1,83 +0,0 @@
-/* ghosd -- OSD with fake transparency, cairo, and pango.
- * Copyright (C) 2006 Evan Martin <martine@danga.com>
- */
-
-#include <stdio.h>
-
-#include <cairo/cairo.h>
-#include <pango/pangocairo.h>
-#include <time.h>
-#include <unistd.h>
-#include "example-shared.h"
-#include <X11/Xlib.h>
-
-#include <ghosd/ghosd.h>
-#include <ghosd/ghosd-text.h>
-int posX = -50;
-int posY = -50;
-char displayText[200] = "default message";
-float red = 1.0;
-float green = 1.0;
-float blue = 1.0;
-int ftSize = 30;
-int fadIn = 500;
-int fadOt = 3300;
-static void
-render(Ghosd *ghosd, cairo_t *cr, void* data) {
-  PangoLayout *layout = data;
-
-  /* drop shadow! */
-  cairo_set_source_rgba(cr, 0, 0, 0, 0.5);
-  cairo_move_to(cr, 2, 2);
-  pango_cairo_show_layout(cr, layout);
-
-
-  /* and the actual text. */
-  cairo_set_source_rgba(cr, red, green, blue, 1.0);
-  cairo_move_to(cr, 0, 0);
-  pango_cairo_show_layout(cr, layout);
-}
-
-int main(int argc, char* argv[]) {
-  Ghosd *ghosd;
-  char *filename = NULL;
-  filename="/usr/share/pixmaps/gnome-logo-large.png\n";
-  cairo_surface_t* layout = cairo_image_surface_create_from_png(filename);
-  g_type_init();
-
-  PangoContext *context;
-//  PangoLayout *layout;
-  context = pango_cairo_font_map_create_context(
-              PANGO_CAIRO_FONT_MAP(pango_cairo_font_map_get_default()));
-//  layout = pango_layout_new(context);
-
-  if( argc == 10 )
-  {
-    posX = atoi(argv[2]);
-    posY = atoi(argv[3]);
-    red = atoi(argv[4]);
-    green = atoi(argv[5]);
-    blue = atoi(argv[6]);
-    ftSize = atoi(argv[7]);
-    fadIn = atoi(argv[8]);
-    fadOt = atoi(argv[9]);
-    sprintf(displayText,	
-	"<span font_desc='Trebuchet %d'>%s</span>", ftSize, argv[1]);
-  }else{
-    sprintf(displayText,
-	"<span font_desc='Trebuchet 30'>Incomplete command</span>");
-  }
-  
-  pango_layout_set_markup(layout, displayText, -1 );
-
-  ghosd = ghosd_new();
-  ghosd_text_set_position(ghosd, posX, posY, layout);
-  ghosd_set_render(ghosd, render, layout);
-
-  ghosd_flash(ghosd, fadIn, fadOt);
-
-  return 0;
-}
-
-/* vim: set ts=2 sw=2 et cino=(0 : */
-
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/ghosd.pc b/abs/mv-core/ghosd/ghosd-0.0.1/ghosd.pc
deleted file mode 100644
index a350207..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/ghosd.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr/local
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: ghosd
-Description: X On-Screen Display with cairo and transparency
-Version: 0.0.1
-Requires: cairo pangocairo
-Libs: -L${libdir} -lghosd
-Cflags: -I${includedir}/ghosd-1.0
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/ghosd.pc.in b/abs/mv-core/ghosd/ghosd-0.0.1/ghosd.pc.in
deleted file mode 100644
index a127152..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/ghosd.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: ghosd
-Description: X On-Screen Display with cairo and transparency
-Version: @VERSION@
-Requires: @GHOSD_PACKAGES@
-Libs: -L${libdir} -lghosd
-Cflags: -I${includedir}/ghosd-1.0
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/.deps/ghosd-main.Plo b/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/.deps/ghosd-main.Plo
deleted file mode 100644
index fb45ab1..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/.deps/ghosd-main.Plo
+++ /dev/null
@@ -1,142 +0,0 @@
-ghosd-main.lo ghosd-main.o: ghosd-main.c ../config.h /usr/include/stdio.h \
-  /usr/include/features.h /usr/include/sys/cdefs.h \
-  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
-  /usr/include/gnu/stubs-32.h \
-  /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/stddef.h \
-  /usr/include/bits/types.h /usr/include/bits/typesizes.h \
-  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
-  /usr/include/bits/wchar.h /usr/include/gconv.h \
-  /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/stdarg.h \
-  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h /usr/include/stdlib.h \
-  /usr/include/sys/types.h /usr/include/time.h /usr/include/endian.h \
-  /usr/include/bits/endian.h /usr/include/sys/select.h \
-  /usr/include/bits/select.h /usr/include/bits/sigset.h \
-  /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
-  /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
-  /usr/include/sys/time.h /usr/include/sys/poll.h \
-  /usr/include/bits/poll.h /usr/include/unistd.h \
-  /usr/include/bits/posix_opt.h /usr/include/bits/confname.h \
-  /usr/include/getopt.h ghosd.h /usr/include/cairo/cairo.h \
-  /usr/include/cairo/cairo-features.h \
-  /usr/include/cairo/cairo-deprecated.h /usr/include/values.h \
-  /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/limits.h \
-  /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/syslimits.h \
-  /usr/include/limits.h /usr/include/bits/posix1_lim.h \
-  /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
-  /usr/include/bits/posix2_lim.h \
-  /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/float.h ghosd-internal.h \
-  /usr/include/X11/Xlib.h /usr/include/X11/X.h \
-  /usr/include/X11/Xfuncproto.h /usr/include/X11/Xosdefs.h
-
-../config.h:
-
-/usr/include/stdio.h:
-
-/usr/include/features.h:
-
-/usr/include/sys/cdefs.h:
-
-/usr/include/bits/wordsize.h:
-
-/usr/include/gnu/stubs.h:
-
-/usr/include/gnu/stubs-32.h:
-
-/usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/stddef.h:
-
-/usr/include/bits/types.h:
-
-/usr/include/bits/typesizes.h:
-
-/usr/include/libio.h:
-
-/usr/include/_G_config.h:
-
-/usr/include/wchar.h:
-
-/usr/include/bits/wchar.h:
-
-/usr/include/gconv.h:
-
-/usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/stdarg.h:
-
-/usr/include/bits/stdio_lim.h:
-
-/usr/include/bits/sys_errlist.h:
-
-/usr/include/bits/stdio.h:
-
-/usr/include/stdlib.h:
-
-/usr/include/sys/types.h:
-
-/usr/include/time.h:
-
-/usr/include/endian.h:
-
-/usr/include/bits/endian.h:
-
-/usr/include/sys/select.h:
-
-/usr/include/bits/select.h:
-
-/usr/include/bits/sigset.h:
-
-/usr/include/bits/time.h:
-
-/usr/include/sys/sysmacros.h:
-
-/usr/include/bits/pthreadtypes.h:
-
-/usr/include/alloca.h:
-
-/usr/include/sys/time.h:
-
-/usr/include/sys/poll.h:
-
-/usr/include/bits/poll.h:
-
-/usr/include/unistd.h:
-
-/usr/include/bits/posix_opt.h:
-
-/usr/include/bits/confname.h:
-
-/usr/include/getopt.h:
-
-ghosd.h:
-
-/usr/include/cairo/cairo.h:
-
-/usr/include/cairo/cairo-features.h:
-
-/usr/include/cairo/cairo-deprecated.h:
-
-/usr/include/values.h:
-
-/usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/limits.h:
-
-/usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/syslimits.h:
-
-/usr/include/limits.h:
-
-/usr/include/bits/posix1_lim.h:
-
-/usr/include/bits/local_lim.h:
-
-/usr/include/linux/limits.h:
-
-/usr/include/bits/posix2_lim.h:
-
-/usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/float.h:
-
-ghosd-internal.h:
-
-/usr/include/X11/Xlib.h:
-
-/usr/include/X11/X.h:
-
-/usr/include/X11/Xfuncproto.h:
-
-/usr/include/X11/Xosdefs.h:
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/.deps/ghosd-text.Plo b/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/.deps/ghosd-text.Plo
deleted file mode 100644
index c19467d..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/.deps/ghosd-text.Plo
+++ /dev/null
@@ -1,353 +0,0 @@
-ghosd-text.lo ghosd-text.o: ghosd-text.c ../config.h \
-  /usr/include/pango-1.0/pango/pangocairo.h \
-  /usr/include/pango-1.0/pango/pango-context.h \
-  /usr/include/pango-1.0/pango/pango-font.h \
-  /usr/include/pango-1.0/pango/pango-coverage.h \
-  /usr/include/glib-2.0/glib.h /usr/include/glib-2.0/glib/galloca.h \
-  /usr/include/glib-2.0/glib/gtypes.h \
-  /usr/lib/glib-2.0/include/glibconfig.h \
-  /usr/include/glib-2.0/glib/gmacros.h \
-  /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/stddef.h \
-  /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/limits.h \
-  /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/syslimits.h \
-  /usr/include/limits.h /usr/include/features.h /usr/include/sys/cdefs.h \
-  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
-  /usr/include/gnu/stubs-32.h /usr/include/bits/posix1_lim.h \
-  /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
-  /usr/include/bits/posix2_lim.h \
-  /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/float.h \
-  /usr/include/glib-2.0/glib/garray.h \
-  /usr/include/glib-2.0/glib/gasyncqueue.h \
-  /usr/include/glib-2.0/glib/gthread.h \
-  /usr/include/glib-2.0/glib/gerror.h /usr/include/glib-2.0/glib/gquark.h \
-  /usr/include/glib-2.0/glib/gutils.h \
-  /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/stdarg.h \
-  /usr/include/glib-2.0/glib/gatomic.h \
-  /usr/include/glib-2.0/glib/gbacktrace.h \
-  /usr/include/glib-2.0/glib/gbase64.h \
-  /usr/include/glib-2.0/glib/gbookmarkfile.h /usr/include/time.h \
-  /usr/include/bits/time.h /usr/include/bits/types.h \
-  /usr/include/bits/typesizes.h /usr/include/glib-2.0/glib/gcache.h \
-  /usr/include/glib-2.0/glib/glist.h /usr/include/glib-2.0/glib/gmem.h \
-  /usr/include/glib-2.0/glib/gslice.h \
-  /usr/include/glib-2.0/glib/gcompletion.h \
-  /usr/include/glib-2.0/glib/gconvert.h \
-  /usr/include/glib-2.0/glib/gdataset.h \
-  /usr/include/glib-2.0/glib/gdate.h /usr/include/glib-2.0/glib/gdir.h \
-  /usr/include/glib-2.0/glib/gfileutils.h \
-  /usr/include/glib-2.0/glib/ghash.h /usr/include/glib-2.0/glib/ghook.h \
-  /usr/include/glib-2.0/glib/giochannel.h \
-  /usr/include/glib-2.0/glib/gmain.h /usr/include/glib-2.0/glib/gslist.h \
-  /usr/include/glib-2.0/glib/gstring.h \
-  /usr/include/glib-2.0/glib/gunicode.h \
-  /usr/include/glib-2.0/glib/gkeyfile.h \
-  /usr/include/glib-2.0/glib/gmappedfile.h \
-  /usr/include/glib-2.0/glib/gmarkup.h \
-  /usr/include/glib-2.0/glib/gmessages.h \
-  /usr/include/glib-2.0/glib/gnode.h /usr/include/glib-2.0/glib/goption.h \
-  /usr/include/glib-2.0/glib/gpattern.h \
-  /usr/include/glib-2.0/glib/gprimes.h \
-  /usr/include/glib-2.0/glib/gqsort.h /usr/include/glib-2.0/glib/gqueue.h \
-  /usr/include/glib-2.0/glib/grand.h /usr/include/glib-2.0/glib/grel.h \
-  /usr/include/glib-2.0/glib/gregex.h \
-  /usr/include/glib-2.0/glib/gscanner.h \
-  /usr/include/glib-2.0/glib/gsequence.h \
-  /usr/include/glib-2.0/glib/gshell.h /usr/include/glib-2.0/glib/gspawn.h \
-  /usr/include/glib-2.0/glib/gstrfuncs.h \
-  /usr/include/glib-2.0/glib/gthreadpool.h \
-  /usr/include/glib-2.0/glib/gtimer.h /usr/include/glib-2.0/glib/gtree.h \
-  /usr/include/pango-1.0/pango/pango-types.h \
-  /usr/include/glib-2.0/glib-object.h \
-  /usr/include/glib-2.0/gobject/gboxed.h \
-  /usr/include/glib-2.0/gobject/gtype.h \
-  /usr/include/glib-2.0/gobject/genums.h \
-  /usr/include/glib-2.0/gobject/gobject.h \
-  /usr/include/glib-2.0/gobject/gvalue.h \
-  /usr/include/glib-2.0/gobject/gparam.h \
-  /usr/include/glib-2.0/gobject/gclosure.h \
-  /usr/include/glib-2.0/gobject/gsignal.h \
-  /usr/include/glib-2.0/gobject/gmarshal.h \
-  /usr/include/glib-2.0/gobject/gparamspecs.h \
-  /usr/include/glib-2.0/gobject/gsourceclosure.h \
-  /usr/include/glib-2.0/gobject/gtypemodule.h \
-  /usr/include/glib-2.0/gobject/gtypeplugin.h \
-  /usr/include/glib-2.0/gobject/gvaluearray.h \
-  /usr/include/glib-2.0/gobject/gvaluetypes.h \
-  /usr/include/pango-1.0/pango/pango-gravity.h \
-  /usr/include/pango-1.0/pango/pango-matrix.h \
-  /usr/include/pango-1.0/pango/pango-script.h \
-  /usr/include/pango-1.0/pango/pango-language.h \
-  /usr/include/pango-1.0/pango/pango-fontmap.h \
-  /usr/include/pango-1.0/pango/pango-fontset.h \
-  /usr/include/pango-1.0/pango/pango-attributes.h \
-  /usr/include/pango-1.0/pango/pango-layout.h \
-  /usr/include/pango-1.0/pango/pango-glyph-item.h \
-  /usr/include/pango-1.0/pango/pango-break.h \
-  /usr/include/pango-1.0/pango/pango-item.h \
-  /usr/include/pango-1.0/pango/pango-glyph.h \
-  /usr/include/pango-1.0/pango/pango-tabs.h /usr/include/cairo/cairo.h \
-  /usr/include/cairo/cairo-features.h \
-  /usr/include/cairo/cairo-deprecated.h ghosd-internal.h \
-  /usr/include/X11/Xlib.h /usr/include/sys/types.h /usr/include/endian.h \
-  /usr/include/bits/endian.h /usr/include/sys/select.h \
-  /usr/include/bits/select.h /usr/include/bits/sigset.h \
-  /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
-  /usr/include/X11/X.h /usr/include/X11/Xfuncproto.h \
-  /usr/include/X11/Xosdefs.h ghosd.h /usr/include/cairo/cairo.h \
-  /usr/include/values.h /usr/include/sys/time.h ghosd-text.h
-
-../config.h:
-
-/usr/include/pango-1.0/pango/pangocairo.h:
-
-/usr/include/pango-1.0/pango/pango-context.h:
-
-/usr/include/pango-1.0/pango/pango-font.h:
-
-/usr/include/pango-1.0/pango/pango-coverage.h:
-
-/usr/include/glib-2.0/glib.h:
-
-/usr/include/glib-2.0/glib/galloca.h:
-
-/usr/include/glib-2.0/glib/gtypes.h:
-
-/usr/lib/glib-2.0/include/glibconfig.h:
-
-/usr/include/glib-2.0/glib/gmacros.h:
-
-/usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/stddef.h:
-
-/usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/limits.h:
-
-/usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/syslimits.h:
-
-/usr/include/limits.h:
-
-/usr/include/features.h:
-
-/usr/include/sys/cdefs.h:
-
-/usr/include/bits/wordsize.h:
-
-/usr/include/gnu/stubs.h:
-
-/usr/include/gnu/stubs-32.h:
-
-/usr/include/bits/posix1_lim.h:
-
-/usr/include/bits/local_lim.h:
-
-/usr/include/linux/limits.h:
-
-/usr/include/bits/posix2_lim.h:
-
-/usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/float.h:
-
-/usr/include/glib-2.0/glib/garray.h:
-
-/usr/include/glib-2.0/glib/gasyncqueue.h:
-
-/usr/include/glib-2.0/glib/gthread.h:
-
-/usr/include/glib-2.0/glib/gerror.h:
-
-/usr/include/glib-2.0/glib/gquark.h:
-
-/usr/include/glib-2.0/glib/gutils.h:
-
-/usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/stdarg.h:
-
-/usr/include/glib-2.0/glib/gatomic.h:
-
-/usr/include/glib-2.0/glib/gbacktrace.h:
-
-/usr/include/glib-2.0/glib/gbase64.h:
-
-/usr/include/glib-2.0/glib/gbookmarkfile.h:
-
-/usr/include/time.h:
-
-/usr/include/bits/time.h:
-
-/usr/include/bits/types.h:
-
-/usr/include/bits/typesizes.h:
-
-/usr/include/glib-2.0/glib/gcache.h:
-
-/usr/include/glib-2.0/glib/glist.h:
-
-/usr/include/glib-2.0/glib/gmem.h:
-
-/usr/include/glib-2.0/glib/gslice.h:
-
-/usr/include/glib-2.0/glib/gcompletion.h:
-
-/usr/include/glib-2.0/glib/gconvert.h:
-
-/usr/include/glib-2.0/glib/gdataset.h:
-
-/usr/include/glib-2.0/glib/gdate.h:
-
-/usr/include/glib-2.0/glib/gdir.h:
-
-/usr/include/glib-2.0/glib/gfileutils.h:
-
-/usr/include/glib-2.0/glib/ghash.h:
-
-/usr/include/glib-2.0/glib/ghook.h:
-
-/usr/include/glib-2.0/glib/giochannel.h:
-
-/usr/include/glib-2.0/glib/gmain.h:
-
-/usr/include/glib-2.0/glib/gslist.h:
-
-/usr/include/glib-2.0/glib/gstring.h:
-
-/usr/include/glib-2.0/glib/gunicode.h:
-
-/usr/include/glib-2.0/glib/gkeyfile.h:
-
-/usr/include/glib-2.0/glib/gmappedfile.h:
-
-/usr/include/glib-2.0/glib/gmarkup.h:
-
-/usr/include/glib-2.0/glib/gmessages.h:
-
-/usr/include/glib-2.0/glib/gnode.h:
-
-/usr/include/glib-2.0/glib/goption.h:
-
-/usr/include/glib-2.0/glib/gpattern.h:
-
-/usr/include/glib-2.0/glib/gprimes.h:
-
-/usr/include/glib-2.0/glib/gqsort.h:
-
-/usr/include/glib-2.0/glib/gqueue.h:
-
-/usr/include/glib-2.0/glib/grand.h:
-
-/usr/include/glib-2.0/glib/grel.h:
-
-/usr/include/glib-2.0/glib/gregex.h:
-
-/usr/include/glib-2.0/glib/gscanner.h:
-
-/usr/include/glib-2.0/glib/gsequence.h:
-
-/usr/include/glib-2.0/glib/gshell.h:
-
-/usr/include/glib-2.0/glib/gspawn.h:
-
-/usr/include/glib-2.0/glib/gstrfuncs.h:
-
-/usr/include/glib-2.0/glib/gthreadpool.h:
-
-/usr/include/glib-2.0/glib/gtimer.h:
-
-/usr/include/glib-2.0/glib/gtree.h:
-
-/usr/include/pango-1.0/pango/pango-types.h:
-
-/usr/include/glib-2.0/glib-object.h:
-
-/usr/include/glib-2.0/gobject/gboxed.h:
-
-/usr/include/glib-2.0/gobject/gtype.h:
-
-/usr/include/glib-2.0/gobject/genums.h:
-
-/usr/include/glib-2.0/gobject/gobject.h:
-
-/usr/include/glib-2.0/gobject/gvalue.h:
-
-/usr/include/glib-2.0/gobject/gparam.h:
-
-/usr/include/glib-2.0/gobject/gclosure.h:
-
-/usr/include/glib-2.0/gobject/gsignal.h:
-
-/usr/include/glib-2.0/gobject/gmarshal.h:
-
-/usr/include/glib-2.0/gobject/gparamspecs.h:
-
-/usr/include/glib-2.0/gobject/gsourceclosure.h:
-
-/usr/include/glib-2.0/gobject/gtypemodule.h:
-
-/usr/include/glib-2.0/gobject/gtypeplugin.h:
-
-/usr/include/glib-2.0/gobject/gvaluearray.h:
-
-/usr/include/glib-2.0/gobject/gvaluetypes.h:
-
-/usr/include/pango-1.0/pango/pango-gravity.h:
-
-/usr/include/pango-1.0/pango/pango-matrix.h:
-
-/usr/include/pango-1.0/pango/pango-script.h:
-
-/usr/include/pango-1.0/pango/pango-language.h:
-
-/usr/include/pango-1.0/pango/pango-fontmap.h:
-
-/usr/include/pango-1.0/pango/pango-fontset.h:
-
-/usr/include/pango-1.0/pango/pango-attributes.h:
-
-/usr/include/pango-1.0/pango/pango-layout.h:
-
-/usr/include/pango-1.0/pango/pango-glyph-item.h:
-
-/usr/include/pango-1.0/pango/pango-break.h:
-
-/usr/include/pango-1.0/pango/pango-item.h:
-
-/usr/include/pango-1.0/pango/pango-glyph.h:
-
-/usr/include/pango-1.0/pango/pango-tabs.h:
-
-/usr/include/cairo/cairo.h:
-
-/usr/include/cairo/cairo-features.h:
-
-/usr/include/cairo/cairo-deprecated.h:
-
-ghosd-internal.h:
-
-/usr/include/X11/Xlib.h:
-
-/usr/include/sys/types.h:
-
-/usr/include/endian.h:
-
-/usr/include/bits/endian.h:
-
-/usr/include/sys/select.h:
-
-/usr/include/bits/select.h:
-
-/usr/include/bits/sigset.h:
-
-/usr/include/sys/sysmacros.h:
-
-/usr/include/bits/pthreadtypes.h:
-
-/usr/include/X11/X.h:
-
-/usr/include/X11/Xfuncproto.h:
-
-/usr/include/X11/Xosdefs.h:
-
-ghosd.h:
-
-/usr/include/cairo/cairo.h:
-
-/usr/include/values.h:
-
-/usr/include/sys/time.h:
-
-ghosd-text.h:
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/.deps/ghosd.Plo b/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/.deps/ghosd.Plo
deleted file mode 100644
index 98efcdd..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/.deps/ghosd.Plo
+++ /dev/null
@@ -1,148 +0,0 @@
-ghosd.lo ghosd.o: ghosd.c ../config.h /usr/include/stdio.h \
-  /usr/include/features.h /usr/include/sys/cdefs.h \
-  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
-  /usr/include/gnu/stubs-32.h \
-  /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/stddef.h \
-  /usr/include/bits/types.h /usr/include/bits/typesizes.h \
-  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
-  /usr/include/bits/wchar.h /usr/include/gconv.h \
-  /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/stdarg.h \
-  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
-  /usr/include/bits/stdio.h /usr/include/stdlib.h \
-  /usr/include/sys/types.h /usr/include/time.h /usr/include/endian.h \
-  /usr/include/bits/endian.h /usr/include/sys/select.h \
-  /usr/include/bits/select.h /usr/include/bits/sigset.h \
-  /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
-  /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
-  /usr/include/cairo/cairo-xlib-xrender.h /usr/include/cairo/cairo.h \
-  /usr/include/cairo/cairo-features.h \
-  /usr/include/cairo/cairo-deprecated.h /usr/include/X11/Xlib.h \
-  /usr/include/X11/X.h /usr/include/X11/Xfuncproto.h \
-  /usr/include/X11/Xosdefs.h /usr/include/X11/extensions/Xrender.h \
-  /usr/include/X11/Xutil.h /usr/include/X11/keysym.h \
-  /usr/include/X11/keysymdef.h /usr/include/X11/extensions/render.h \
-  /usr/include/X11/Xatom.h ghosd.h /usr/include/cairo/cairo.h \
-  /usr/include/values.h \
-  /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/limits.h \
-  /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/syslimits.h \
-  /usr/include/limits.h /usr/include/bits/posix1_lim.h \
-  /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
-  /usr/include/bits/posix2_lim.h \
-  /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/float.h \
-  /usr/include/sys/time.h ghosd-internal.h
-
-../config.h:
-
-/usr/include/stdio.h:
-
-/usr/include/features.h:
-
-/usr/include/sys/cdefs.h:
-
-/usr/include/bits/wordsize.h:
-
-/usr/include/gnu/stubs.h:
-
-/usr/include/gnu/stubs-32.h:
-
-/usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/stddef.h:
-
-/usr/include/bits/types.h:
-
-/usr/include/bits/typesizes.h:
-
-/usr/include/libio.h:
-
-/usr/include/_G_config.h:
-
-/usr/include/wchar.h:
-
-/usr/include/bits/wchar.h:
-
-/usr/include/gconv.h:
-
-/usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/stdarg.h:
-
-/usr/include/bits/stdio_lim.h:
-
-/usr/include/bits/sys_errlist.h:
-
-/usr/include/bits/stdio.h:
-
-/usr/include/stdlib.h:
-
-/usr/include/sys/types.h:
-
-/usr/include/time.h:
-
-/usr/include/endian.h:
-
-/usr/include/bits/endian.h:
-
-/usr/include/sys/select.h:
-
-/usr/include/bits/select.h:
-
-/usr/include/bits/sigset.h:
-
-/usr/include/bits/time.h:
-
-/usr/include/sys/sysmacros.h:
-
-/usr/include/bits/pthreadtypes.h:
-
-/usr/include/alloca.h:
-
-/usr/include/cairo/cairo-xlib-xrender.h:
-
-/usr/include/cairo/cairo.h:
-
-/usr/include/cairo/cairo-features.h:
-
-/usr/include/cairo/cairo-deprecated.h:
-
-/usr/include/X11/Xlib.h:
-
-/usr/include/X11/X.h:
-
-/usr/include/X11/Xfuncproto.h:
-
-/usr/include/X11/Xosdefs.h:
-
-/usr/include/X11/extensions/Xrender.h:
-
-/usr/include/X11/Xutil.h:
-
-/usr/include/X11/keysym.h:
-
-/usr/include/X11/keysymdef.h:
-
-/usr/include/X11/extensions/render.h:
-
-/usr/include/X11/Xatom.h:
-
-ghosd.h:
-
-/usr/include/cairo/cairo.h:
-
-/usr/include/values.h:
-
-/usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/limits.h:
-
-/usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/syslimits.h:
-
-/usr/include/limits.h:
-
-/usr/include/bits/posix1_lim.h:
-
-/usr/include/bits/local_lim.h:
-
-/usr/include/linux/limits.h:
-
-/usr/include/bits/posix2_lim.h:
-
-/usr/lib/gcc/i686-pc-linux-gnu/4.2.1/include/float.h:
-
-/usr/include/sys/time.h:
-
-ghosd-internal.h:
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/.libs/libghosd.lai b/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/.libs/libghosd.lai
deleted file mode 100644
index 8fc7f0c..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/.libs/libghosd.lai
+++ /dev/null
@@ -1,35 +0,0 @@
-# libghosd.la - a libtool library file
-# Generated by ltmain.sh - GNU libtool 1.5.6 (1.1220.2.95 2004/04/11 05:50:42) Debian: 224 $
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='libghosd.so.0'
-
-# Names of this library.
-library_names='libghosd.so.0.0.0 libghosd.so.0 libghosd.so'
-
-# The name of the static archive.
-old_library='libghosd.a'
-
-# Libraries that this one depends upon.
-dependency_libs=' -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0'
-
-# Version information for libghosd.
-current=0
-age=0
-revision=0
-
-# Is this an already installed library?
-installed=yes
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=no
-
-# Files to dlopen/dlpreopen
-dlopen=''
-dlpreopen=''
-
-# Directory that this library needs to be installed in:
-libdir='/usr/local/lib'
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/.libs/libghosd.so b/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/.libs/libghosd.so
deleted file mode 100755
index 2cdc42b..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/.libs/libghosd.so
+++ /dev/null
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/.libs/libghosd.so.0 b/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/.libs/libghosd.so.0
deleted file mode 100755
index 2cdc42b..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/.libs/libghosd.so.0
+++ /dev/null
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/.libs/libghosd.so.0.0.0 b/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/.libs/libghosd.so.0.0.0
deleted file mode 100755
index 2cdc42b..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/.libs/libghosd.so.0.0.0
+++ /dev/null
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/Makefile b/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/Makefile
deleted file mode 100644
index e2a78fb..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/Makefile
+++ /dev/null
@@ -1,516 +0,0 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
-# ghosd/Makefile.  Generated from Makefile.in by configure.
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-
-
-
-SOURCES = $(libghosd_la_SOURCES)
-
-srcdir = .
-top_srcdir = ..
-
-pkgdatadir = $(datadir)/ghosd
-pkglibdir = $(libdir)/ghosd
-pkgincludedir = $(includedir)/ghosd
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = /bin/install -c
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = i686-pc-linux-gnu
-host_triplet = i686-pc-linux-gnu
-subdir = ghosd
-DIST_COMMON = $(am__libghosd_la_include_HEADERS_DIST) \
-	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libdir)" \
-	"$(DESTDIR)$(libghosd_la_includedir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(lib_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-libghosd_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am__libghosd_la_SOURCES_DIST = ghosd-internal.h ghosd.c ghosd-main.c \
-	ghosd-text.c
-am__objects_1 = ghosd.lo ghosd-main.lo
-am__objects_2 = ghosd-text.lo
-#am_libghosd_la_OBJECTS = $(am__objects_1)
-am_libghosd_la_OBJECTS = $(am__objects_1) $(am__objects_2)
-libghosd_la_OBJECTS = $(am_libghosd_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libghosd_la_SOURCES)
-DIST_SOURCES = $(am__libghosd_la_SOURCES_DIST)
-am__libghosd_la_include_HEADERS_DIST = ghosd.h ghosd-text.h
-libghosd_la_includeHEADERS_INSTALL = $(INSTALL_HEADER)
-HEADERS = $(libghosd_la_include_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = ${SHELL} /data/local/jams/ghosd-0.0.1/missing --run aclocal-1.9
-AMDEP_FALSE = #
-AMDEP_TRUE = 
-AMTAR = ${SHELL} /data/local/jams/ghosd-0.0.1/missing --run tar
-AR = ar
-AUTOCONF = ${SHELL} /data/local/jams/ghosd-0.0.1/missing --run autoconf
-AUTOHEADER = ${SHELL} /data/local/jams/ghosd-0.0.1/missing --run autoheader
-AUTOMAKE = ${SHELL} /data/local/jams/ghosd-0.0.1/missing --run automake-1.9
-AWK = gawk
-CC = gcc
-CCDEPMODE = depmode=gcc3
-CFLAGS = -g -O2 -Wall -Wpointer-arith -Wstrict-prototypes                -Wmissing-prototypes -Wmissing-declarations                -Wnested-externs -fno-strict-aliasing
-CPP = gcc -E
-CPPFLAGS = 
-CXX = g++
-CXXCPP = g++ -E
-CXXDEPMODE = depmode=gcc3
-CXXFLAGS = -g -O2
-CYGPATH_W = echo
-DEFS = -DHAVE_CONFIG_H
-DEPDIR = .deps
-ECHO = echo
-ECHO_C = 
-ECHO_N = -n
-ECHO_T = 
-EGREP = grep -E
-ENABLE_GTK_DOC_FALSE = 
-ENABLE_GTK_DOC_TRUE = #
-EXEEXT = 
-F77 = 
-FFLAGS = 
-GHOSD_CFLAGS = -I/usr/include/cairo -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
-GHOSD_EXAMPLE_CFLAGS = -I/usr/include/cairo -I/usr/include/freetype2 -I/usr/include/libpng12 -I/usr/include/pango-1.0 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include  
-GHOSD_EXAMPLE_LIBS = -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  
-GHOSD_LIBS = -lpangocairo-1.0 -lpango-1.0 -lcairo -lgobject-2.0 -lgmodule-2.0 -ldl -lglib-2.0  
-GHOSD_PACKAGES = cairo pangocairo
-GTK_DOC_USE_LIBTOOL_FALSE = #
-GTK_DOC_USE_LIBTOOL_TRUE = 
-HTML_DIR = ${datadir}/gtk-doc/html
-INSTALL_DATA = ${INSTALL} -m 644
-INSTALL_PROGRAM = ${INSTALL}
-INSTALL_SCRIPT = ${INSTALL}
-INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
-LDFLAGS = 
-LIBOBJS = 
-LIBS = 
-LIBTOOL = $(SHELL) $(top_builddir)/libtool
-LN_S = ln -s
-LTLIBOBJS = 
-MAINT = #
-MAINTAINER_MODE_FALSE = 
-MAINTAINER_MODE_TRUE = #
-MAKEINFO = ${SHELL} /data/local/jams/ghosd-0.0.1/missing --run makeinfo
-OBJEXT = o
-PACKAGE = ghosd
-PACKAGE_BUGREPORT = martine@danga.com
-PACKAGE_NAME = ghosd
-PACKAGE_STRING = ghosd 0.0.1
-PACKAGE_TARNAME = ghosd
-PACKAGE_VERSION = 0.0.1
-PANGO_FALSE = #
-PANGO_TRUE = 
-PATH_SEPARATOR = :
-PKG_CONFIG = /usr/bin/pkg-config
-RANLIB = ranlib
-SET_MAKE = 
-SHELL = /bin/sh
-STRIP = strip
-VERSION = 0.0.1
-VERSION_INFO = 0:0:0
-ac_ct_AR = ar
-ac_ct_CC = gcc
-ac_ct_CXX = g++
-ac_ct_F77 = 
-ac_ct_RANLIB = ranlib
-ac_ct_STRIP = strip
-ac_pt_PKG_CONFIG = /usr/bin/pkg-config
-am__fastdepCC_FALSE = #
-am__fastdepCC_TRUE = 
-am__fastdepCXX_FALSE = #
-am__fastdepCXX_TRUE = 
-am__include = include
-am__leading_dot = .
-am__quote = 
-am__tar = ${AMTAR} chof - "$$tardir"
-am__untar = ${AMTAR} xf -
-bindir = ${exec_prefix}/bin
-build = i686-pc-linux-gnu
-build_alias = 
-build_cpu = i686
-build_os = linux-gnu
-build_vendor = pc
-datadir = ${prefix}/share
-exec_prefix = ${prefix}
-host = i686-pc-linux-gnu
-host_alias = 
-host_cpu = i686
-host_os = linux-gnu
-host_vendor = pc
-includedir = ${prefix}/include
-infodir = ${prefix}/info
-install_sh = /data/local/jams/ghosd-0.0.1/install-sh
-libdir = ${exec_prefix}/lib
-libexecdir = ${exec_prefix}/libexec
-localstatedir = ${prefix}/var
-mandir = ${prefix}/man
-mkdir_p = mkdir -p --
-oldincludedir = /usr/include
-prefix = /usr/local
-program_transform_name = s,x,x,
-sbindir = ${exec_prefix}/sbin
-sharedstatedir = ${prefix}/com
-sysconfdir = ${prefix}/etc
-target_alias = 
-lib_LTLIBRARIES = libghosd.la
-INCLUDES = $(GHOSD_CFLAGS)
-libghosd_la_LDFLAGS = -version-info 0:0:0
-libghosd_la_LIBADD = $(GHOSD_LIBS)
-libghosd_la_includedir = $(includedir)/ghosd-1.0/ghosd
-headers = ghosd.h
-# ghosd-internal.h is in SOURCES not HEADERS because we don't
-# want to install it into /usr/include/.../
-sources = ghosd-internal.h ghosd.c ghosd-main.c
-pango_headers = ghosd-text.h
-pango_sources = ghosd-text.c
-#libghosd_la_SOURCES = $(sources)
-libghosd_la_SOURCES = $(sources) $(pango_sources)
-#libghosd_la_include_HEADERS = $(headers)
-libghosd_la_include_HEADERS = $(headers) $(pango_headers)
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: # $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  ghosd/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  ghosd/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: # $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): # $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
-	  else :; fi; \
-	done
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
-	done
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libghosd.la: $(libghosd_la_OBJECTS) $(libghosd_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libghosd_la_LDFLAGS) $(libghosd_la_OBJECTS) $(libghosd_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-include ./$(DEPDIR)/ghosd-main.Plo
-include ./$(DEPDIR)/ghosd-text.Plo
-include ./$(DEPDIR)/ghosd.Plo
-
-.c.o:
-	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-#	source='$<' object='$@' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(COMPILE) -c $<
-
-.c.obj:
-	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-#	source='$<' object='$@' libtool=no \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-#	source='$<' object='$@' libtool=yes \
-#	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) \
-#	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-install-libghosd_la_includeHEADERS: $(libghosd_la_include_HEADERS)
-	@$(NORMAL_INSTALL)
-	test -z "$(libghosd_la_includedir)" || $(mkdir_p) "$(DESTDIR)$(libghosd_la_includedir)"
-	@list='$(libghosd_la_include_HEADERS)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(libghosd_la_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libghosd_la_includedir)/$$f'"; \
-	  $(libghosd_la_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libghosd_la_includedir)/$$f"; \
-	done
-
-uninstall-libghosd_la_includeHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(libghosd_la_include_HEADERS)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(libghosd_la_includedir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(libghosd_la_includedir)/$$f"; \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libghosd_la_includedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am: install-libghosd_la_includeHEADERS
-
-install-exec-am: install-libLTLIBRARIES
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
-	uninstall-libghosd_la_includeHEADERS
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libLTLIBRARIES clean-libtool ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
-	install-libLTLIBRARIES install-libghosd_la_includeHEADERS \
-	install-man install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-info-am uninstall-libLTLIBRARIES \
-	uninstall-libghosd_la_includeHEADERS
-
-
-# vim: set ts=2 sw=2 et cino=(0 :
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/Makefile.am b/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/Makefile.am
deleted file mode 100644
index 92b9611..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/Makefile.am
+++ /dev/null
@@ -1,24 +0,0 @@
-lib_LTLIBRARIES = libghosd.la
-
-INCLUDES = $(GHOSD_CFLAGS)
-libghosd_la_LDFLAGS = -version-info @VERSION_INFO@
-libghosd_la_LIBADD = $(GHOSD_LIBS)
-libghosd_la_includedir = $(includedir)/ghosd-1.0/ghosd
-
-headers = ghosd.h
-# ghosd-internal.h is in SOURCES not HEADERS because we don't
-# want to install it into /usr/include/.../
-sources = ghosd-internal.h ghosd.c ghosd-main.c
-
-pango_headers = ghosd-text.h
-pango_sources = ghosd-text.c
-
-if PANGO
-libghosd_la_SOURCES = $(sources) $(pango_sources)
-libghosd_la_include_HEADERS = $(headers) $(pango_headers)
-else
-libghosd_la_SOURCES = $(sources)
-libghosd_la_include_HEADERS = $(headers)
-endif
-
-# vim: set ts=2 sw=2 et cino=(0 :
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/Makefile.in b/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/Makefile.in
deleted file mode 100644
index 5c95f57..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/Makefile.in
+++ /dev/null
@@ -1,516 +0,0 @@
-# Makefile.in generated by automake 1.9.5 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005  Free Software Foundation, Inc.
-# This Makefile.in is free software; the Free Software Foundation
-# gives unlimited permission to copy and/or distribute it,
-# with or without modifications, as long as this notice is preserved.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.
-
-@SET_MAKE@
-
-
-SOURCES = $(libghosd_la_SOURCES)
-
-srcdir = @srcdir@
-top_srcdir = @top_srcdir@
-VPATH = @srcdir@
-pkgdatadir = $(datadir)/@PACKAGE@
-pkglibdir = $(libdir)/@PACKAGE@
-pkgincludedir = $(includedir)/@PACKAGE@
-top_builddir = ..
-am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
-INSTALL = @INSTALL@
-install_sh_DATA = $(install_sh) -c -m 644
-install_sh_PROGRAM = $(install_sh) -c
-install_sh_SCRIPT = $(install_sh) -c
-INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
-NORMAL_INSTALL = :
-PRE_INSTALL = :
-POST_INSTALL = :
-NORMAL_UNINSTALL = :
-PRE_UNINSTALL = :
-POST_UNINSTALL = :
-build_triplet = @build@
-host_triplet = @host@
-subdir = ghosd
-DIST_COMMON = $(am__libghosd_la_include_HEADERS_DIST) \
-	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-	$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
-am__vpath_adj = case $$p in \
-    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
-    *) f=$$p;; \
-  esac;
-am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(libdir)" \
-	"$(DESTDIR)$(libghosd_la_includedir)"
-libLTLIBRARIES_INSTALL = $(INSTALL)
-LTLIBRARIES = $(lib_LTLIBRARIES)
-am__DEPENDENCIES_1 =
-libghosd_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
-am__libghosd_la_SOURCES_DIST = ghosd-internal.h ghosd.c ghosd-main.c \
-	ghosd-text.c
-am__objects_1 = ghosd.lo ghosd-main.lo
-am__objects_2 = ghosd-text.lo
-@PANGO_FALSE@am_libghosd_la_OBJECTS = $(am__objects_1)
-@PANGO_TRUE@am_libghosd_la_OBJECTS = $(am__objects_1) $(am__objects_2)
-libghosd_la_OBJECTS = $(am_libghosd_la_OBJECTS)
-DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
-depcomp = $(SHELL) $(top_srcdir)/depcomp
-am__depfiles_maybe = depfiles
-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
-	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
-	$(AM_CFLAGS) $(CFLAGS)
-CCLD = $(CC)
-LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
-	$(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = $(libghosd_la_SOURCES)
-DIST_SOURCES = $(am__libghosd_la_SOURCES_DIST)
-am__libghosd_la_include_HEADERS_DIST = ghosd.h ghosd-text.h
-libghosd_la_includeHEADERS_INSTALL = $(INSTALL_HEADER)
-HEADERS = $(libghosd_la_include_HEADERS)
-ETAGS = etags
-CTAGS = ctags
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-ENABLE_GTK_DOC_FALSE = @ENABLE_GTK_DOC_FALSE@
-ENABLE_GTK_DOC_TRUE = @ENABLE_GTK_DOC_TRUE@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-GHOSD_CFLAGS = @GHOSD_CFLAGS@
-GHOSD_EXAMPLE_CFLAGS = @GHOSD_EXAMPLE_CFLAGS@
-GHOSD_EXAMPLE_LIBS = @GHOSD_EXAMPLE_LIBS@
-GHOSD_LIBS = @GHOSD_LIBS@
-GHOSD_PACKAGES = @GHOSD_PACKAGES@
-GTK_DOC_USE_LIBTOOL_FALSE = @GTK_DOC_USE_LIBTOOL_FALSE@
-GTK_DOC_USE_LIBTOOL_TRUE = @GTK_DOC_USE_LIBTOOL_TRUE@
-HTML_DIR = @HTML_DIR@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
-INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBOBJS = @LIBOBJS@
-LIBS = @LIBS@
-LIBTOOL = @LIBTOOL@
-LN_S = @LN_S@
-LTLIBOBJS = @LTLIBOBJS@
-MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
-PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PANGO_FALSE = @PANGO_FALSE@
-PANGO_TRUE = @PANGO_TRUE@
-PATH_SEPARATOR = @PATH_SEPARATOR@
-PKG_CONFIG = @PKG_CONFIG@
-RANLIB = @RANLIB@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
-STRIP = @STRIP@
-VERSION = @VERSION@
-VERSION_INFO = @VERSION_INFO@
-ac_ct_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-ac_ct_RANLIB = @ac_ct_RANLIB@
-ac_ct_STRIP = @ac_ct_STRIP@
-ac_pt_PKG_CONFIG = @ac_pt_PKG_CONFIG@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
-am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-am__quote = @am__quote@
-am__tar = @am__tar@
-am__untar = @am__untar@
-bindir = @bindir@
-build = @build@
-build_alias = @build_alias@
-build_cpu = @build_cpu@
-build_os = @build_os@
-build_vendor = @build_vendor@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host = @host@
-host_alias = @host_alias@
-host_cpu = @host_cpu@
-host_os = @host_os@
-host_vendor = @host_vendor@
-includedir = @includedir@
-infodir = @infodir@
-install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-lib_LTLIBRARIES = libghosd.la
-INCLUDES = $(GHOSD_CFLAGS)
-libghosd_la_LDFLAGS = -version-info @VERSION_INFO@
-libghosd_la_LIBADD = $(GHOSD_LIBS)
-libghosd_la_includedir = $(includedir)/ghosd-1.0/ghosd
-headers = ghosd.h
-# ghosd-internal.h is in SOURCES not HEADERS because we don't
-# want to install it into /usr/include/.../
-sources = ghosd-internal.h ghosd.c ghosd-main.c
-pango_headers = ghosd-text.h
-pango_sources = ghosd-text.c
-@PANGO_FALSE@libghosd_la_SOURCES = $(sources)
-@PANGO_TRUE@libghosd_la_SOURCES = $(sources) $(pango_sources)
-@PANGO_FALSE@libghosd_la_include_HEADERS = $(headers)
-@PANGO_TRUE@libghosd_la_include_HEADERS = $(headers) $(pango_headers)
-all: all-am
-
-.SUFFIXES:
-.SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-	@for dep in $?; do \
-	  case '$(am__configure_deps)' in \
-	    *$$dep*) \
-	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-		&& exit 0; \
-	      exit 1;; \
-	  esac; \
-	done; \
-	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  ghosd/Makefile'; \
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --foreign  ghosd/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-	@case '$?' in \
-	  *config.status*) \
-	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-	  *) \
-	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-	esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-install-libLTLIBRARIES: $(lib_LTLIBRARIES)
-	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(mkdir_p) "$(DESTDIR)$(libdir)"
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    f=$(am__strip_dir) \
-	    echo " $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) '$$p' '$(DESTDIR)$(libdir)/$$f'"; \
-	    $(LIBTOOL) --mode=install $(libLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) "$$p" "$(DESTDIR)$(libdir)/$$f"; \
-	  else :; fi; \
-	done
-
-uninstall-libLTLIBRARIES:
-	@$(NORMAL_UNINSTALL)
-	@set -x; list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  p=$(am__strip_dir) \
-	  echo " $(LIBTOOL) --mode=uninstall rm -f '$(DESTDIR)$(libdir)/$$p'"; \
-	  $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/$$p"; \
-	done
-
-clean-libLTLIBRARIES:
-	-test -z "$(lib_LTLIBRARIES)" || rm -f $(lib_LTLIBRARIES)
-	@list='$(lib_LTLIBRARIES)'; for p in $$list; do \
-	  dir="`echo $$p | sed -e 's|/[^/]*$$||'`"; \
-	  test "$$dir" != "$$p" || dir=.; \
-	  echo "rm -f \"$${dir}/so_locations\""; \
-	  rm -f "$${dir}/so_locations"; \
-	done
-libghosd.la: $(libghosd_la_OBJECTS) $(libghosd_la_DEPENDENCIES) 
-	$(LINK) -rpath $(libdir) $(libghosd_la_LDFLAGS) $(libghosd_la_OBJECTS) $(libghosd_la_LIBADD) $(LIBS)
-
-mostlyclean-compile:
-	-rm -f *.$(OBJEXT)
-
-distclean-compile:
-	-rm -f *.tab.c
-
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ghosd-main.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ghosd-text.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ghosd.Plo@am__quote@
-
-.c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c $<
-
-.c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ `$(CYGPATH_W) '$<'`; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `$(CYGPATH_W) '$<'`
-
-.c.lo:
-@am__fastdepCC_TRUE@	if $(LTCOMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
-@am__fastdepCC_TRUE@	then mv -f "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Plo"; else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(LTCOMPILE) -c -o $@ $<
-
-mostlyclean-libtool:
-	-rm -f *.lo
-
-clean-libtool:
-	-rm -rf .libs _libs
-
-distclean-libtool:
-	-rm -f libtool
-uninstall-info-am:
-install-libghosd_la_includeHEADERS: $(libghosd_la_include_HEADERS)
-	@$(NORMAL_INSTALL)
-	test -z "$(libghosd_la_includedir)" || $(mkdir_p) "$(DESTDIR)$(libghosd_la_includedir)"
-	@list='$(libghosd_la_include_HEADERS)'; for p in $$list; do \
-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
-	  f=$(am__strip_dir) \
-	  echo " $(libghosd_la_includeHEADERS_INSTALL) '$$d$$p' '$(DESTDIR)$(libghosd_la_includedir)/$$f'"; \
-	  $(libghosd_la_includeHEADERS_INSTALL) "$$d$$p" "$(DESTDIR)$(libghosd_la_includedir)/$$f"; \
-	done
-
-uninstall-libghosd_la_includeHEADERS:
-	@$(NORMAL_UNINSTALL)
-	@list='$(libghosd_la_include_HEADERS)'; for p in $$list; do \
-	  f=$(am__strip_dir) \
-	  echo " rm -f '$(DESTDIR)$(libghosd_la_includedir)/$$f'"; \
-	  rm -f "$(DESTDIR)$(libghosd_la_includedir)/$$f"; \
-	done
-
-ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
-	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	mkid -fID $$unique
-tags: TAGS
-
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-	  test -n "$$unique" || unique=$$empty_fix; \
-	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-	    $$tags $$unique; \
-	fi
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
-GTAGS:
-	here=`$(am__cd) $(top_builddir) && pwd` \
-	  && cd $(top_srcdir) \
-	  && gtags -i $(GTAGS_ARGS) $$here
-
-distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
-
-distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
-	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
-	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
-	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
-	    dir="/$$dir"; \
-	    $(mkdir_p) "$(distdir)$$dir"; \
-	  else \
-	    dir=''; \
-	  fi; \
-	  if test -d $$d/$$file; then \
-	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
-	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
-	    fi; \
-	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
-	  else \
-	    test -f $(distdir)/$$file \
-	    || cp -p $$d/$$file $(distdir)/$$file \
-	    || exit 1; \
-	  fi; \
-	done
-check-am: all-am
-check: check-am
-all-am: Makefile $(LTLIBRARIES) $(HEADERS)
-installdirs:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(libghosd_la_includedir)"; do \
-	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
-	done
-install: install-am
-install-exec: install-exec-am
-install-data: install-data-am
-uninstall: uninstall-am
-
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-
-installcheck: installcheck-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
-mostlyclean-generic:
-
-clean-generic:
-
-distclean-generic:
-	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
-
-maintainer-clean-generic:
-	@echo "This command is intended for maintainers to use"
-	@echo "it deletes files that may require special tools to rebuild."
-clean: clean-am
-
-clean-am: clean-generic clean-libLTLIBRARIES clean-libtool \
-	mostlyclean-am
-
-distclean: distclean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-distclean-am: clean-am distclean-compile distclean-generic \
-	distclean-libtool distclean-tags
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-am
-
-info: info-am
-
-info-am:
-
-install-data-am: install-libghosd_la_includeHEADERS
-
-install-exec-am: install-libLTLIBRARIES
-
-install-info: install-info-am
-
-install-man:
-
-installcheck-am:
-
-maintainer-clean: maintainer-clean-am
-	-rm -rf ./$(DEPDIR)
-	-rm -f Makefile
-maintainer-clean-am: distclean-am maintainer-clean-generic
-
-mostlyclean: mostlyclean-am
-
-mostlyclean-am: mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool
-
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
-uninstall-am: uninstall-info-am uninstall-libLTLIBRARIES \
-	uninstall-libghosd_la_includeHEADERS
-
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
-	clean-libLTLIBRARIES clean-libtool ctags distclean \
-	distclean-compile distclean-generic distclean-libtool \
-	distclean-tags distdir dvi dvi-am html html-am info info-am \
-	install install-am install-data install-data-am install-exec \
-	install-exec-am install-info install-info-am \
-	install-libLTLIBRARIES install-libghosd_la_includeHEADERS \
-	install-man install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-compile mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-info-am uninstall-libLTLIBRARIES \
-	uninstall-libghosd_la_includeHEADERS
-
-
-# vim: set ts=2 sw=2 et cino=(0 :
-# Tell versions [3.59,3.63) of GNU make to not export all variables.
-# Otherwise a system limit (for SysV at least) may be exceeded.
-.NOEXPORT:
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/ghosd-internal.h b/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/ghosd-internal.h
deleted file mode 100644
index 262afe6..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/ghosd-internal.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* ghosd -- OSD with fake transparency, cairo, and pango.
- * Copyright (C) 2006 Evan Martin <martine@danga.com>
- */
-
-#include <X11/Xlib.h>
-
-#include "ghosd.h"
-
-struct _Ghosd {
-  Display *dpy;
-  Window win;
-  int transparent;
-  int x, y, width, height;
-  
-  Pixmap background;
-  Pixmap draw_buffer;
-  GhosdRenderFunc render_func;
-  void *render_data;
-};
-
-/* vim: set ts=2 sw=2 et cino=(0 : */
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/ghosd-main.c b/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/ghosd-main.c
deleted file mode 100644
index bac397e..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/ghosd-main.c
+++ /dev/null
@@ -1,158 +0,0 @@
-/* ghosd -- OSD with fake transparency, cairo, and pango.
- * Copyright (C) 2006 Evan Martin <martine@danga.com>
- */
-
-#include "config.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/time.h>
-#include <sys/poll.h>
-#include <time.h>
-#include <unistd.h>
-
-#include "ghosd.h"
-#include "ghosd-internal.h"
-
-static void
-ghosd_main_iteration(Ghosd *ghosd) {
-  XEvent ev, pev;
-  XNextEvent(ghosd->dpy, &ev);
-  
-  /* smash multiple configure/exposes into one. */
-  if (ev.type == ConfigureNotify) {
-    while (XPending(ghosd->dpy)) {
-      XPeekEvent(ghosd->dpy, &pev);
-      if (pev.type != ConfigureNotify && pev.type != Expose)
-        break;
-      XNextEvent(ghosd->dpy, &ev);
-    }
-  }
-
-  switch (ev.type) {
-  case Expose:
-    break;
-  case ConfigureNotify:
-    if (ghosd->width > 0) {
-      /* XXX if the window manager disagrees with our positioning here,
-       * we loop. */
-      if (ghosd->x != ev.xconfigure.x ||
-          ghosd->y != ev.xconfigure.y) {
-        /*width = ev.xconfigure.width; 
-        height = ev.xconfigure.height;*/
-        XMoveResizeWindow(ghosd->dpy, ghosd->win,
-                          ghosd->x, ghosd->y, ghosd->width, ghosd->height);
-      }
-    }
-    break;
-  }
-}
-
-void
-ghosd_main_iterations(Ghosd *ghosd) {
-  while (XPending(ghosd->dpy))
-    ghosd_main_iteration(ghosd);
-}
-
-typedef struct {
-  GhosdRenderFunc render_func;
-  void *render_data;
-  cairo_surface_t* surface;
-  float alpha;
-} GhosdFlashData;
-
-static void
-ghosd_flash_render(Ghosd *ghosd, cairo_t *cr, void* data) {
-  GhosdFlashData *flash = data;
-
-  /* the first time we render, let the client render into their own surface. */
-  if (flash->surface == NULL) {
-    cairo_t *rendered_cr;
-    flash->surface = cairo_surface_create_similar(cairo_get_target(cr),
-                                                  CAIRO_CONTENT_COLOR_ALPHA,
-                                                  ghosd->width, ghosd->height);
-    rendered_cr = cairo_create(flash->surface);
-    flash->render_func(ghosd, rendered_cr, flash->render_data);
-    cairo_destroy(rendered_cr);
-  }
-
-  /* now that we have a rendered surface, all we normally do is copy that to
-   * the screen. */
-  cairo_set_source_surface(cr, flash->surface, 0, 0);
-  cairo_paint_with_alpha(cr, flash->alpha);
-}
-
-void
-ghosd_main_until(Ghosd *ghosd, struct timeval *until) {
-  struct timeval tv_now;
-
-  ghosd_main_iterations(ghosd);
-
-  for (;;) {
-    gettimeofday(&tv_now, NULL);
-    int dt = (until->tv_sec  - tv_now.tv_sec )*1000 +
-             (until->tv_usec - tv_now.tv_usec)/1000;
-    if (dt <= 0) break;
-
-    struct pollfd pollfd = { ghosd_get_socket(ghosd), POLLIN, 0 };
-    int ret = poll(&pollfd, 1, dt);
-    if (ret < 0) {
-      perror("poll");
-      exit(1);
-    } else if (ret > 0) {
-      ghosd_main_iterations(ghosd);
-    } else {
-      /* timer expired. */
-      break;
-    }
-  }
-}
-
-void
-ghosd_flash(Ghosd *ghosd, int fade_ms, int total_display_ms) {
-  GhosdFlashData flash = {0};
-  flash.render_func = ghosd->render_func;
-  flash.render_data = ghosd->render_data;
-  ghosd->render_func = ghosd_flash_render;
-  ghosd->render_data = &flash;
-
-  ghosd_render(ghosd);
-  ghosd_show(ghosd);
-
-  const int STEP_MS = 50;
-  const float dalpha = 1.0 / (fade_ms / (float)STEP_MS);
-  struct timeval tv_nextupdate;
-
-  /* fade in. */
-  for (flash.alpha = 0; flash.alpha < 1.0; flash.alpha += dalpha) {
-    if (flash.alpha > 1.0) flash.alpha = 1.0;
-    ghosd_render(ghosd);
-
-    gettimeofday(&tv_nextupdate, NULL);
-    tv_nextupdate.tv_usec += STEP_MS*1000;
-    ghosd_main_until(ghosd, &tv_nextupdate);
-  }
-
-  /* full display. */
-  flash.alpha = 1.0;
-  ghosd_render(ghosd);
-
-  gettimeofday(&tv_nextupdate, NULL);
-  tv_nextupdate.tv_usec += (total_display_ms - (2*fade_ms))*1000;
-  ghosd_main_until(ghosd, &tv_nextupdate);
-
-  /* fade out. */
-  for (flash.alpha = 1.0; flash.alpha > 0.0; flash.alpha -= dalpha) {
-    ghosd_render(ghosd);
-
-    gettimeofday(&tv_nextupdate, NULL);
-    tv_nextupdate.tv_usec += STEP_MS*1000;
-    ghosd_main_until(ghosd, &tv_nextupdate);
-  }
-
-  flash.alpha = 0;
-  ghosd_render(ghosd);
-  ghosd_main_iterations(ghosd);
-}
-
-/* vim: set ts=2 sw=2 et cino=(0 : */
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/ghosd-text.c b/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/ghosd-text.c
deleted file mode 100644
index ba62616..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/ghosd-text.c
+++ /dev/null
@@ -1,25 +0,0 @@
-/* ghosd -- OSD with fake transparency, cairo, and pango.
- * Copyright (C) 2006 Evan Martin <martine@danga.com>
- */
-
-#include "config.h"
-
-#include <pango/pangocairo.h>
-#include "ghosd-internal.h"
-#include "ghosd-text.h"
-
-void
-ghosd_text_set_position(Ghosd *ghosd, int x, int y, PangoLayout *layout) {
-  PangoRectangle ink_rect;
-  pango_layout_get_pixel_extents(layout, &ink_rect, NULL);
-  /*printf("rect %d %d %d %d\n",
-         ink_rect.x, ink_rect.y,
-         ink_rect.width, ink_rect.height);*/
-
-  const int width = ink_rect.x + ink_rect.width+5;
-  const int height = ink_rect.y + ink_rect.height+5;
-
-  ghosd_set_position(ghosd, x, y, width, height);
-}
-
-/* vim: set ts=2 sw=2 et cino=(0 : */
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/ghosd-text.h b/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/ghosd-text.h
deleted file mode 100644
index 7d3b1fc..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/ghosd-text.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* ghosd -- OSD with fake transparency, cairo, and pango.
- * Copyright (C) 2006 Evan Martin <martine@danga.com>
- */
-
-#ifndef __GHOSD_TEXT_H__
-#define __GHOSD_TEXT_H__
-
-#include <pango/pango-layout.h>
-
-/**
- * ghosd_text_set_position:
- * @ghosd: a #Ghosd object;
- * @x: x coordinate in screen pixels.
- * @y: y coordinate in screen pixels.
- * @layout: the #PangoLayout to draw.
- *
- * Set ghosd dimensions based on a #PangoLayout.
- * See ghosd_set_position() for interpretation of the x and y coordinates.
- */
-void ghosd_text_set_position(Ghosd *ghosd, int x, int y, PangoLayout *layout);
-
-#endif /* __GHOSD_TEXT_H__ */
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/ghosd.c b/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/ghosd.c
deleted file mode 100644
index d830a1b..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/ghosd.c
+++ /dev/null
@@ -1,226 +0,0 @@
-/* ghosd -- OSD with fake transparency, cairo, and pango.
- * Copyright (C) 2006 Evan Martin <martine@danga.com>
- */
-
-#include "config.h"
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <cairo/cairo-xlib-xrender.h>
-#include <X11/Xatom.h>
-
-#include "ghosd.h"
-#include "ghosd-internal.h"
-
-static Pixmap
-take_snapshot(Ghosd *ghosd) {
-  Pixmap pixmap;
-  GC gc;
-
-  /* create a pixmap to hold the screenshot. */
-  pixmap = XCreatePixmap(ghosd->dpy, ghosd->win,
-                         ghosd->width, ghosd->height,
-                         DefaultDepth(ghosd->dpy, DefaultScreen(ghosd->dpy)));
-
-  /* then copy the screen into the pixmap. */
-  gc = XCreateGC(ghosd->dpy, pixmap, 0, NULL);
-  XSetSubwindowMode(ghosd->dpy, gc, IncludeInferiors);
-  XCopyArea(ghosd->dpy, DefaultRootWindow(ghosd->dpy), pixmap, gc,
-            ghosd->x, ghosd->y, ghosd->width, ghosd->height,
-            0, 0);
-  XSetSubwindowMode(ghosd->dpy, gc, ClipByChildren);
-  XFreeGC(ghosd->dpy, gc);
-
-  return pixmap;
-}
-
-void
-ghosd_render(Ghosd *ghosd) {
-  Pixmap pixmap;
-  GC gc;
-
-  /* make our own copy of the background pixmap as the initial surface. */
-  pixmap = XCreatePixmap(ghosd->dpy, ghosd->win, ghosd->width, ghosd->height,
-                         DefaultDepth(ghosd->dpy, DefaultScreen(ghosd->dpy)));
-
-  gc = XCreateGC(ghosd->dpy, pixmap, 0, NULL);
-  if (ghosd->transparent) {
-    XCopyArea(ghosd->dpy, ghosd->background, pixmap, gc,
-              0, 0, ghosd->width, ghosd->height, 0, 0);
-  } else {
-    XFillRectangle(ghosd->dpy, pixmap, gc,
-                  0, 0, ghosd->width, ghosd->height);
-  }
-  XFreeGC(ghosd->dpy, gc);
-
-  /* render with cairo. */
-  if (ghosd->render_func) {
-    /* create cairo surface using the pixmap. */
-    XRenderPictFormat *xrformat = 
-      XRenderFindVisualFormat(ghosd->dpy,
-                              DefaultVisual(ghosd->dpy,
-                                            DefaultScreen(ghosd->dpy)));
-    cairo_surface_t *surf =
-      cairo_xlib_surface_create_with_xrender_format(
-        ghosd->dpy, pixmap,
-        ScreenOfDisplay(ghosd->dpy, DefaultScreen(ghosd->dpy)),
-        xrformat,
-        ghosd->width, ghosd->height);
-
-    /* draw some stuff. */
-    cairo_t *cr = cairo_create(surf);
-    ghosd->render_func(ghosd, cr, ghosd->render_data);
-    cairo_destroy(cr);
-  }
-
-  /* point window at its new backing pixmap. */
-  XSetWindowBackgroundPixmap(ghosd->dpy, ghosd->win, pixmap);
-  XFreePixmap(ghosd->dpy, pixmap);
-
-  /* and tell the window to redraw with this pixmap. */
-  XClearWindow(ghosd->dpy, ghosd->win);
-}
-
-static void
-set_hints(Display *dpy, Window win) {
-  /* we're almost a _NET_WM_WINDOW_TYPE_SPLASH, but we don't want
-   * to be centered on the screen.  instead, manually request the
-   * behavior we want. */
-
-  /* turn off window decorations.
-   * we could pull this in from a motif header, but it's easier to
-   * use this snippet i found on a mailing list.  */
-  Atom mwm_hints = XInternAtom(dpy, "_MOTIF_WM_HINTS", False);
-#define MWM_HINTS_DECORATIONS (1<<1)
-  struct {
-    long flags, functions, decorations, input_mode;
-  } mwm_hints_setting = {
-    MWM_HINTS_DECORATIONS, 0, 0, 0
-  };
-  XChangeProperty(dpy, win,
-    mwm_hints, mwm_hints, 32, PropModeReplace,
-    (unsigned char *)&mwm_hints_setting, 4);
-
-  /* always on top, not in taskbar or pager. */
-  Atom win_state = XInternAtom(dpy, "_NET_WM_STATE", False);
-  Atom win_state_setting[] = {
-    XInternAtom(dpy, "_NET_WM_STATE_ABOVE", False),
-    XInternAtom(dpy, "_NET_WM_STATE_SKIP_TASKBAR", False),
-    XInternAtom(dpy, "_NET_WM_STATE_SKIP_PAGER", False)
-  };
-  XChangeProperty(dpy, win, win_state, XA_ATOM, 32,
-                  PropModeReplace, (unsigned char*)&win_state_setting, 3);
-}
-
-static Window
-make_window(Display *dpy) {
-  Window win;
-  XSetWindowAttributes att;
-
-  /* XXX I don't understand X well enough to know if these are the correct
-   * settings. */
-  att.backing_store = WhenMapped;
-  att.background_pixel = None;
-  att.border_pixel = 0;
-  att.background_pixmap = None;
-  att.save_under = True;
-  att.event_mask = ExposureMask | StructureNotifyMask;
-  att.override_redirect = True;
-
-  win = XCreateWindow(dpy, DefaultRootWindow(dpy),
-                      -1, -1, 1, 1, 0,
-                      CopyFromParent, InputOutput, CopyFromParent,
-                      CWBackingStore | CWBackPixel | CWBackPixmap |
-                      CWEventMask | CWSaveUnder | CWOverrideRedirect,
-                      &att);
-
-  set_hints(dpy, win);
-
-  /* XXX: XSetClassHint? */
-
-  return win;
-}
-
-void
-ghosd_show(Ghosd *ghosd) {
-  XMapWindow(ghosd->dpy, ghosd->win);
-}
-
-void
-ghosd_set_transparent(Ghosd *ghosd, int transparent) {
-  ghosd->transparent = (transparent != 0);
-}
-
-void
-ghosd_set_render(Ghosd *ghosd, GhosdRenderFunc render_func, void *render_data) {
-  ghosd->render_func = render_func;
-  ghosd->render_data = render_data;
-}
-
-void
-ghosd_set_position(Ghosd *ghosd, int x, int y, int width, int height) {
-  const int dpy_width  = DisplayWidth(ghosd->dpy,  DefaultScreen(ghosd->dpy));
-  const int dpy_height = DisplayHeight(ghosd->dpy, DefaultScreen(ghosd->dpy));
-
-  if (x == GHOSD_COORD_CENTER) {
-    x = (dpy_width - width) / 2;
-  } else if (x < 0) {
-    x = dpy_width - width + x;
-  }
-
-  if (y == GHOSD_COORD_CENTER) {
-    y = (dpy_height - height) / 2;
-  } else if (y < 0) {
-    y = dpy_height - height + y;
-  }
-
-  ghosd->x      = x;
-  ghosd->y      = y;
-  ghosd->width  = width;
-  ghosd->height = height;
-
-  if (ghosd->transparent)
-    ghosd->background = take_snapshot(ghosd);
-
-  XMoveResizeWindow(ghosd->dpy, ghosd->win,
-                    ghosd->x, ghosd->y, ghosd->width, ghosd->height);
-}
-
-#if 0
-static int
-x_error_handler(Display *dpy, XErrorEvent* evt) {
-  /* segfault so we can get a backtrace. */
-  char *x = NULL;
-  *x = 0;
-  return 0;
-}
-#endif
-
-Ghosd *
-ghosd_new(void) {
-  Ghosd *ghosd;
-  Display *dpy;
-  Window win;
-
-  dpy = XOpenDisplay(NULL);
-  if (dpy == NULL) {
-    fprintf(stderr, "Couldn't open display: (XXX FIXME)\n");
-    return NULL;
-  }
-
-  win = make_window(dpy);
-  
-  ghosd = calloc(1, sizeof(Ghosd));
-  ghosd->dpy = dpy;
-  ghosd->win = win;
-  ghosd->transparent = 1;
-
-  return ghosd;
-}
-
-int
-ghosd_get_socket(Ghosd *ghosd) {
-  return ConnectionNumber(ghosd->dpy);
-}
-
-/* vim: set ts=2 sw=2 et cino=(0 : */
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/ghosd.h b/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/ghosd.h
deleted file mode 100644
index f737210..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/ghosd/ghosd.h
+++ /dev/null
@@ -1,129 +0,0 @@
-/* ghosd -- OSD with fake transparency, cairo, and pango.
- * Copyright (C) 2006 Evan Martin <martine@danga.com>
- */
-
-#ifndef __GHOSD_H__
-#define __GHOSD_H__
-
-#include <cairo/cairo.h>
-
-#include <values.h>  /* MAXINT */
-#include <sys/time.h>  /* timeval */
-
-typedef struct _Ghosd Ghosd;
-
-typedef void (*GhosdRenderFunc)(Ghosd *ghosd, cairo_t *cr, void *user_data);
-
-/**
- * ghosd_new:
- *
- * Create a new #Ghosd object.
- *
- * Can return %NULL if unable to connect to the X server.
- *
- * Returns: a new #Ghosd object.
- **/
-Ghosd *ghosd_new(void);
-
-/**
- * ghosd_set_transparent:
- * @ghosd: a #Ghosd object.
- * @transparent: a boolean indicating the transparent setting.
- *
- * Change the "transparent" setting.  Setting @transparent to %FALSE is
- * mostly useful for debugging.
- */
-void ghosd_set_transparent(Ghosd *ghosd, int transparent);
-
-#define GHOSD_COORD_CENTER MAXINT
-
-/**
- * ghosd_set_position:
- * @ghosd: a #Ghosd object.
- * @x: x coordinate in screen pixels.
- * @y: y coordinate in screen pixels.
- * @width: width in screen pixels.
- * @height: width in screen pixels.
- *
- * Position the initial #Ghosd.  Must be called before ghosd_render() and
- * ghosd_show(), and can only be called once.
- *
- * Positive x,y are interpreted as normal coordinates.
- * Pass %GHOSD_COORD_CENTER to center on a given dimension,
- * and negative coordinates right-align (like CSS right).
- */
-void ghosd_set_position(Ghosd *ghosd, int x, int y, int width, int height);
-
-/**
- * ghosd_set_render:
- * @ghosd: a #Ghosd object.
- * @render_func: a #GhosdRenderFunc callback.
- * @data: user data to pass to the callback.
- *
- * Register a function to draw on the #Ghosd.
- */
-void ghosd_set_render(Ghosd *ghosd, GhosdRenderFunc render_func, void* data);
-
-/**
- * ghosd_render:
- * @ghosd: a #Ghosd object.
- *
- * Makes the Ghosd redraw itself.
- */
-void ghosd_render(Ghosd *ghosd);
-
-/**
- * ghosd_show:
- * @ghosd: a #Ghosd object.
- *
- * Show the #Ghosd.
- */
-void ghosd_show(Ghosd *ghosd);
-
-/**
- * ghosd_main_iterations:
- * @ghosd: a #Ghosd object.
- *
- * Iterate the main loop on the #Ghosd, handling all pending X events.
- * This function does not wait for X events, so it returns immediately
- * unless there are already events pending.
- */
-void ghosd_main_iterations(Ghosd *ghosd);
-
-/**
- * ghosd_main_until:
- * @ghosd: a #Ghosd object.
- * @until: a pointer to a timeval to update until.
- *
- * Efficiently iterate the main loop on the #Ghosd, handling all pending X
- * events, until the current time reaches the time specified in @until.
- */
-void ghosd_main_until(Ghosd *ghosd, struct timeval *until);
-
-/**
- * ghosd_flash:
- * @ghosd: a #Ghosd object.
- * @fade_ms: how long to fade, in milliseconds.
- * @total_display_ms: total display time, including fades, in milliseconds.
- *
- * Fade in a #Ghosd, display at full opacity for a while, fade out, and then
- * return.
- * This is easy enough to implement using ghosd_main_until(), but is a 
- * a common enough use of Ghosd to make it a builtin.
- */
-void ghosd_flash(Ghosd *ghosd, int fade_ms, int total_display_ms);
-
-/**
- * ghosd_get_socket:
- * @ghosd: a #Ghosd object.
- *
- * Get the file descriptor of the Ghosd X socket.  When this file descriptor
- * has data available, call ghosd_main_iterations() to process the pending X
- * events.  Use this with select()/poll() etc. to multiplex Ghosd with other
- * processing.
- *
- * Returns: a file descriptor, suitable for use in select() or poll().
- */
-int ghosd_get_socket(Ghosd *ghosd);
-
-#endif /* __GHOSD_H__ */
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/gtk-doc.make b/abs/mv-core/ghosd/ghosd-0.0.1/gtk-doc.make
deleted file mode 100644
index 91cdd34..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/gtk-doc.make
+++ /dev/null
@@ -1,153 +0,0 @@
-# -*- mode: makefile -*-
-
-####################################
-# Everything below here is generic #
-####################################
-
-if GTK_DOC_USE_LIBTOOL
-GTKDOC_CC = $(LIBTOOL) --mode=compile $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(LIBTOOL) --mode=link $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
-else
-GTKDOC_CC = $(CC) $(INCLUDES) $(AM_CFLAGS) $(CFLAGS)
-GTKDOC_LD = $(CC) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS)
-endif
-
-# We set GPATH here; this gives us semantics for GNU make
-# which are more like other make's VPATH, when it comes to
-# whether a source that is a target of one rule is then
-# searched for in VPATH/GPATH.
-#
-GPATH = $(srcdir)
-
-TARGET_DIR=$(HTML_DIR)/$(DOC_MODULE)
-
-EXTRA_DIST = 				\
-	$(content_files)		\
-	$(HTML_IMAGES)			\
-	$(DOC_MAIN_SGML_FILE)		\
-	$(DOC_MODULE)-sections.txt	\
-	$(DOC_MODULE)-overrides.txt
-
-DOC_STAMPS=scan-build.stamp tmpl-build.stamp sgml-build.stamp html-build.stamp \
-	   $(srcdir)/tmpl.stamp $(srcdir)/sgml.stamp $(srcdir)/html.stamp
-
-SCANOBJ_FILES = 		 \
-	$(DOC_MODULE).args 	 \
-	$(DOC_MODULE).hierarchy  \
-	$(DOC_MODULE).interfaces \
-	$(DOC_MODULE).prerequisites \
-	$(DOC_MODULE).signals
-
-CLEANFILES = $(SCANOBJ_FILES) $(DOC_MODULE)-unused.txt $(DOC_STAMPS)
-
-if ENABLE_GTK_DOC
-all-local: html-build.stamp
-
-#### scan ####
-
-scan-build.stamp: $(HFILE_GLOB) $(CFILE_GLOB)
-	@echo '*** Scanning header files ***'
-	@-chmod -R u+w $(srcdir)
-	if grep -l '^..*$$' $(srcdir)/$(DOC_MODULE).types > /dev/null 2>&1 ; then \
-	    CC="$(GTKDOC_CC)" LD="$(GTKDOC_LD)" CFLAGS="$(GTKDOC_CFLAGS)" LDFLAGS="$(GTKDOC_LIBS)" gtkdoc-scangobj $(SCANGOBJ_OPTIONS) --module=$(DOC_MODULE) --output-dir=$(srcdir) ; \
-	else \
-	    cd $(srcdir) ; \
-	    for i in $(SCANOBJ_FILES) ; do \
-               test -f $$i || touch $$i ; \
-	    done \
-	fi
-	cd $(srcdir) && \
-	  gtkdoc-scan --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --ignore-headers="$(IGNORE_HFILES)" $(SCAN_OPTIONS) $(EXTRA_HFILES)
-	touch scan-build.stamp
-
-$(DOC_MODULE)-decl.txt $(SCANOBJ_FILES): scan-build.stamp
-	@true
-
-#### templates ####
-
-tmpl-build.stamp: $(DOC_MODULE)-decl.txt $(SCANOBJ_FILES) $(DOC_MODULE)-sections.txt $(DOC_MODULE)-overrides.txt
-	@echo '*** Rebuilding template files ***'
-	@-chmod -R u+w $(srcdir)
-	cd $(srcdir) && gtkdoc-mktmpl --module=$(DOC_MODULE) $(MKTMPL_OPTIONS)
-	touch tmpl-build.stamp
-
-tmpl.stamp: tmpl-build.stamp
-	@true
-
-#### xml ####
-
-sgml-build.stamp: tmpl.stamp $(CFILE_GLOB) $(srcdir)/tmpl/*.sgml $(expand_content_files)
-	@echo '*** Building XML ***'
-	@-chmod -R u+w $(srcdir)
-	cd $(srcdir) && \
-	gtkdoc-mkdb --module=$(DOC_MODULE) --source-dir=$(DOC_SOURCE_DIR) --output-format=xml --expand-content-files="$(expand_content_files)" $(MKDB_OPTIONS)
-	touch sgml-build.stamp
-
-sgml.stamp: sgml-build.stamp
-	@true
-
-#### html ####
-
-html-build.stamp: sgml.stamp $(DOC_MAIN_SGML_FILE) $(content_files)
-	@echo '*** Building HTML ***'
-	@-chmod -R u+w $(srcdir)
-	rm -rf $(srcdir)/html 
-	mkdir $(srcdir)/html
-	cd $(srcdir)/html && gtkdoc-mkhtml $(DOC_MODULE) ../$(DOC_MAIN_SGML_FILE)
-	test "x$(HTML_IMAGES)" = "x" || ( cd $(srcdir) && cp $(HTML_IMAGES) html )
-	@echo '-- Fixing Crossreferences' 
-	cd $(srcdir) && gtkdoc-fixxref --module-dir=html --html-dir=$(HTML_DIR) $(FIXXREF_OPTIONS)
-	touch html-build.stamp
-else
-all-local:
-endif
-
-##############
-
-clean-local:
-	rm -f *~ *.bak
-	rm -rf .libs
-
-maintainer-clean-local: clean
-	cd $(srcdir) && rm -rf xml html $(DOC_MODULE)-decl-list.txt $(DOC_MODULE)-decl.txt
-
-install-data-local:
-	installfiles=`echo $(srcdir)/html/*`; \
-	if test "$$installfiles" = '$(srcdir)/html/*'; \
-	then echo '-- Nothing to install' ; \
-	else \
-	  $(mkinstalldirs) $(DESTDIR)$(TARGET_DIR); \
-	  for i in $$installfiles; do \
-	    echo '-- Installing '$$i ; \
-	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
-	  done; \
-	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
-	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) || :; \
-	fi
-
-uninstall-local:
-	rm -f $(DESTDIR)$(TARGET_DIR)/*
-
-#
-# Require gtk-doc when making dist
-#
-if ENABLE_GTK_DOC
-dist-check-gtkdoc:
-else
-dist-check-gtkdoc:
-	@echo "*** gtk-doc must be installed and enabled in order to make dist"
-	@false
-endif
-
-dist-hook: dist-check-gtkdoc dist-hook-local
-	mkdir $(distdir)/tmpl
-	mkdir $(distdir)/xml
-	mkdir $(distdir)/html
-	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
-	-cp $(srcdir)/xml/*.xml $(distdir)/xml
-	-cp $(srcdir)/html/* $(distdir)/html
-	if test -f $(srcdir)/$(DOC_MODULE).types; then \
-	  cp $(srcdir)/$(DOC_MODULE).types $(distdir)/$(DOC_MODULE).types; \
-	fi
-
-.PHONY : dist-hook-local
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/install-sh b/abs/mv-core/ghosd/ghosd-0.0.1/install-sh
deleted file mode 100755
index 1a83534..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/install-sh
+++ /dev/null
@@ -1,323 +0,0 @@
-#!/bin/sh
-# install - install a program, script, or datafile
-
-scriptversion=2005-02-02.21
-
-# This originates from X11R5 (mit/util/scripts/install.sh), which was
-# later released in X11R6 (xc/config/util/install.sh) with the
-# following copyright and license.
-#
-# Copyright (C) 1994 X Consortium
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to
-# deal in the Software without restriction, including without limitation the
-# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
-# sell copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN
-# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC-
-# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-#
-# Except as contained in this notice, the name of the X Consortium shall not
-# be used in advertising or otherwise to promote the sale, use or other deal-
-# ings in this Software without prior written authorization from the X Consor-
-# tium.
-#
-#
-# FSF changes to this file are in the public domain.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-chmodcmd="$chmodprog 0755"
-chowncmd=
-chgrpcmd=
-stripcmd=
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=
-dst=
-dir_arg=
-dstarg=
-no_target_directory=
-
-usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE
-   or: $0 [OPTION]... SRCFILES... DIRECTORY
-   or: $0 [OPTION]... -t DIRECTORY SRCFILES...
-   or: $0 [OPTION]... -d DIRECTORIES...
-
-In the 1st form, copy SRCFILE to DSTFILE.
-In the 2nd and 3rd, copy all SRCFILES to DIRECTORY.
-In the 4th, create DIRECTORIES.
-
-Options:
--c         (ignored)
--d         create directories instead of installing files.
--g GROUP   $chgrpprog installed files to GROUP.
--m MODE    $chmodprog installed files to MODE.
--o USER    $chownprog installed files to USER.
--s         $stripprog installed files.
--t DIRECTORY  install into DIRECTORY.
--T         report an error if DSTFILE is a directory.
---help     display this help and exit.
---version  display version info and exit.
-
-Environment variables override the default commands:
-  CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
-"
-
-while test -n "$1"; do
-  case $1 in
-    -c) shift
-        continue;;
-
-    -d) dir_arg=true
-        shift
-        continue;;
-
-    -g) chgrpcmd="$chgrpprog $2"
-        shift
-        shift
-        continue;;
-
-    --help) echo "$usage"; exit $?;;
-
-    -m) chmodcmd="$chmodprog $2"
-        shift
-        shift
-        continue;;
-
-    -o) chowncmd="$chownprog $2"
-        shift
-        shift
-        continue;;
-
-    -s) stripcmd=$stripprog
-        shift
-        continue;;
-
-    -t) dstarg=$2
-	shift
-	shift
-	continue;;
-
-    -T) no_target_directory=true
-	shift
-	continue;;
-
-    --version) echo "$0 $scriptversion"; exit $?;;
-
-    *)  # When -d is used, all remaining arguments are directories to create.
-	# When -t is used, the destination is already specified.
-	test -n "$dir_arg$dstarg" && break
-        # Otherwise, the last argument is the destination.  Remove it from $@.
-	for arg
-	do
-          if test -n "$dstarg"; then
-	    # $@ is not empty: it contains at least $arg.
-	    set fnord "$@" "$dstarg"
-	    shift # fnord
-	  fi
-	  shift # arg
-	  dstarg=$arg
-	done
-	break;;
-  esac
-done
-
-if test -z "$1"; then
-  if test -z "$dir_arg"; then
-    echo "$0: no input file specified." >&2
-    exit 1
-  fi
-  # It's OK to call `install-sh -d' without argument.
-  # This can happen when creating conditional directories.
-  exit 0
-fi
-
-for src
-do
-  # Protect names starting with `-'.
-  case $src in
-    -*) src=./$src ;;
-  esac
-
-  if test -n "$dir_arg"; then
-    dst=$src
-    src=
-
-    if test -d "$dst"; then
-      mkdircmd=:
-      chmodcmd=
-    else
-      mkdircmd=$mkdirprog
-    fi
-  else
-    # Waiting for this to be detected by the "$cpprog $src $dsttmp" command
-    # might cause directories to be created, which would be especially bad
-    # if $src (and thus $dsttmp) contains '*'.
-    if test ! -f "$src" && test ! -d "$src"; then
-      echo "$0: $src does not exist." >&2
-      exit 1
-    fi
-
-    if test -z "$dstarg"; then
-      echo "$0: no destination specified." >&2
-      exit 1
-    fi
-
-    dst=$dstarg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst ;;
-    esac
-
-    # If destination is a directory, append the input filename; won't work
-    # if double slashes aren't ignored.
-    if test -d "$dst"; then
-      if test -n "$no_target_directory"; then
-	echo "$0: $dstarg: Is a directory" >&2
-	exit 1
-      fi
-      dst=$dst/`basename "$src"`
-    fi
-  fi
-
-  # This sed command emulates the dirname command.
-  dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
-
-  # Make sure that the destination directory exists.
-
-  # Skip lots of stat calls in the usual case.
-  if test ! -d "$dstdir"; then
-    defaultIFS='
-	 '
-    IFS="${IFS-$defaultIFS}"
-
-    oIFS=$IFS
-    # Some sh's can't handle IFS=/ for some reason.
-    IFS='%'
-    set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
-    shift
-    IFS=$oIFS
-
-    pathcomp=
-
-    while test $# -ne 0 ; do
-      pathcomp=$pathcomp$1
-      shift
-      if test ! -d "$pathcomp"; then
-        $mkdirprog "$pathcomp"
-	# mkdir can fail with a `File exist' error in case several
-	# install-sh are creating the directory concurrently.  This
-	# is OK.
-	test -d "$pathcomp" || exit
-      fi
-      pathcomp=$pathcomp/
-    done
-  fi
-
-  if test -n "$dir_arg"; then
-    $doit $mkdircmd "$dst" \
-      && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
-      && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
-
-  else
-    dstfile=`basename "$dst"`
-
-    # Make a couple of temp file names in the proper directory.
-    dsttmp=$dstdir/_inst.$$_
-    rmtmp=$dstdir/_rm.$$_
-
-    # Trap to clean up those temp files at exit.
-    trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
-    trap '(exit $?); exit' 1 2 13 15
-
-    # Copy the file name to the temp name.
-    $doit $cpprog "$src" "$dsttmp" &&
-
-    # and set any options; do chmod last to preserve setuid bits.
-    #
-    # If any of these fail, we abort the whole thing.  If we want to
-    # ignore errors from any of these, just make sure not to ignore
-    # errors from the above "$doit $cpprog $src $dsttmp" command.
-    #
-    { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
-      && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
-      && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
-      && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
-
-    # Now rename the file to the real destination.
-    { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
-      || {
-	   # The rename failed, perhaps because mv can't rename something else
-	   # to itself, or perhaps because mv is so ancient that it does not
-	   # support -f.
-
-	   # Now remove or move aside any old file at destination location.
-	   # We try this two ways since rm can't unlink itself on some
-	   # systems and the destination file might be busy for other
-	   # reasons.  In this case, the final cleanup might fail but the new
-	   # file should still install successfully.
-	   {
-	     if test -f "$dstdir/$dstfile"; then
-	       $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
-	       || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
-	       || {
-		 echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
-		 (exit 1); exit 1
-	       }
-	     else
-	       :
-	     fi
-	   } &&
-
-	   # Now rename the file to the real destination.
-	   $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
-	 }
-    }
-  fi || { (exit 1); exit 1; }
-done
-
-# The final little trick to "correctly" pass the exit status to the exit trap.
-{
-  (exit 0); exit 0
-}
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/libtool b/abs/mv-core/ghosd/ghosd-0.0.1/libtool
deleted file mode 100755
index 8abe79f..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/libtool
+++ /dev/null
@@ -1,7065 +0,0 @@
-#! /bin/sh
-
-# libtoolT - Provide generalized library-building support services.
-# Generated automatically by  (GNU ghosd 0.0.1)
-# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
-# Free Software Foundation, Inc.
-#
-# This file is part of GNU Libtool:
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# A sed program that does not truncate output.
-SED="/bin/sed"
-
-# Sed that helps us avoid accidentally triggering echo(1) options like -n.
-Xsed="/bin/sed -e s/^X//"
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-
-# The names of the tagged configurations supported by this script.
-available_tags=" CXX"
-
-# ### BEGIN LIBTOOL CONFIG
-
-# Libtool was configured on host supertower.lan:
-
-# Shell to use when invoking shell scripts.
-SHELL="/bin/sh"
-
-# Whether or not to build shared libraries.
-build_libtool_libs=yes
-
-# Whether or not to build static libraries.
-build_old_libs=yes
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=no
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=no
-
-# Whether or not to optimize for fast installation.
-fast_install=yes
-
-# The host system.
-host_alias=
-host=i686-pc-linux-gnu
-
-# An echo program that does not interpret backslashes.
-echo="echo"
-
-# The archiver.
-AR="ar"
-AR_FLAGS="cru"
-
-# A C compiler.
-LTCC="gcc"
-
-# A language-specific compiler.
-CC="gcc"
-
-# Is the compiler the GNU C compiler?
-with_gcc=yes
-
-# An ERE matcher.
-EGREP="grep -E"
-
-# The linker used to build libraries.
-LD="/usr/bin/ld"
-
-# Whether we need hard or soft links.
-LN_S="ln -s"
-
-# A BSD-compatible nm program.
-NM="/usr/bin/nm -B"
-
-# A symbol stripping program
-STRIP="strip"
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=file
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="dlltool"
-
-# Used on cygwin: object dumper.
-OBJDUMP="objdump"
-
-# Used on cygwin: assembler.
-AS="as"
-
-# The name of the directory that contains temporary libtool files.
-objdir=.libs
-
-# How to create reloadable object files.
-reload_flag=" -r"
-reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs"
-
-# How to pass a linker flag through the compiler.
-wl="-Wl,"
-
-# Object file suffix (normally "o").
-objext="o"
-
-# Old archive suffix (normally "a").
-libext="a"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='.so'
-
-# Executable file suffix (normally "").
-exeext=""
-
-# Additional compiler flags for building library objects.
-pic_flag=" -fPIC -DPIC"
-pic_mode=default
-
-# What is the maximum length of a command?
-max_cmd_len=32768
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o="yes"
-
-# Must we lock files when doing compilation ?
-need_locks="no"
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=no
-
-# Do we need a version for libraries?
-need_version=no
-
-# Whether dlopen is supported.
-dlopen_support=unknown
-
-# Whether dlopen of programs is supported.
-dlopen_self=unknown
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=unknown
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag="-static"
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=" -fno-builtin"
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec="\${wl}--export-dynamic"
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec="\${wl}--whole-archive\$convenience \${wl}--no-whole-archive"
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=""
-
-# Library versioning type.
-version_type=linux
-
-# Format of library name prefix.
-libname_spec="lib\$name"
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}"
-
-# The coded name of the library, if different from the real name.
-soname_spec="\${libname}\${release}\${shared_ext}\$major"
-
-# Commands used to build and install an old-style archive.
-RANLIB="ranlib"
-old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib"
-old_postinstall_cmds="\$RANLIB \$oldlib~chmod 644 \$oldlib"
-old_postuninstall_cmds=""
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=""
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=""
-
-# Commands used to build and install a shared archive.
-archive_cmds="\$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname -o \$lib"
-archive_expsym_cmds="\$echo \\\"{ global:\\\" > \$output_objdir/\$libname.ver~
-cat \$export_symbols | sed -e \\\"s/\\\\(.*\\\\)/\\\\1;/\\\" >> \$output_objdir/\$libname.ver~
-\$echo \\\"local: *; };\\\" >> \$output_objdir/\$libname.ver~
-        \$CC -shared \$libobjs \$deplibs \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-version-script \${wl}\$output_objdir/\$libname.ver -o \$lib"
-postinstall_cmds=""
-postuninstall_cmds=""
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=""
-module_expsym_cmds=""
-
-# Commands to strip libraries.
-old_striplib="strip --strip-debug"
-striplib="strip --strip-unneeded"
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects=""
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects=""
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=""
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps=""
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path=""
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method="pass_all"
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd="\$MAGIC_CMD"
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=""
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=""
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds="PATH=\\\"\\\$PATH:/sbin\\\" ldconfig -n \$libdir"
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=""
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe="sed -n -e 's/^.*[ 	]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ 	][ 	]*\\(\\)\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2\\3 \\3/p'"
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'"
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/  {\\\"\\1\\\", (lt_ptr) 0},/p' -e 's/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/  {\"\\2\", (lt_ptr) \\&\\2},/p'"
-
-# This is the shared library runtime path variable.
-runpath_var=LD_RUN_PATH
-
-# This is the shared library path variable.
-shlibpath_var=LD_LIBRARY_PATH
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=no
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=immediate
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=yes
-
-# Flag to hardcode $libdir into a binary during linking.
-# This must work even if $libdir does not exist.
-hardcode_libdir_flag_spec="\${wl}--rpath \${wl}\$libdir"
-
-# If ld is used when linking, flag to hardcode $libdir into
-# a binary during linking. This must work even if $libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=""
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=""
-
-# Set to yes if using DIR/libNAME during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=no
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=no
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=unsupported
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=no
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="PATH  LD_RUN_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=no
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=" /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/ /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/ /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/../../../../i686-pc-linux-gnu/lib/i686-pc-linux-gnu/4.2.1/ /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/../../../../i686-pc-linux-gnu/lib/ /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/../../../i686-pc-linux-gnu/4.2.1/ /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/../../../ /lib/i686-pc-linux-gnu/4.2.1/ /lib/ /usr/lib/i686-pc-linux-gnu/4.2.1/ /usr/lib/"
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="/lib /usr/lib # # /etc/ld.so.conf #  /usr/X11R6/lib  # End of file /usr/lib/libfakeroot /opt/qt/lib /opt/e17/lib /opt/kde/lib /usr/local/lib "
-
-# Fix the shell variable $srcfile for the compiler.
-fix_srcfile_path=""
-
-# Set to yes if exported symbols are required.
-always_export_symbols=no
-
-# The commands to list exported symbols.
-export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED 's/.* //' | sort | uniq > \$export_symbols"
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=""
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms="_GLOBAL_OFFSET_TABLE_"
-
-# Symbols that must always be exported.
-include_expsyms=""
-
-# ### END LIBTOOL CONFIG
-
-# ltmain.sh - Provide generalized library-building support services.
-# NOTE: Changing this file will not affect anything until you rerun configure.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004
-# Free Software Foundation, Inc.
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-basename="s,^.*/,,g"
-
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
-
-# The name of this program:
-progname=`echo "$progpath" | $SED $basename`
-modename="$progname"
-
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-
-PROGRAM=ltmain.sh
-PACKAGE=libtool
-VERSION=1.5.6
-TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42) Debian$Rev: 224 $"
-
-
-# Check that we have a working $echo.
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell, and then maybe $echo will work.
-  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit $EXIT_SUCCESS
-fi
-
-default_mode=
-help="Try \`$progname --help' for more information."
-magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
-mv="mv -f"
-rm="rm -f"
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
-# test EBCDIC or ASCII
-case `echo A|tr A '\301'` in
- A) # EBCDIC based system
-  SP2NL="tr '\100' '\n'"
-  NL2SP="tr '\r\n' '\100\100'"
-  ;;
- *) # Assume ASCII based system
-  SP2NL="tr '\040' '\012'"
-  NL2SP="tr '\015\012' '\040\040'"
-  ;;
-esac
-
-# NLS nuisances.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
-# We save the old values to restore during execute mode.
-if test "${LC_ALL+set}" = set; then
-  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-fi
-if test "${LANG+set}" = set; then
-  save_LANG="$LANG"; LANG=C; export LANG
-fi
-
-# Make sure IFS has a sensible default
-: ${IFS=" 	
-"}
-
-if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-  $echo "$modename: not configured to build any kind of library" 1>&2
-  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-  exit $EXIT_FAILURE
-fi
-
-# Global variables.
-mode=$default_mode
-nonopt=
-prev=
-prevopt=
-run=
-show="$echo"
-show_help=
-execute_dlfiles=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-
-#####################################
-# Shell function definitions:
-# This seems to be the best place for them
-
-# func_win32_libid arg
-# return the library type of file 'arg'
-#
-# Need a lot of goo to handle *both* DLLs and import libs
-# Has to be a shell function in order to 'eat' the argument
-# that is supplied when $file_magic_command is called.
-func_win32_libid () {
-  win32_libid_type="unknown"
-  win32_fileres=`file -L $1 2>/dev/null`
-  case $win32_fileres in
-  *ar\ archive\ import\ library*) # definitely import
-    win32_libid_type="x86 archive import"
-    ;;
-  *ar\ archive*) # could be an import, or static
-    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
-      $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
-      win32_nmres=`eval $NM -f posix -A $1 | \
-	sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
-      if test "X$win32_nmres" = "Ximport" ; then
-        win32_libid_type="x86 archive import"
-      else
-        win32_libid_type="x86 archive static"
-      fi
-    fi
-    ;;
-  *DLL*)
-    win32_libid_type="x86 DLL"
-    ;;
-  *executable*) # but shell scripts are "executable" too...
-    case $win32_fileres in
-    *MS\ Windows\ PE\ Intel*)
-      win32_libid_type="x86 DLL"
-      ;;
-    esac
-    ;;
-  esac
-  $echo $win32_libid_type
-}
-
-
-# func_infer_tag arg
-# Infer tagged configuration to use if any are available and
-# if one wasn't chosen via the "--tag" command line option.
-# Only attempt this if the compiler in the base compile
-# command doesn't match the default compiler.
-# arg is usually of the form 'gcc ...'
-func_infer_tag () {
-    if test -n "$available_tags" && test -z "$tagname"; then
-      CC_quoted=
-      for arg in $CC; do
-	case $arg in
-	  *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	CC_quoted="$CC_quoted $arg"
-      done
-      case $@ in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-	for z in $available_tags; do
-	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
-	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
-	    CC_quoted=
-	    for arg in $CC; do
-	    # Double-quote args containing other shell metacharacters.
-	    case $arg in
-	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	      arg="\"$arg\""
-	      ;;
-	    esac
-	    CC_quoted="$CC_quoted $arg"
-	  done
-	    case "$@ " in
-	      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
-	      # The compiler in the base compile command matches
-	      # the one in the tagged configuration.
-	      # Assume this is the tagged configuration we want.
-	      tagname=$z
-	      break
-	      ;;
-	    esac
-	  fi
-	done
-	# If $tagname still isn't set, then no tagged configuration
-	# was found and let the user know that the "--tag" command
-	# line option must be used.
-	if test -z "$tagname"; then
-	  $echo "$modename: unable to infer tagged configuration"
-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
-	  exit $EXIT_FAILURE
-#        else
-#          $echo "$modename: using $tagname tagged configuration"
-	fi
-	;;
-      esac
-    fi
-}
-# End of Shell function definitions
-#####################################
-
-# Darwin sucks
-eval std_shrext=\"$shrext_cmds\"
-
-# Parse our command line options once, thoroughly.
-while test "$#" -gt 0
-do
-  arg="$1"
-  shift
-
-  case $arg in
-  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$prev"; then
-    case $prev in
-    execute_dlfiles)
-      execute_dlfiles="$execute_dlfiles $arg"
-      ;;
-    tag)
-      tagname="$arg"
-      preserve_args="${preserve_args}=$arg"
-
-      # Check whether tagname contains only valid characters
-      case $tagname in
-      *[!-_A-Za-z0-9,/]*)
-	$echo "$progname: invalid tag name: $tagname" 1>&2
-	exit $EXIT_FAILURE
-	;;
-      esac
-
-      case $tagname in
-      CC)
-	# Don't test for the "default" C tag, as we know, it's there, but
-	# not specially marked.
-	;;
-      *)
-	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
-	  taglist="$taglist $tagname"
-	  # Evaluate the configuration.
-	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
-	else
-	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
-	fi
-	;;
-      esac
-      ;;
-    *)
-      eval "$prev=\$arg"
-      ;;
-    esac
-
-    prev=
-    prevopt=
-    continue
-  fi
-
-  # Have we seen a non-optional argument yet?
-  case $arg in
-  --help)
-    show_help=yes
-    ;;
-
-  --version)
-    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-    $echo
-    $echo "Copyright (C) 2003  Free Software Foundation, Inc."
-    $echo "This is free software; see the source for copying conditions.  There is NO"
-    $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-    exit $EXIT_SUCCESS
-    ;;
-
-  --config)
-    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
-    # Now print the configurations for the tags.
-    for tagname in $taglist; do
-      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
-    done
-    exit $EXIT_SUCCESS
-    ;;
-
-  --debug)
-    $echo "$progname: enabling shell trace mode"
-    set -x
-    preserve_args="$preserve_args $arg"
-    ;;
-
-  --dry-run | -n)
-    run=:
-    ;;
-
-  --features)
-    $echo "host: $host"
-    if test "$build_libtool_libs" = yes; then
-      $echo "enable shared libraries"
-    else
-      $echo "disable shared libraries"
-    fi
-    if test "$build_old_libs" = yes; then
-      $echo "enable static libraries"
-    else
-      $echo "disable static libraries"
-    fi
-    exit $EXIT_SUCCESS
-    ;;
-
-  --finish) mode="finish" ;;
-
-  --mode) prevopt="--mode" prev=mode ;;
-  --mode=*) mode="$optarg" ;;
-
-  --preserve-dup-deps) duplicate_deps="yes" ;;
-
-  --quiet | --silent)
-    show=:
-    preserve_args="$preserve_args $arg"
-    ;;
-
-  --tag) prevopt="--tag" prev=tag ;;
-  --tag=*)
-    set tag "$optarg" ${1+"$@"}
-    shift
-    prev=tag
-    preserve_args="$preserve_args --tag"
-    ;;
-
-  -dlopen)
-    prevopt="-dlopen"
-    prev=execute_dlfiles
-    ;;
-
-  -*)
-    $echo "$modename: unrecognized option \`$arg'" 1>&2
-    $echo "$help" 1>&2
-    exit $EXIT_FAILURE
-    ;;
-
-  *)
-    nonopt="$arg"
-    break
-    ;;
-  esac
-done
-
-if test -n "$prevopt"; then
-  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
-  $echo "$help" 1>&2
-  exit $EXIT_FAILURE
-fi
-
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end.  This prevents here-documents from being
-# left over by shells.
-exec_cmd=
-
-if test -z "$show_help"; then
-
-  # Infer the operation mode.
-  if test -z "$mode"; then
-    $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
-    $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2
-    case $nonopt in
-    *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
-      mode=link
-      for arg
-      do
-	case $arg in
-	-c)
-	   mode=compile
-	   break
-	   ;;
-	esac
-      done
-      ;;
-    *db | *dbx | *strace | *truss)
-      mode=execute
-      ;;
-    *install*|cp|mv)
-      mode=install
-      ;;
-    *rm)
-      mode=uninstall
-      ;;
-    *)
-      # If we have no mode, but dlfiles were specified, then do execute mode.
-      test -n "$execute_dlfiles" && mode=execute
-
-      # Just use the default operation mode.
-      if test -z "$mode"; then
-	if test -n "$nonopt"; then
-	  $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
-	else
-	  $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
-	fi
-      fi
-      ;;
-    esac
-  fi
-
-  # Only execute mode is allowed to have -dlopen flags.
-  if test -n "$execute_dlfiles" && test "$mode" != execute; then
-    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
-    $echo "$help" 1>&2
-    exit $EXIT_FAILURE
-  fi
-
-  # Change the help message to a mode-specific one.
-  generic_help="$help"
-  help="Try \`$modename --help --mode=$mode' for more information."
-
-  # These modes are in order of execution frequency so that they run quickly.
-  case $mode in
-  # libtool compile mode
-  compile)
-    modename="$modename: compile"
-    # Get the compilation command and the source file.
-    base_compile=
-    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
-    suppress_opt=yes
-    suppress_output=
-    arg_mode=normal
-    libobj=
-    later=
-
-    for arg
-    do
-      case "$arg_mode" in
-      arg  )
-	# do not "continue".  Instead, add this to base_compile
-	lastarg="$arg"
-	arg_mode=normal
-	;;
-
-      target )
-	libobj="$arg"
-	arg_mode=normal
-	continue
-	;;
-
-      normal )
-	# Accept any command-line options.
-	case $arg in
-	-o)
-	  if test -n "$libobj" ; then
-	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  arg_mode=target
-	  continue
-	  ;;
-
-	-static | -prefer-pic | -prefer-non-pic)
-	  later="$later $arg"
-	  continue
-	  ;;
-
-	-no-suppress)
-	  suppress_opt=no
-	  continue
-	  ;;
-
-	-Xcompiler)
-	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
-	  continue      #  The current "srcfile" will either be retained or
-	  ;;            #  replaced later.  I would guess that would be a bug.
-
-	-Wc,*)
-	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
-	  lastarg=
-	  save_ifs="$IFS"; IFS=','
- 	  for arg in $args; do
-	    IFS="$save_ifs"
-
-	    # Double-quote args containing other shell metacharacters.
-	    # Many Bourne shells cannot handle close brackets correctly
-	    # in scan sets, so we specify it separately.
-	    case $arg in
-	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	      arg="\"$arg\""
-	      ;;
-	    esac
-	    lastarg="$lastarg $arg"
-	  done
-	  IFS="$save_ifs"
-	  lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
-
-	  # Add the arguments to base_compile.
-	  base_compile="$base_compile $lastarg"
-	  continue
-	  ;;
-
-	* )
-	  # Accept the current argument as the source file.
-	  # The previous "srcfile" becomes the current argument.
-	  #
-	  lastarg="$srcfile"
-	  srcfile="$arg"
-	  ;;
-	esac  #  case $arg
-	;;
-      esac    #  case $arg_mode
-
-      # Aesthetically quote the previous argument.
-      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
-
-      case $lastarg in
-      # Double-quote args containing other shell metacharacters.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	lastarg="\"$lastarg\""
-	;;
-      esac
-
-      base_compile="$base_compile $lastarg"
-    done # for arg
-
-    case $arg_mode in
-    arg)
-      $echo "$modename: you must specify an argument for -Xcompile"
-      exit $EXIT_FAILURE
-      ;;
-    target)
-      $echo "$modename: you must specify a target with \`-o'" 1>&2
-      exit $EXIT_FAILURE
-      ;;
-    *)
-      # Get the name of the library object.
-      [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
-      ;;
-    esac
-
-    # Recognize several different file suffixes.
-    # If the user specifies -o file.o, it is replaced with file.lo
-    xform='[cCFSifmso]'
-    case $libobj in
-    *.ada) xform=ada ;;
-    *.adb) xform=adb ;;
-    *.ads) xform=ads ;;
-    *.asm) xform=asm ;;
-    *.c++) xform=c++ ;;
-    *.cc) xform=cc ;;
-    *.ii) xform=ii ;;
-    *.class) xform=class ;;
-    *.cpp) xform=cpp ;;
-    *.cxx) xform=cxx ;;
-    *.f90) xform=f90 ;;
-    *.for) xform=for ;;
-    *.java) xform=java ;;
-    esac
-
-    libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-
-    case $libobj in
-    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
-    *)
-      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
-      exit $EXIT_FAILURE
-      ;;
-    esac
-
-    func_infer_tag $base_compile
-
-    for arg in $later; do
-      case $arg in
-      -static)
-	build_old_libs=yes
-	continue
-	;;
-
-      -prefer-pic)
-	pic_mode=yes
-	continue
-	;;
-
-      -prefer-non-pic)
-	pic_mode=no
-	continue
-	;;
-      esac
-    done
-
-    objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-    xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-    if test "X$xdir" = "X$obj"; then
-      xdir=
-    else
-      xdir=$xdir/
-    fi
-    lobj=${xdir}$objdir/$objname
-
-    if test -z "$base_compile"; then
-      $echo "$modename: you must specify a compilation command" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    # Delete any leftover library objects.
-    if test "$build_old_libs" = yes; then
-      removelist="$obj $lobj $libobj ${libobj}T"
-    else
-      removelist="$lobj $libobj ${libobj}T"
-    fi
-
-    $run $rm $removelist
-    trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
-
-    # On Cygwin there's no "real" PIC flag so we must build both object types
-    case $host_os in
-    cygwin* | mingw* | pw32* | os2*)
-      pic_mode=default
-      ;;
-    esac
-    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
-      # non-PIC code in shared libraries is not supported
-      pic_mode=default
-    fi
-
-    # Calculate the filename of the output object if compiler does
-    # not support -o with -c
-    if test "$compiler_c_o" = no; then
-      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
-      lockfile="$output_obj.lock"
-      removelist="$removelist $output_obj $lockfile"
-      trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
-    else
-      output_obj=
-      need_locks=no
-      lockfile=
-    fi
-
-    # Lock this critical section if it is needed
-    # We use this script file to make the link, it avoids creating a new file
-    if test "$need_locks" = yes; then
-      until $run ln "$progpath" "$lockfile" 2>/dev/null; do
-	$show "Waiting for $lockfile to be removed"
-	sleep 2
-      done
-    elif test "$need_locks" = warn; then
-      if test -f "$lockfile"; then
-	$echo "\
-*** ERROR, $lockfile exists and contains:
-`cat $lockfile 2>/dev/null`
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-      $echo $srcfile > "$lockfile"
-    fi
-
-    if test -n "$fix_srcfile_path"; then
-      eval srcfile=\"$fix_srcfile_path\"
-    fi
-
-    $run $rm "$libobj" "${libobj}T"
-
-    # Create a libtool object file (analogous to a ".la" file),
-    # but don't create it if we're doing a dry run.
-    test -z "$run" && cat > ${libobj}T <<EOF
-# $libobj - a libtool object file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-EOF
-
-    # Only build a PIC object if we are building libtool libraries.
-    if test "$build_libtool_libs" = yes; then
-      # Without this assignment, base_compile gets emptied.
-      fbsd_hideous_sh_bug=$base_compile
-
-      if test "$pic_mode" != no; then
-	command="$base_compile $srcfile $pic_flag"
-      else
-	# Don't build PIC code
-	command="$base_compile $srcfile"
-      fi
-
-      if test ! -d "${xdir}$objdir"; then
-	$show "$mkdir ${xdir}$objdir"
-	$run $mkdir ${xdir}$objdir
-	status=$?
-	if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
-	  exit $status
-	fi
-      fi
-
-      if test -z "$output_obj"; then
-	# Place PIC objects in $objdir
-	command="$command -o $lobj"
-      fi
-
-      $run $rm "$lobj" "$output_obj"
-
-      $show "$command"
-      if $run eval "$command"; then :
-      else
-	test -n "$output_obj" && $run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$echo "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed, then go on to compile the next one
-      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
-	$show "$mv $output_obj $lobj"
-	if $run $mv $output_obj $lobj; then :
-	else
-	  error=$?
-	  $run $rm $removelist
-	  exit $error
-	fi
-      fi
-
-      # Append the name of the PIC object to the libtool object file.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object='$objdir/$objname'
-
-EOF
-
-      # Allow error messages only from the first compilation.
-      if test "$suppress_opt" = yes; then
-        suppress_output=' >/dev/null 2>&1'
-      fi
-    else
-      # No PIC object so indicate it doesn't exist in the libtool
-      # object file.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object=none
-
-EOF
-    fi
-
-    # Only build a position-dependent object if we build old libraries.
-    if test "$build_old_libs" = yes; then
-      if test "$pic_mode" != yes; then
-	# Don't build PIC code
-	command="$base_compile $srcfile"
-      else
-	command="$base_compile $srcfile $pic_flag"
-      fi
-      if test "$compiler_c_o" = yes; then
-	command="$command -o $obj"
-      fi
-
-      # Suppress compiler output if we already did a PIC compilation.
-      command="$command$suppress_output"
-      $run $rm "$obj" "$output_obj"
-      $show "$command"
-      if $run eval "$command"; then :
-      else
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$echo "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed
-      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
-	$show "$mv $output_obj $obj"
-	if $run $mv $output_obj $obj; then :
-	else
-	  error=$?
-	  $run $rm $removelist
-	  exit $error
-	fi
-      fi
-
-      # Append the name of the non-PIC object the libtool object file.
-      # Only append if the libtool object file exists.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object='$objname'
-
-EOF
-    else
-      # Append the name of the non-PIC object the libtool object file.
-      # Only append if the libtool object file exists.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object=none
-
-EOF
-    fi
-
-    $run $mv "${libobj}T" "${libobj}"
-
-    # Unlock the critical section if it was locked
-    if test "$need_locks" != no; then
-      $run $rm "$lockfile"
-    fi
-
-    exit $EXIT_SUCCESS
-    ;;
-
-  # libtool link mode
-  link | relink)
-    modename="$modename: link"
-    case $host in
-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-      # It is impossible to link a dll without this setting, and
-      # we shouldn't force the makefile maintainer to figure out
-      # which system we are compiling for in order to pass an extra
-      # flag for every libtool invocation.
-      # allow_undefined=no
-
-      # FIXME: Unfortunately, there are problems with the above when trying
-      # to make a dll which has undefined symbols, in which case not
-      # even a static library is built.  For now, we need to specify
-      # -no-undefined on the libtool link line when we can be certain
-      # that all symbols are satisfied, otherwise we get a static library.
-      allow_undefined=yes
-      ;;
-    *)
-      allow_undefined=yes
-      ;;
-    esac
-    libtool_args="$nonopt"
-    base_compile="$nonopt $@"
-    compile_command="$nonopt"
-    finalize_command="$nonopt"
-
-    compile_rpath=
-    finalize_rpath=
-    compile_shlibpath=
-    finalize_shlibpath=
-    convenience=
-    old_convenience=
-    deplibs=
-    old_deplibs=
-    compiler_flags=
-    linker_flags=
-    dllsearchpath=
-    lib_search_path=`pwd`
-    inst_prefix_dir=
-
-    avoid_version=no
-    dlfiles=
-    dlprefiles=
-    dlself=no
-    export_dynamic=no
-    export_symbols=
-    export_symbols_regex=
-    generated=
-    libobjs=
-    ltlibs=
-    module=no
-    no_install=no
-    objs=
-    non_pic_objects=
-    precious_files_regex=
-    prefer_static_libs=no
-    preload=no
-    prev=
-    prevarg=
-    release=
-    rpath=
-    xrpath=
-    perm_rpath=
-    temp_rpath=
-    thread_safe=no
-    vinfo=
-    vinfo_number=no
-
-    func_infer_tag $base_compile
-
-    # We need to know -static, to get the right output filenames.
-    for arg
-    do
-      case $arg in
-      -all-static | -static)
-	if test "X$arg" = "X-all-static"; then
-	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
-	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
-	  fi
-	  if test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	else
-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	fi
-	build_libtool_libs=no
-	build_old_libs=yes
-	prefer_static_libs=yes
-	break
-	;;
-      esac
-    done
-
-    # See if our shared archives depend on static archives.
-    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
-
-    # Go through the arguments, transforming them on the way.
-    while test "$#" -gt 0; do
-      arg="$1"
-      shift
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
-	;;
-      *) qarg=$arg ;;
-      esac
-      libtool_args="$libtool_args $qarg"
-
-      # If the previous option needs an argument, assign it.
-      if test -n "$prev"; then
-	case $prev in
-	output)
-	  compile_command="$compile_command @OUTPUT@"
-	  finalize_command="$finalize_command @OUTPUT@"
-	  ;;
-	esac
-
-	case $prev in
-	dlfiles|dlprefiles)
-	  if test "$preload" = no; then
-	    # Add the symbol object into the linking commands.
-	    compile_command="$compile_command @SYMFILE@"
-	    finalize_command="$finalize_command @SYMFILE@"
-	    preload=yes
-	  fi
-	  case $arg in
-	  *.la | *.lo) ;;  # We handle these cases below.
-	  force)
-	    if test "$dlself" = no; then
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  self)
-	    if test "$prev" = dlprefiles; then
-	      dlself=yes
-	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
-	      dlself=yes
-	    else
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  *)
-	    if test "$prev" = dlfiles; then
-	      dlfiles="$dlfiles $arg"
-	    else
-	      dlprefiles="$dlprefiles $arg"
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  esac
-	  ;;
-	expsyms)
-	  export_symbols="$arg"
-	  if test ! -f "$arg"; then
-	    $echo "$modename: symbol file \`$arg' does not exist"
-	    exit $EXIT_FAILURE
-	  fi
-	  prev=
-	  continue
-	  ;;
-	expsyms_regex)
-	  export_symbols_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	inst_prefix)
-	  inst_prefix_dir="$arg"
-	  prev=
-	  continue
-	  ;;
-	precious_regex)
-	  precious_files_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	release)
-	  release="-$arg"
-	  prev=
-	  continue
-	  ;;
-	objectlist)
-	  if test -f "$arg"; then
-	    save_arg=$arg
-	    moreargs=
-	    for fil in `cat $save_arg`
-	    do
-#	      moreargs="$moreargs $fil"
-	      arg=$fil
-	      # A libtool-controlled object.
-
-	      # Check to see that this really is a libtool object.
-	      if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-		pic_object=
-		non_pic_object=
-
-		# Read the .lo file
-		# If there is no directory component, then add one.
-		case $arg in
-		*/* | *\\*) . $arg ;;
-		*) . ./$arg ;;
-		esac
-
-		if test -z "$pic_object" || \
-		   test -z "$non_pic_object" ||
-		   test "$pic_object" = none && \
-		   test "$non_pic_object" = none; then
-		  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-		  exit $EXIT_FAILURE
-		fi
-
-		# Extract subdirectory from the argument.
-		xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-		if test "X$xdir" = "X$arg"; then
-		  xdir=
-		else
-		  xdir="$xdir/"
-		fi
-
-		if test "$pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  pic_object="$xdir$pic_object"
-
-		  if test "$prev" = dlfiles; then
-		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		      dlfiles="$dlfiles $pic_object"
-		      prev=
-		      continue
-		    else
-		      # If libtool objects are unsupported, then we need to preload.
-		      prev=dlprefiles
-		    fi
-		  fi
-
-		  # CHECK ME:  I think I busted this.  -Ossama
-		  if test "$prev" = dlprefiles; then
-		    # Preload the old-style object.
-		    dlprefiles="$dlprefiles $pic_object"
-		    prev=
-		  fi
-
-		  # A PIC object.
-		  libobjs="$libobjs $pic_object"
-		  arg="$pic_object"
-		fi
-
-		# Non-PIC object.
-		if test "$non_pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  non_pic_object="$xdir$non_pic_object"
-
-		  # A standard non-PIC object
-		  non_pic_objects="$non_pic_objects $non_pic_object"
-		  if test -z "$pic_object" || test "$pic_object" = none ; then
-		    arg="$non_pic_object"
-		  fi
-		fi
-	      else
-		# Only an error if not doing a dry-run.
-		if test -z "$run"; then
-		  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-		  exit $EXIT_FAILURE
-		else
-		  # Dry-run case.
-
-		  # Extract subdirectory from the argument.
-		  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-		  if test "X$xdir" = "X$arg"; then
-		    xdir=
-		  else
-		    xdir="$xdir/"
-		  fi
-
-		  pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-		  non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-		  libobjs="$libobjs $pic_object"
-		  non_pic_objects="$non_pic_objects $non_pic_object"
-		fi
-	      fi
-	    done
-	  else
-	    $echo "$modename: link input file \`$save_arg' does not exist"
-	    exit $EXIT_FAILURE
-	  fi
-	  arg=$save_arg
-	  prev=
-	  continue
-	  ;;
-	rpath | xrpath)
-	  # We need an absolute path.
-	  case $arg in
-	  [\\/]* | [A-Za-z]:[\\/]*) ;;
-	  *)
-	    $echo "$modename: only absolute run-paths are allowed" 1>&2
-	    exit $EXIT_FAILURE
-	    ;;
-	  esac
-	  if test "$prev" = rpath; then
-	    case "$rpath " in
-	    *" $arg "*) ;;
-	    *) rpath="$rpath $arg" ;;
-	    esac
-	  else
-	    case "$xrpath " in
-	    *" $arg "*) ;;
-	    *) xrpath="$xrpath $arg" ;;
-	    esac
-	  fi
-	  prev=
-	  continue
-	  ;;
-	xcompiler)
-	  compiler_flags="$compiler_flags $qarg"
-	  prev=
-	  compile_command="$compile_command $qarg"
-	  finalize_command="$finalize_command $qarg"
-	  continue
-	  ;;
-	xlinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $wl$qarg"
-	  prev=
-	  compile_command="$compile_command $wl$qarg"
-	  finalize_command="$finalize_command $wl$qarg"
-	  continue
-	  ;;
-	xcclinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $qarg"
-	  prev=
-	  compile_command="$compile_command $qarg"
-	  finalize_command="$finalize_command $qarg"
-	  continue
-	  ;;
-	shrext)
-  	  shrext_cmds="$arg"
-	  prev=
-	  continue
-	  ;;
-	*)
-	  eval "$prev=\"\$arg\""
-	  prev=
-	  continue
-	  ;;
-	esac
-      fi # test -n "$prev"
-
-      prevarg="$arg"
-
-      case $arg in
-      -all-static)
-	if test -n "$link_static_flag"; then
-	  compile_command="$compile_command $link_static_flag"
-	  finalize_command="$finalize_command $link_static_flag"
-	fi
-	continue
-	;;
-
-      -allow-undefined)
-	# FIXME: remove this flag sometime in the future.
-	$echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
-	continue
-	;;
-
-      -avoid-version)
-	avoid_version=yes
-	continue
-	;;
-
-      -dlopen)
-	prev=dlfiles
-	continue
-	;;
-
-      -dlpreopen)
-	prev=dlprefiles
-	continue
-	;;
-
-      -export-dynamic)
-	export_dynamic=yes
-	continue
-	;;
-
-      -export-symbols | -export-symbols-regex)
-	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	  $echo "$modename: more than one -exported-symbols argument is not allowed"
-	  exit $EXIT_FAILURE
-	fi
-	if test "X$arg" = "X-export-symbols"; then
-	  prev=expsyms
-	else
-	  prev=expsyms_regex
-	fi
-	continue
-	;;
-
-      -inst-prefix-dir)
-	prev=inst_prefix
-	continue
-	;;
-
-      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-      # so, if we see these flags be careful not to treat them like -L
-      -L[A-Z][A-Z]*:*)
-	case $with_gcc/$host in
-	no/*-*-irix* | /*-*-irix*)
-	  compile_command="$compile_command $arg"
-	  finalize_command="$finalize_command $arg"
-	  ;;
-	esac
-	continue
-	;;
-
-      -L*)
-	dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  absdir=`cd "$dir" && pwd`
-	  if test -z "$absdir"; then
-	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  dir="$absdir"
-	  ;;
-	esac
-	case "$deplibs " in
-	*" -L$dir "*) ;;
-	*)
-	  deplibs="$deplibs -L$dir"
-	  lib_search_path="$lib_search_path $dir"
-	  ;;
-	esac
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  case :$dllsearchpath: in
-	  *":$dir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$dir";;
-	  esac
-	  ;;
-	esac
-	continue
-	;;
-
-      -l*)
-	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
-	  case $host in
-	  *-*-cygwin* | *-*-pw32* | *-*-beos*)
-	    # These systems don't actually have a C or math library (as such)
-	    continue
-	    ;;
-	  *-*-mingw* | *-*-os2*)
-	    # These systems don't actually have a C library (as such)
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-openbsd* | *-*-freebsd*)
-	    # Do not include libc due to us having libc/libc_r.
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C and math libraries are in the System framework
-	    deplibs="$deplibs -framework System"
-	    continue
-	  esac
-	elif test "X$arg" = "X-lc_r"; then
-	 case $host in
-	 *-*-openbsd* | *-*-freebsd*)
-	   # Do not include libc_r directly, use -pthread flag.
-	   continue
-	   ;;
-	 esac
-	fi
-	deplibs="$deplibs $arg"
-	continue
-	;;
-
-     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-	deplibs="$deplibs $arg"
-	continue
-	;;
-
-      -module)
-	module=yes
-	continue
-	;;
-
-      # gcc -m* arguments should be passed to the linker via $compiler_flags
-      # in order to pass architecture information to the linker
-      # (e.g. 32 vs 64-bit).  This may also be accomplished via -Wl,-mfoo
-      # but this is not reliable with gcc because gcc may use -mfoo to
-      # select a different linker, different libraries, etc, while
-      # -Wl,-mfoo simply passes -mfoo to the linker.
-      -m*)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-        compile_command="$compile_command $arg"
-        finalize_command="$finalize_command $arg"
-        if test "$with_gcc" = "yes" ; then
-          compiler_flags="$compiler_flags $arg"
-        fi
-        continue
-        ;;
-
-      -shrext)
-	prev=shrext
-	continue
-	;;
-
-      -no-fast-install)
-	fast_install=no
-	continue
-	;;
-
-      -no-install)
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  # The PATH hackery in wrapper scripts is required on Windows
-	  # in order for the loader to find any dlls it needs.
-	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
-	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
-	  fast_install=no
-	  ;;
-	*) no_install=yes ;;
-	esac
-	continue
-	;;
-
-      -no-undefined)
-	allow_undefined=no
-	continue
-	;;
-
-      -objectlist)
-	prev=objectlist
-	continue
-	;;
-
-      -o) prev=output ;;
-
-      -precious-files-regex)
-	prev=precious_regex
-	continue
-	;;
-
-      -release)
-	prev=release
-	continue
-	;;
-
-      -rpath)
-	prev=rpath
-	continue
-	;;
-
-      -R)
-	prev=xrpath
-	continue
-	;;
-
-      -R*)
-	dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  $echo "$modename: only absolute run-paths are allowed" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-	case "$xrpath " in
-	*" $dir "*) ;;
-	*) xrpath="$xrpath $dir" ;;
-	esac
-	continue
-	;;
-
-      -static)
-	# The effects of -static are defined in a previous loop.
-	# We used to do the same as -all-static on platforms that
-	# didn't have a PIC flag, but the assumption that the effects
-	# would be equivalent was wrong.  It would break on at least
-	# Digital Unix and AIX.
-	continue
-	;;
-
-      -thread-safe)
-	thread_safe=yes
-	continue
-	;;
-
-      -version-info)
-	prev=vinfo
-	continue
-	;;
-      -version-number)
-	prev=vinfo
-	vinfo_number=yes
-	continue
-	;;
-
-      -Wc,*)
-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-	  case $flag in
-	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	    flag="\"$flag\""
-	    ;;
-	  esac
-	  arg="$arg $wl$flag"
-	  compiler_flags="$compiler_flags $flag"
-	done
-	IFS="$save_ifs"
-	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-	;;
-
-      -Wl,*)
-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-	  case $flag in
-	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	    flag="\"$flag\""
-	    ;;
-	  esac
-	  arg="$arg $wl$flag"
-	  compiler_flags="$compiler_flags $wl$flag"
-	  linker_flags="$linker_flags $flag"
-	done
-	IFS="$save_ifs"
-	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-	;;
-
-      -Xcompiler)
-	prev=xcompiler
-	continue
-	;;
-
-      -Xlinker)
-	prev=xlinker
-	continue
-	;;
-
-      -XCClinker)
-	prev=xcclinker
-	continue
-	;;
-
-      # Some other compiler flag.
-      -* | +*)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	;;
-
-      *.$objext)
-	# A standard object.
-	objs="$objs $arg"
-	;;
-
-      *.lo)
-	# A libtool-controlled object.
-
-	# Check to see that this really is a libtool object.
-	if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  pic_object=
-	  non_pic_object=
-
-	  # Read the .lo file
-	  # If there is no directory component, then add one.
-	  case $arg in
-	  */* | *\\*) . $arg ;;
-	  *) . ./$arg ;;
-	  esac
-
-	  if test -z "$pic_object" || \
-	     test -z "$non_pic_object" ||
-	     test "$pic_object" = none && \
-	     test "$non_pic_object" = none; then
-	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-
-	  # Extract subdirectory from the argument.
-	  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-	  if test "X$xdir" = "X$arg"; then
-	    xdir=
- 	  else
-	    xdir="$xdir/"
-	  fi
-
-	  if test "$pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    pic_object="$xdir$pic_object"
-
-	    if test "$prev" = dlfiles; then
-	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		dlfiles="$dlfiles $pic_object"
-		prev=
-		continue
-	      else
-		# If libtool objects are unsupported, then we need to preload.
-		prev=dlprefiles
-	      fi
-	    fi
-
-	    # CHECK ME:  I think I busted this.  -Ossama
-	    if test "$prev" = dlprefiles; then
-	      # Preload the old-style object.
-	      dlprefiles="$dlprefiles $pic_object"
-	      prev=
-	    fi
-
-	    # A PIC object.
-	    libobjs="$libobjs $pic_object"
-	    arg="$pic_object"
-	  fi
-
-	  # Non-PIC object.
-	  if test "$non_pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    non_pic_object="$xdir$non_pic_object"
-
-	    # A standard non-PIC object
-	    non_pic_objects="$non_pic_objects $non_pic_object"
-	    if test -z "$pic_object" || test "$pic_object" = none ; then
-	      arg="$non_pic_object"
-	    fi
-	  fi
-	else
-	  # Only an error if not doing a dry-run.
-	  if test -z "$run"; then
-	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-	    exit $EXIT_FAILURE
-	  else
-	    # Dry-run case.
-
-	    # Extract subdirectory from the argument.
-	    xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-	    if test "X$xdir" = "X$arg"; then
-	      xdir=
-	    else
-	      xdir="$xdir/"
-	    fi
-
-	    pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-	    non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-	    libobjs="$libobjs $pic_object"
-	    non_pic_objects="$non_pic_objects $non_pic_object"
-	  fi
-	fi
-	;;
-
-      *.$libext)
-	# An archive.
-	deplibs="$deplibs $arg"
-	old_deplibs="$old_deplibs $arg"
-	continue
-	;;
-
-      *.la)
-	# A libtool-controlled library.
-
-	if test "$prev" = dlfiles; then
-	  # This library was specified with -dlopen.
-	  dlfiles="$dlfiles $arg"
-	  prev=
-	elif test "$prev" = dlprefiles; then
-	  # The library was specified with -dlpreopen.
-	  dlprefiles="$dlprefiles $arg"
-	  prev=
-	else
-	  deplibs="$deplibs $arg"
-	fi
-	continue
-	;;
-
-      # Some other compiler argument.
-      *)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	;;
-      esac # arg
-
-      # Now actually substitute the argument into the commands.
-      if test -n "$arg"; then
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
-      fi
-    done # argument parsing loop
-
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-      eval arg=\"$export_dynamic_flag_spec\"
-      compile_command="$compile_command $arg"
-      finalize_command="$finalize_command $arg"
-    fi
-
-    oldlibs=
-    # calculate the name of the file, without its directory
-    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
-    libobjs_save="$libobjs"
-
-    if test -n "$shlibpath_var"; then
-      # get the directories listed in $shlibpath_var
-      eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
-    else
-      shlib_search_path=
-    fi
-    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
-    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
-
-    output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
-    if test "X$output_objdir" = "X$output"; then
-      output_objdir="$objdir"
-    else
-      output_objdir="$output_objdir/$objdir"
-    fi
-    # Create the object directory.
-    if test ! -d "$output_objdir"; then
-      $show "$mkdir $output_objdir"
-      $run $mkdir $output_objdir
-      status=$?
-      if test "$status" -ne 0 && test ! -d "$output_objdir"; then
-	exit $status
-      fi
-    fi
-
-    # Determine the type of output
-    case $output in
-    "")
-      $echo "$modename: you must specify an output file" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-      ;;
-    *.$libext) linkmode=oldlib ;;
-    *.lo | *.$objext) linkmode=obj ;;
-    *.la) linkmode=lib ;;
-    *) linkmode=prog ;; # Anything else should be a program.
-    esac
-
-    case $host in
-    *cygwin* | *mingw* | *pw32*)
-      # don't eliminate duplications in $postdeps and $predeps
-      duplicate_compiler_generated_deps=yes
-      ;;
-    *)
-      duplicate_compiler_generated_deps=$duplicate_deps
-      ;;
-    esac
-    specialdeplibs=
-
-    libs=
-    # Find all interdependent deplibs by searching for libraries
-    # that are linked more than once (e.g. -la -lb -la)
-    for deplib in $deplibs; do
-      if test "X$duplicate_deps" = "Xyes" ; then
-	case "$libs " in
-	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	esac
-      fi
-      libs="$libs $deplib"
-    done
-
-    if test "$linkmode" = lib; then
-      libs="$predeps $libs $compiler_lib_search_path $postdeps"
-
-      # Compute libraries that are listed more than once in $predeps
-      # $postdeps and mark them as special (i.e., whose duplicates are
-      # not to be eliminated).
-      pre_post_deps=
-      if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then
-	for pre_post_dep in $predeps $postdeps; do
-	  case "$pre_post_deps " in
-	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
-	  esac
-	  pre_post_deps="$pre_post_deps $pre_post_dep"
-	done
-      fi
-      pre_post_deps=
-    fi
-
-    deplibs=
-    newdependency_libs=
-    newlib_search_path=
-    need_relink=no # whether we're linking any uninstalled libtool libraries
-    notinst_deplibs= # not-installed libtool libraries
-    notinst_path= # paths that contain not-installed libtool libraries
-    case $linkmode in
-    lib)
-	passes="conv link"
-	for file in $dlfiles $dlprefiles; do
-	  case $file in
-	  *.la) ;;
-	  *)
-	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
-	    exit $EXIT_FAILURE
-	    ;;
-	  esac
-	done
-	;;
-    prog)
-	compile_deplibs=
-	finalize_deplibs=
-	alldeplibs=no
-	newdlfiles=
-	newdlprefiles=
-	passes="conv scan dlopen dlpreopen link"
-	;;
-    *)  passes="conv"
-	;;
-    esac
-    for pass in $passes; do
-      if test "$linkmode,$pass" = "lib,link" ||
-	 test "$linkmode,$pass" = "prog,scan"; then
-	libs="$deplibs"
-	deplibs=
-      fi
-      if test "$linkmode" = prog; then
-	case $pass in
-	dlopen) libs="$dlfiles" ;;
-	dlpreopen) libs="$dlprefiles" ;;
-	link)
-	  libs="$deplibs %DEPLIBS%"
-	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
-	  ;;
-	esac
-      fi
-      if test "$pass" = dlopen; then
-	# Collect dlpreopened libraries
-	save_deplibs="$deplibs"
-	deplibs=
-      fi
-      for deplib in $libs; do
-	lib=
-	found=no
-	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-	  if test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$deplib $compile_deplibs"
-	    finalize_deplibs="$deplib $finalize_deplibs"
-	  else
-	    deplibs="$deplib $deplibs"
-	  fi
-	  continue
-	  ;;
-	-l*)
-	  if test "$linkmode" != lib && test "$linkmode" != prog; then
-	    $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
-	    continue
-	  fi
-	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
-	    for search_ext in .la $std_shrext .so .a; do
-	      # Search the libtool library
-	      lib="$searchdir/lib${name}${search_ext}"
-	      if test -f "$lib"; then
-		if test "$search_ext" = ".la"; then
-		  found=yes
-		else
-		  found=no
-		fi
-		break 2
-	      fi
-	    done
-	  done
-	  if test "$found" != yes; then
-	    # deplib doesn't seem to be a libtool library
-	    if test "$linkmode,$pass" = "prog,link"; then
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      deplibs="$deplib $deplibs"
-	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    continue
-	  else # deplib is a libtool library
-	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
-	    # We need to do some special things here, and not later.
-	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	      case " $predeps $postdeps " in
-	      *" $deplib "*)
-		if (${SED} -e '2q' $lib |
-                    grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-		  library_names=
-		  old_library=
-		  case $lib in
-		  */* | *\\*) . $lib ;;
-		  *) . ./$lib ;;
-		  esac
-		  for l in $old_library $library_names; do
-		    ll="$l"
-		  done
-		  if test "X$ll" = "X$old_library" ; then # only static version available
-		    found=no
-		    ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-		    test "X$ladir" = "X$lib" && ladir="."
-		    lib=$ladir/$old_library
-		    if test "$linkmode,$pass" = "prog,link"; then
-		      compile_deplibs="$deplib $compile_deplibs"
-		      finalize_deplibs="$deplib $finalize_deplibs"
-		    else
-		      deplibs="$deplib $deplibs"
-		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-		    fi
-		    continue
-		  fi
-		fi
-	        ;;
-	      *) ;;
-	      esac
-	    fi
-	  fi
-	  ;; # -l
-	-L*)
-	  case $linkmode in
-	  lib)
-	    deplibs="$deplib $deplibs"
-	    test "$pass" = conv && continue
-	    newdependency_libs="$deplib $newdependency_libs"
-	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-	    ;;
-	  prog)
-	    if test "$pass" = conv; then
-	      deplibs="$deplib $deplibs"
-	      continue
-	    fi
-	    if test "$pass" = scan; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-	    ;;
-	  *)
-	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
-	    ;;
-	  esac # linkmode
-	  continue
-	  ;; # -L
-	-R*)
-	  if test "$pass" = link; then
-	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
-	    # Make sure the xrpath contains only unique directories.
-	    case "$xrpath " in
-	    *" $dir "*) ;;
-	    *) xrpath="$xrpath $dir" ;;
-	    esac
-	  fi
-	  deplibs="$deplib $deplibs"
-	  continue
-	  ;;
-	*.la) lib="$deplib" ;;
-	*.$libext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	    continue
-	  fi
-	  case $linkmode in
-	  lib)
-	    if test "$deplibs_check_method" != pass_all; then
-	      $echo
-	      $echo "*** Warning: Trying to link with static lib archive $deplib."
-	      $echo "*** I have the capability to make that library automatically link in when"
-	      $echo "*** you link to this library.  But I can only do this if you have a"
-	      $echo "*** shared version of the library, which you do not appear to have"
-	      $echo "*** because the file extensions .$libext of this argument makes me believe"
-	      $echo "*** that it is just a static archive that I should not used here."
-	    else
-	      $echo
-	      $echo "*** Warning: Linking the shared library $output against the"
-	      $echo "*** static library $deplib is not portable!"
-	      deplibs="$deplib $deplibs"
-	    fi
-	    continue
-	    ;;
-	  prog)
-	    if test "$pass" != link; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    continue
-	    ;;
-	  esac # linkmode
-	  ;; # *.$libext
-	*.lo | *.$objext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	  elif test "$linkmode" = prog; then
-	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-	      # If there is no dlopen support or we're linking statically,
-	      # we need to preload.
-	      newdlprefiles="$newdlprefiles $deplib"
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      newdlfiles="$newdlfiles $deplib"
-	    fi
-	  fi
-	  continue
-	  ;;
-	%DEPLIBS%)
-	  alldeplibs=yes
-	  continue
-	  ;;
-	esac # case $deplib
-	if test "$found" = yes || test -f "$lib"; then :
-	else
-	  $echo "$modename: cannot find the library \`$lib'" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$ladir" = "X$lib" && ladir="."
-
-	dlname=
-	dlopen=
-	dlpreopen=
-	libdir=
-	library_names=
-	old_library=
-	# If the library was installed with an old release of libtool,
-	# it will not redefine variables installed, or shouldnotlink
-	installed=yes
-	shouldnotlink=no
-
-	# Read the .la file
-	case $lib in
-	*/* | *\\*) . $lib ;;
-	*) . ./$lib ;;
-	esac
-
-	if test "$linkmode,$pass" = "lib,link" ||
-	   test "$linkmode,$pass" = "prog,scan" ||
-	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
-	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
-	fi
-
-	if test "$pass" = conv; then
-	  # Only check for convenience libraries
-	  deplibs="$lib $deplibs"
-	  if test -z "$libdir"; then
-	    if test -z "$old_library"; then
-	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	      exit $EXIT_FAILURE
-	    fi
-	    # It is a libtool convenience library, so add in its objects.
-	    convenience="$convenience $ladir/$objdir/$old_library"
-	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
-	    tmp_libs=
-	    for deplib in $dependency_libs; do
-	      deplibs="$deplib $deplibs"
-              if test "X$duplicate_deps" = "Xyes" ; then
-	        case "$tmp_libs " in
-	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	        esac
-              fi
-	      tmp_libs="$tmp_libs $deplib"
-	    done
-	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
-	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  continue
-	fi # $pass = conv
-
-
-	# Get the name of the library we link against.
-	linklib=
-	for l in $old_library $library_names; do
-	  linklib="$l"
-	done
-	if test -z "$linklib"; then
-	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# This library was specified with -dlopen.
-	if test "$pass" = dlopen; then
-	  if test -z "$libdir"; then
-	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  if test -z "$dlname" ||
-	     test "$dlopen_support" != yes ||
-	     test "$build_libtool_libs" = no; then
-	    # If there is no dlname, no dlopen support or we're linking
-	    # statically, we need to preload.  We also need to preload any
-	    # dependent libraries so libltdl's deplib preloader doesn't
-	    # bomb out in the load deplibs phase.
-	    dlprefiles="$dlprefiles $lib $dependency_libs"
-	  else
-	    newdlfiles="$newdlfiles $lib"
-	  fi
-	  continue
-	fi # $pass = dlopen
-
-	# We need an absolute path.
-	case $ladir in
-	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
-	*)
-	  abs_ladir=`cd "$ladir" && pwd`
-	  if test -z "$abs_ladir"; then
-	    $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
-	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
-	    abs_ladir="$ladir"
-	  fi
-	  ;;
-	esac
-	laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-
-	# Find the relevant object directory and library name.
-	if test "X$installed" = Xyes; then
-	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    $echo "$modename: warning: library \`$lib' was moved." 1>&2
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    libdir="$abs_ladir"
-	  else
-	    dir="$libdir"
-	    absdir="$libdir"
-	  fi
-	else
-	  dir="$ladir/$objdir"
-	  absdir="$abs_ladir/$objdir"
-	  # Remove this search path later
-	  notinst_path="$notinst_path $abs_ladir"
-	fi # $installed = yes
-	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-
-	# This library was specified with -dlpreopen.
-	if test "$pass" = dlpreopen; then
-	  if test -z "$libdir"; then
-	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  # Prefer using a static library (so that no silly _DYNAMIC symbols
-	  # are required to link).
-	  if test -n "$old_library"; then
-	    newdlprefiles="$newdlprefiles $dir/$old_library"
-	  # Otherwise, use the dlname, so that lt_dlopen finds it.
-	  elif test -n "$dlname"; then
-	    newdlprefiles="$newdlprefiles $dir/$dlname"
-	  else
-	    newdlprefiles="$newdlprefiles $dir/$linklib"
-	  fi
-	fi # $pass = dlpreopen
-
-	if test -z "$libdir"; then
-	  # Link the convenience library
-	  if test "$linkmode" = lib; then
-	    deplibs="$dir/$old_library $deplibs"
-	  elif test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$dir/$old_library $compile_deplibs"
-	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
-	  else
-	    deplibs="$lib $deplibs" # used for prog,scan pass
-	  fi
-	  continue
-	fi
-
-
-	if test "$linkmode" = prog && test "$pass" != link; then
-	  newlib_search_path="$newlib_search_path $ladir"
-	  deplibs="$lib $deplibs"
-
-	  linkalldeplibs=no
-	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
-	     test "$build_libtool_libs" = no; then
-	    linkalldeplibs=yes
-	  fi
-
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    case $deplib in
-	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
-	    esac
-	    # Need to link against all dependency_libs?
-	    if test "$linkalldeplibs" = yes; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      # Need to hardcode shared library paths
-	      # or/and link against static libraries
-	      newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    if test "X$duplicate_deps" = "Xyes" ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done # for deplib
-	  continue
-	fi # $linkmode = prog...
-
-	if test "$linkmode,$pass" = "prog,link"; then
-	  if test -n "$library_names" &&
-	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
-	    # We need to hardcode the library path
-	    if test -n "$shlibpath_var"; then
-	      # Make sure the rpath contains only unique directories.
-	      case "$temp_rpath " in
-	      *" $dir "*) ;;
-	      *" $absdir "*) ;;
-	      *) temp_rpath="$temp_rpath $dir" ;;
-	      esac
-	    fi
-
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
-	      esac
-	      ;;
-	    esac
-	  fi # $linkmode,$pass = prog,link...
-
-	  if test "$alldeplibs" = yes &&
-	     { test "$deplibs_check_method" = pass_all ||
-	       { test "$build_libtool_libs" = yes &&
-		 test -n "$library_names"; }; }; then
-	    # We only need to search for static libraries
-	    continue
-	  fi
-	fi
-
-	link_static=no # Whether the deplib will be linked statically
-	if test -n "$library_names" &&
-	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
-	  if test "$installed" = no; then
-	    notinst_deplibs="$notinst_deplibs $lib"
-	    need_relink=yes
-	  fi
-	  # This is a shared library
-
-	  # Warn about portability, can't link against -module's on
-	  # some systems (darwin)
-	  if test "$shouldnotlink" = yes && test "$pass" = link ; then
-	    $echo
-	    if test "$linkmode" = prog; then
-	      $echo "*** Warning: Linking the executable $output against the loadable module"
-	    else
-	      $echo "*** Warning: Linking the shared library $output against the loadable module"
-	    fi
-	    $echo "*** $linklib is not portable!"
-	  fi
-	  if test "$linkmode" = lib &&
-	     test "$hardcode_into_libs" = yes; then
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
-	      esac
-	      ;;
-	    esac
-	  fi
-
-	  if test -n "$old_archive_from_expsyms_cmds"; then
-	    # figure out the soname
-	    set dummy $library_names
-	    realname="$2"
-	    shift; shift
-	    libname=`eval \\$echo \"$libname_spec\"`
-	    # use dlname if we got it. it's perfectly good, no?
-	    if test -n "$dlname"; then
-	      soname="$dlname"
-	    elif test -n "$soname_spec"; then
-	      # bleh windows
-	      case $host in
-	      *cygwin* | mingw*)
-		major=`expr $current - $age`
-		versuffix="-$major"
-		;;
-	      esac
-	      eval soname=\"$soname_spec\"
-	    else
-	      soname="$realname"
-	    fi
-
-	    # Make a new name for the extract_expsyms_cmds to use
-	    soroot="$soname"
-	    soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
-	    newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
-
-	    # If the library has no export list, then create one now
-	    if test -f "$output_objdir/$soname-def"; then :
-	    else
-	      $show "extracting exported symbol list from \`$soname'"
-	      save_ifs="$IFS"; IFS='~'
-	      cmds=$extract_expsyms_cmds
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd" || exit $?
-	      done
-	      IFS="$save_ifs"
-	    fi
-
-	    # Create $newlib
-	    if test -f "$output_objdir/$newlib"; then :; else
-	      $show "generating import library for \`$soname'"
-	      save_ifs="$IFS"; IFS='~'
-	      cmds=$old_archive_from_expsyms_cmds
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd" || exit $?
-	      done
-	      IFS="$save_ifs"
-	    fi
-	    # make sure the library variables are pointing to the new library
-	    dir=$output_objdir
-	    linklib=$newlib
-	  fi # test -n "$old_archive_from_expsyms_cmds"
-
-	  if test "$linkmode" = prog || test "$mode" != relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    lib_linked=yes
-	    case $hardcode_action in
-	    immediate | unsupported)
-	      if test "$hardcode_direct" = no; then
-		add="$dir/$linklib"
-		case $host in
-		  *-*-sco3.2v5* ) add_dir="-L$dir" ;;
-		  *-*-darwin* )
-		    # if the lib is a module then we can not link against
-		    # it, someone is ignoring the new warnings I added
-		    if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then
-		      $echo "** Warning, lib $linklib is a module, not a shared library"
-		      if test -z "$old_library" ; then
-		        $echo
-		        $echo "** And there doesn't seem to be a static archive available"
-		        $echo "** The link will probably fail, sorry"
-		      else
-		        add="$dir/$old_library"
-		      fi
-		    fi
-		esac
-	      elif test "$hardcode_minus_L" = no; then
-		case $host in
-		*-*-sunos*) add_shlibpath="$dir" ;;
-		esac
-		add_dir="-L$dir"
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = no; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    relink)
-	      if test "$hardcode_direct" = yes; then
-		add="$dir/$linklib"
-	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
-		# Try looking first in the location we're being installed to.
-		if test -n "$inst_prefix_dir"; then
-		  case "$libdir" in
-		    [\\/]*)
-		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
-		      ;;
-		  esac
-		fi
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = yes; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    *) lib_linked=no ;;
-	    esac
-
-	    if test "$lib_linked" != yes; then
-	      $echo "$modename: configuration error: unsupported hardcode properties"
-	      exit $EXIT_FAILURE
-	    fi
-
-	    if test -n "$add_shlibpath"; then
-	      case :$compile_shlibpath: in
-	      *":$add_shlibpath:"*) ;;
-	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
-	      esac
-	    fi
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
-	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	      if test "$hardcode_direct" != yes && \
-		 test "$hardcode_minus_L" != yes && \
-		 test "$hardcode_shlibpath_var" = yes; then
-		case :$finalize_shlibpath: in
-		*":$libdir:"*) ;;
-		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-		esac
-	      fi
-	    fi
-	  fi
-
-	  if test "$linkmode" = prog || test "$mode" = relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    # Finalize command for both is simple: just hardcode it.
-	    if test "$hardcode_direct" = yes; then
-	      add="$libdir/$linklib"
-	    elif test "$hardcode_minus_L" = yes; then
-	      add_dir="-L$libdir"
-	      add="-l$name"
-	    elif test "$hardcode_shlibpath_var" = yes; then
-	      case :$finalize_shlibpath: in
-	      *":$libdir:"*) ;;
-	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-	      esac
-	      add="-l$name"
-	    elif test "$hardcode_automatic" = yes; then
-	      if test -n "$inst_prefix_dir" &&
-		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
-	        add="$inst_prefix_dir$libdir/$linklib"
-	      else
-	        add="$libdir/$linklib"
-	      fi
-	    else
-	      # We cannot seem to hardcode it, guess we'll fake it.
-	      add_dir="-L$libdir"
-	      # Try looking first in the location we're being installed to.
-	      if test -n "$inst_prefix_dir"; then
-		case "$libdir" in
-		  [\\/]*)
-		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
-		    ;;
-		esac
-	      fi
-	      add="-l$name"
-	    fi
-
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
-	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	    fi
-	  fi
-	elif test "$linkmode" = prog; then
-	  # Here we assume that one of hardcode_direct or hardcode_minus_L
-	  # is not unsupported.  This is valid on all known static and
-	  # shared platforms.
-	  if test "$hardcode_direct" != unsupported; then
-	    test -n "$old_library" && linklib="$old_library"
-	    compile_deplibs="$dir/$linklib $compile_deplibs"
-	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
-	  else
-	    compile_deplibs="-l$name -L$dir $compile_deplibs"
-	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
-	  fi
-	elif test "$build_libtool_libs" = yes; then
-	  # Not a shared library
-	  if test "$deplibs_check_method" != pass_all; then
-	    # We're trying link a shared library against a static one
-	    # but the system doesn't support it.
-
-	    # Just print a warning and add the library to dependency_libs so
-	    # that the program can be linked against the static library.
-	    $echo
-	    $echo "*** Warning: This system can not link to static lib archive $lib."
-	    $echo "*** I have the capability to make that library automatically link in when"
-	    $echo "*** you link to this library.  But I can only do this if you have a"
-	    $echo "*** shared version of the library, which you do not appear to have."
-	    if test "$module" = yes; then
-	      $echo "*** But as you try to build a module library, libtool will still create "
-	      $echo "*** a static module, that should work as long as the dlopening application"
-	      $echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
-	      if test -z "$global_symbol_pipe"; then
-		$echo
-		$echo "*** However, this would only work if libtool was able to extract symbol"
-		$echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-		$echo "*** not find such a program.  So, this module is probably useless."
-		$echo "*** \`nm' from GNU binutils and a full rebuild may help."
-	      fi
-	      if test "$build_old_libs" = no; then
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  else
-	    convenience="$convenience $dir/$old_library"
-	    old_convenience="$old_convenience $dir/$old_library"
-	    deplibs="$dir/$old_library $deplibs"
-	    link_static=yes
-	  fi
-	fi # link shared/static library?
-
-	if test "$linkmode" = lib; then
-	  if test -n "$dependency_libs" &&
-	     { test "$hardcode_into_libs" != yes ||
-	       test "$build_old_libs" = yes ||
-	       test "$link_static" = yes; }; then
-	    # Extract -R from dependency_libs
-	    temp_deplibs=
-	    for libdir in $dependency_libs; do
-	      case $libdir in
-	      -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
-		   case " $xrpath " in
-		   *" $temp_xrpath "*) ;;
-		   *) xrpath="$xrpath $temp_xrpath";;
-		   esac;;
-	      *) temp_deplibs="$temp_deplibs $libdir";;
-	      esac
-	    done
-	    dependency_libs="$temp_deplibs"
-	  fi
-
-	  newlib_search_path="$newlib_search_path $absdir"
-	  # Link against this library
-	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
-	  # ... and its dependency_libs
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    newdependency_libs="$deplib $newdependency_libs"
-	    if test "X$duplicate_deps" = "Xyes" ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done
-
-	  if test "$link_all_deplibs" != no; then
-	    # Add the search paths of all dependency libraries
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      -L*) path="$deplib" ;;
-	      *.la)
-		dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
-		test "X$dir" = "X$deplib" && dir="."
-		# We need an absolute path.
-		case $dir in
-		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-		*)
-		  absdir=`cd "$dir" && pwd`
-		  if test -z "$absdir"; then
-		    $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
-		    absdir="$dir"
-		  fi
-		  ;;
-		esac
-		if grep "^installed=no" $deplib > /dev/null; then
-		  path="$absdir/$objdir"
-		else
-		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		  if test -z "$libdir"; then
-		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-		    exit $EXIT_FAILURE
-		  fi
-		  if test "$absdir" != "$libdir"; then
-		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-		  fi
-		  path="$absdir"
-		fi
-		depdepl=
-		case $host in
-		*-*-darwin*)
-		  # we do not want to link against static libs,
-		  # but need to link against shared
-		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-		  if test -n "$deplibrary_names" ; then
-		    for tmp in $deplibrary_names ; do
-		      depdepl=$tmp
-		    done
-		    if test -f "$path/$depdepl" ; then
-		      depdepl="$path/$depdepl"
-		    fi
-		    # do not add paths which are already there
-		    case " $newlib_search_path " in
-		    *" $path "*) ;;
-		    *) newlib_search_path="$newlib_search_path $path";;
-		    esac
-		  fi
-		  path=""
-		  ;;
-		*)
-		  path="-L$path"
-		  ;;
-		esac
-		;;
-	      -l*)
-		case $host in
-		*-*-darwin*)
-		  # Again, we only want to link against shared libraries
-		  eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
-		  for tmp in $newlib_search_path ; do
-		    if test -f "$tmp/lib$tmp_libs.dylib" ; then
-		      eval depdepl="$tmp/lib$tmp_libs.dylib"
-		      break
-		    fi
-		  done
-		  path=""
-		  ;;
-		*) continue ;;
-		esac
-		;;
-	      *) continue ;;
-	      esac
-	      case " $deplibs " in
-	      *" $depdepl "*) ;;
-	      *) deplibs="$depdepl $deplibs" ;;
-	      esac
-	      case " $deplibs " in
-	      *" $path "*) ;;
-	      *) deplibs="$deplibs $path" ;;
-	      esac
-	    done
-	  fi # link_all_deplibs != no
-	fi # linkmode = lib
-      done # for deplib in $libs
-      dependency_libs="$newdependency_libs"
-      if test "$pass" = dlpreopen; then
-	# Link the dlpreopened libraries before other libraries
-	for deplib in $save_deplibs; do
-	  deplibs="$deplib $deplibs"
-	done
-      fi
-      if test "$pass" != dlopen; then
-	if test "$pass" != conv; then
-	  # Make sure lib_search_path contains only unique directories.
-	  lib_search_path=
-	  for dir in $newlib_search_path; do
-	    case "$lib_search_path " in
-	    *" $dir "*) ;;
-	    *) lib_search_path="$lib_search_path $dir" ;;
-	    esac
-	  done
-	  newlib_search_path=
-	fi
-
-	if test "$linkmode,$pass" != "prog,link"; then
-	  vars="deplibs"
-	else
-	  vars="compile_deplibs finalize_deplibs"
-	fi
-	for var in $vars dependency_libs; do
-	  # Add libraries to $var in reverse order
-	  eval tmp_libs=\"\$$var\"
-	  new_libs=
-	  for deplib in $tmp_libs; do
-	    # FIXME: Pedantically, this is the right thing to do, so
-	    #        that some nasty dependency loop isn't accidentally
-	    #        broken:
-	    #new_libs="$deplib $new_libs"
-	    # Pragmatically, this seems to cause very few problems in
-	    # practice:
-	    case $deplib in
-	    -L*) new_libs="$deplib $new_libs" ;;
-	    -R*) ;;
-	    *)
-	      # And here is the reason: when a library appears more
-	      # than once as an explicit dependence of a library, or
-	      # is implicitly linked in more than once by the
-	      # compiler, it is considered special, and multiple
-	      # occurrences thereof are not removed.  Compare this
-	      # with having the same library being listed as a
-	      # dependency of multiple other libraries: in this case,
-	      # we know (pedantically, we assume) the library does not
-	      # need to be listed more than once, so we keep only the
-	      # last copy.  This is not always right, but it is rare
-	      # enough that we require users that really mean to play
-	      # such unportable linking tricks to link the library
-	      # using -Wl,-lname, so that libtool does not consider it
-	      # for duplicate removal.
-	      case " $specialdeplibs " in
-	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
-	      *)
-		case " $new_libs " in
-		*" $deplib "*) ;;
-		*) new_libs="$deplib $new_libs" ;;
-		esac
-		;;
-	      esac
-	      ;;
-	    esac
-	  done
-	  tmp_libs=
-	  for deplib in $new_libs; do
-	    case $deplib in
-	    -L*)
-	      case " $tmp_libs " in
-	      *" $deplib "*) ;;
-	      *) tmp_libs="$tmp_libs $deplib" ;;
-	      esac
-	      ;;
-	    *) tmp_libs="$tmp_libs $deplib" ;;
-	    esac
-	  done
-	  eval $var=\"$tmp_libs\"
-	done # for var
-      fi
-      # Last step: remove runtime libs from dependency_libs
-      # (they stay in deplibs)
-      tmp_libs=
-      for i in $dependency_libs ; do
-	case " $predeps $postdeps $compiler_lib_search_path " in
-	*" $i "*)
-	  i=""
-	  ;;
-	esac
-	if test -n "$i" ; then
-	  tmp_libs="$tmp_libs $i"
-	fi
-      done
-      dependency_libs=$tmp_libs
-    done # for pass
-    if test "$linkmode" = prog; then
-      dlfiles="$newdlfiles"
-      dlprefiles="$newdlprefiles"
-    fi
-
-    case $linkmode in
-    oldlib)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
-      fi
-
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$rpath"; then
-	$echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$xrpath"; then
-	$echo "$modename: warning: \`-R' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	$echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
-      fi
-
-      # Now set the variables for building old libraries.
-      build_libtool_libs=no
-      oldlibs="$output"
-      objs="$objs$old_deplibs"
-      ;;
-
-    lib)
-      # Make sure we only generate libraries of the form `libNAME.la'.
-      case $outputname in
-      lib*)
-	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-	eval shared_ext=\"$shrext_cmds\"
-	eval libname=\"$libname_spec\"
-	;;
-      *)
-	if test "$module" = no; then
-	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-	if test "$need_lib_prefix" != no; then
-	  # Add the "lib" prefix for modules if required
-	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-	  eval shared_ext=\"$shrext_cmds\"
-	  eval libname=\"$libname_spec\"
-	else
-	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-	fi
-	;;
-      esac
-
-      if test -n "$objs"; then
-	if test "$deplibs_check_method" != pass_all; then
-	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
-	  exit $EXIT_FAILURE
-	else
-	  $echo
-	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
-	  $echo "*** objects $objs is not portable!"
-	  libobjs="$libobjs $objs"
-	fi
-      fi
-
-      if test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
-      fi
-
-      set dummy $rpath
-      if test "$#" -gt 2; then
-	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
-      fi
-      install_libdir="$2"
-
-      oldlibs=
-      if test -z "$rpath"; then
-	if test "$build_libtool_libs" = yes; then
-	  # Building a libtool convenience library.
-	  # Some compilers have problems with a `.al' extension so
-	  # convenience libraries should have the same extension an
-	  # archive normally would.
-	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
-	  build_libtool_libs=convenience
-	  build_old_libs=yes
-	fi
-
-	if test -n "$vinfo"; then
-	  $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
-	fi
-
-	if test -n "$release"; then
-	  $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
-	fi
-      else
-
-	# Parse the version information argument.
-	save_ifs="$IFS"; IFS=':'
-	set dummy $vinfo 0 0 0
-	IFS="$save_ifs"
-
-	if test -n "$8"; then
-	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# convert absolute version numbers to libtool ages
-	# this retains compatibility with .la files and attempts
-	# to make the code below a bit more comprehensible
-
-	case $vinfo_number in
-	yes)
-	  number_major="$2"
-	  number_minor="$3"
-	  number_revision="$4"
-	  #
-	  # There are really only two kinds -- those that
-	  # use the current revision as the major version
-	  # and those that subtract age and use age as
-	  # a minor version.  But, then there is irix
-	  # which has an extra 1 added just for fun
-	  #
-	  case $version_type in
-	  darwin|linux|osf|windows)
-	    current=`expr $number_major + $number_minor`
-	    age="$number_minor"
-	    revision="$number_revision"
-	    ;;
-	  freebsd-aout|freebsd-elf|sunos)
-	    current="$number_major"
-	    revision="$number_minor"
-	    age="0"
-	    ;;
-	  irix|nonstopux)
-	    current=`expr $number_major + $number_minor - 1`
-	    age="$number_minor"
-	    revision="$number_minor"
-	    ;;
-	  *)
-	    $echo "$modename: unknown library version type \`$version_type'" 1>&2
-	    $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-	    exit $EXIT_FAILURE
-	    ;;
-	  esac
-	  ;;
-	no)
-	  current="$2"
-	  revision="$3"
-	  age="$4"
-	  ;;
-	esac
-
-	# Check that each of the things are valid numbers.
-	case $current in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	case $revision in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	case $age in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	if test "$age" -gt "$current"; then
-	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# Calculate the version variables.
-	major=
-	versuffix=
-	verstring=
-	case $version_type in
-	none) ;;
-
-	darwin)
-	  # Like Linux, but with the current version available in
-	  # verstring for coding it into the library header
-	  major=.`expr $current - $age`
-	  versuffix="$major.$age.$revision"
-	  # Darwin ld doesn't like 0 for these options...
-	  minor_current=`expr $current + 1`
-	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-	  ;;
-
-	freebsd-aout)
-	  major=".$current"
-	  versuffix=".$current.$revision";
-	  ;;
-
-	freebsd-elf)
-	  major=".$current"
-	  versuffix=".$current";
-	  ;;
-
-	irix | nonstopux)
-	  major=`expr $current - $age + 1`
-
-	  case $version_type in
-	    nonstopux) verstring_prefix=nonstopux ;;
-	    *)         verstring_prefix=sgi ;;
-	  esac
-	  verstring="$verstring_prefix$major.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$revision
-	  while test "$loop" -ne 0; do
-	    iface=`expr $revision - $loop`
-	    loop=`expr $loop - 1`
-	    verstring="$verstring_prefix$major.$iface:$verstring"
-	  done
-
-	  # Before this point, $major must not contain `.'.
-	  major=.$major
-	  versuffix="$major.$revision"
-	  ;;
-
-	linux)
-	  major=.`expr $current - $age`
-	  versuffix="$major.$age.$revision"
-	  ;;
-
-	osf)
-	  major=.`expr $current - $age`
-	  versuffix=".$current.$age.$revision"
-	  verstring="$current.$age.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$age
-	  while test "$loop" -ne 0; do
-	    iface=`expr $current - $loop`
-	    loop=`expr $loop - 1`
-	    verstring="$verstring:${iface}.0"
-	  done
-
-	  # Make executables depend on our current version.
-	  verstring="$verstring:${current}.0"
-	  ;;
-
-	sunos)
-	  major=".$current"
-	  versuffix=".$current.$revision"
-	  ;;
-
-	windows)
-	  # Use '-' rather than '.', since we only want one
-	  # extension on DOS 8.3 filesystems.
-	  major=`expr $current - $age`
-	  versuffix="-$major"
-	  ;;
-
-	*)
-	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
-	  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	# Clear the version info if we defaulted, and they specified a release.
-	if test -z "$vinfo" && test -n "$release"; then
-	  major=
-	  case $version_type in
-	  darwin)
-	    # we can't check for "0.0" in archive_cmds due to quoting
-	    # problems, so we reset it completely
-	    verstring=
-	    ;;
-	  *)
-	    verstring="0.0"
-	    ;;
-	  esac
-	  if test "$need_version" = no; then
-	    versuffix=
-	  else
-	    versuffix=".0.0"
-	  fi
-	fi
-
-	# Remove version info from name if versioning should be avoided
-	if test "$avoid_version" = yes && test "$need_version" = no; then
-	  major=
-	  versuffix=
-	  verstring=""
-	fi
-
-	# Check to see if the archive will have undefined symbols.
-	if test "$allow_undefined" = yes; then
-	  if test "$allow_undefined_flag" = unsupported; then
-	    $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
-	    build_libtool_libs=no
-	    build_old_libs=yes
-	  fi
-	else
-	  # Don't allow undefined symbols.
-	  allow_undefined_flag="$no_undefined_flag"
-	fi
-      fi
-
-      if test "$mode" != relink; then
-	# Remove our outputs, but don't remove object files since they
-	# may have been created when compiling PIC objects.
-	removelist=
-	tempremovelist=`$echo "$output_objdir/*"`
-	for p in $tempremovelist; do
-	  case $p in
-	    *.$objext)
-	       ;;
-	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-	       if test "X$precious_files_regex" != "X"; then
-	         if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
-	         then
-		   continue
-		 fi
-	       fi
-	       removelist="$removelist $p"
-	       ;;
-	    *) ;;
-	  esac
-	done
-	if test -n "$removelist"; then
-	  $show "${rm}r $removelist"
-	  $run ${rm}r $removelist
-	fi
-      fi
-
-      # Now set the variables for building old libraries.
-      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-	oldlibs="$oldlibs $output_objdir/$libname.$libext"
-
-	# Transform .lo files to .o files.
-	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
-      fi
-
-      # Eliminate all temporary directories.
-      for path in $notinst_path; do
-	lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
-	deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
-	dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
-      done
-
-      if test -n "$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	temp_xrpath=
-	for libdir in $xrpath; do
-	  temp_xrpath="$temp_xrpath -R$libdir"
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-	  esac
-	done
-	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-	  dependency_libs="$temp_xrpath $dependency_libs"
-	fi
-      fi
-
-      # Make sure dlfiles contains only unique files that won't be dlpreopened
-      old_dlfiles="$dlfiles"
-      dlfiles=
-      for lib in $old_dlfiles; do
-	case " $dlprefiles $dlfiles " in
-	*" $lib "*) ;;
-	*) dlfiles="$dlfiles $lib" ;;
-	esac
-      done
-
-      # Make sure dlprefiles contains only unique files
-      old_dlprefiles="$dlprefiles"
-      dlprefiles=
-      for lib in $old_dlprefiles; do
-	case "$dlprefiles " in
-	*" $lib "*) ;;
-	*) dlprefiles="$dlprefiles $lib" ;;
-	esac
-      done
-
-      if test "$build_libtool_libs" = yes; then
-	if test -n "$rpath"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
-	    # these systems don't actually have a c library (as such)!
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C library is in the System framework
-	    deplibs="$deplibs -framework System"
-	    ;;
-	  *-*-netbsd*)
-	    # Don't link with libc until the a.out ld.so is fixed.
-	    ;;
-	  *-*-openbsd* | *-*-freebsd*)
-	    # Do not include libc due to us having libc/libc_r.
-	    test "X$arg" = "X-lc" && continue
-	    ;;
- 	  *)
-	    # Add libc to deplibs on all other systems if necessary.
-	    if test "$build_libtool_need_lc" = "yes"; then
-	      deplibs="$deplibs -lc"
-	    fi
-	    ;;
-	  esac
-	fi
-
-	# Transform deplibs into only deplibs that can be linked in shared.
-	name_save=$name
-	libname_save=$libname
-	release_save=$release
-	versuffix_save=$versuffix
-	major_save=$major
-	# I'm not sure if I'm treating the release correctly.  I think
-	# release should show up in the -l (ie -lgmp5) so we don't want to
-	# add it in twice.  Is that correct?
-	release=""
-	versuffix=""
-	major=""
-	newdeplibs=
-	droppeddeps=no
-	case $deplibs_check_method in
-	pass_all)
-	  # Don't check for shared/static.  Everything works.
-	  # This might be a little naive.  We might want to check
-	  # whether the library exists or not.  But this is on
-	  # osf3 & osf4 and I'm not really sure... Just
-	  # implementing what was already the behavior.
-	  newdeplibs=$deplibs
-	  ;;
-	test_compile)
-	  # This code stresses the "libraries are programs" paradigm to its
-	  # limits. Maybe even breaks it.  We compile a program, linking it
-	  # against the deplibs as a proxy for the library.  Then we can check
-	  # whether they linked in statically or dynamically with ldd.
-	  $rm conftest.c
-	  cat > conftest.c <<EOF
-	  int main() { return 0; }
-EOF
-	  $rm conftest
-	  $LTCC -o conftest conftest.c $deplibs
-	  if test "$?" -eq 0 ; then
-	    ldd_output=`ldd conftest`
-	    for i in $deplibs; do
-	      name="`expr $i : '-l\(.*\)'`"
-	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" -ne "0"; then
-		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		  case " $predeps $postdeps " in
-		  *" $i "*)
-		    newdeplibs="$newdeplibs $i"
-		    i=""
-		    ;;
-		  esac
-	        fi
-		if test -n "$i" ; then
-		  libname=`eval \\$echo \"$libname_spec\"`
-		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
-		  set dummy $deplib_matches
-		  deplib_match=$2
-		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		    newdeplibs="$newdeplibs $i"
-		  else
-		    droppeddeps=yes
-		    $echo
-		    $echo "*** Warning: dynamic linker does not accept needed library $i."
-		    $echo "*** I have the capability to make that library automatically link in when"
-		    $echo "*** you link to this library.  But I can only do this if you have a"
-		    $echo "*** shared version of the library, which I believe you do not have"
-		    $echo "*** because a test_compile did reveal that the linker did not use it for"
-		    $echo "*** its dynamic dependency list that programs get resolved with at runtime."
-		  fi
-		fi
-	      else
-		newdeplibs="$newdeplibs $i"
-	      fi
-	    done
-	  else
-	    # Error occurred in the first compile.  Let's try to salvage
-	    # the situation: Compile a separate program for each library.
-	    for i in $deplibs; do
-	      name="`expr $i : '-l\(.*\)'`"
-	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" != "0"; then
-		$rm conftest
-		$LTCC -o conftest conftest.c $i
-		# Did it work?
-		if test "$?" -eq 0 ; then
-		  ldd_output=`ldd conftest`
-		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		    case " $predeps $postdeps " in
-		    *" $i "*)
-		      newdeplibs="$newdeplibs $i"
-		      i=""
-		      ;;
-		    esac
-		  fi
-		  if test -n "$i" ; then
-		    libname=`eval \\$echo \"$libname_spec\"`
-		    deplib_matches=`eval \\$echo \"$library_names_spec\"`
-		    set dummy $deplib_matches
-		    deplib_match=$2
-		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		      newdeplibs="$newdeplibs $i"
-		    else
-		      droppeddeps=yes
-		      $echo
-		      $echo "*** Warning: dynamic linker does not accept needed library $i."
-		      $echo "*** I have the capability to make that library automatically link in when"
-		      $echo "*** you link to this library.  But I can only do this if you have a"
-		      $echo "*** shared version of the library, which you do not appear to have"
-		      $echo "*** because a test_compile did reveal that the linker did not use this one"
-		      $echo "*** as a dynamic dependency that programs can get resolved with at runtime."
-		    fi
-		  fi
-		else
-		  droppeddeps=yes
-		  $echo
-		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
-		  $echo "***  make it link in!  You will probably need to install it or some"
-		  $echo "*** library that it depends on before this library will be fully"
-		  $echo "*** functional.  Installing it before continuing would be even better."
-		fi
-	      else
-		newdeplibs="$newdeplibs $i"
-	      fi
-	    done
-	  fi
-	  ;;
-	file_magic*)
-	  set dummy $deplibs_check_method
-	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    name="`expr $a_deplib : '-l\(.*\)'`"
-	    # If $name is empty we are operating on a -L argument.
-            if test "$name" != "" && test  "$name" != "0"; then
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval \\$echo \"$libname_spec\"`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		      # Follow soft links.
-		      if ls -lLd "$potent_lib" 2>/dev/null \
-			 | grep " -> " >/dev/null; then
-			continue
-		      fi
-		      # The statement above tries to avoid entering an
-		      # endless loop below, in case of cyclic links.
-		      # We might still enter an endless loop, since a link
-		      # loop can be closed while we follow links,
-		      # but so what?
-		      potlib="$potent_lib"
-		      while test -h "$potlib" 2>/dev/null; do
-			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
-			case $potliblink in
-			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
-			esac
-		      done
-		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
-			 | ${SED} 10q \
-			 | $EGREP "$file_magic_regex" > /dev/null; then
-			newdeplibs="$newdeplibs $a_deplib"
-			a_deplib=""
-			break 2
-		      fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		$echo
-		$echo "*** Warning: linker path does not have real file for library $a_deplib."
-		$echo "*** I have the capability to make that library automatically link in when"
-		$echo "*** you link to this library.  But I can only do this if you have a"
-		$echo "*** shared version of the library, which you do not appear to have"
-		$echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $echo "*** with $libname but no candidates were found. (...for file magic test)"
-		else
-		  $echo "*** with $libname and none of the candidates passed a file format test"
-		  $echo "*** using a file magic. Last file checked: $potlib"
-		fi
-	      fi
-	    else
-	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	    fi
-	  done # Gone through all deplibs.
-	  ;;
-	match_pattern*)
-	  set dummy $deplibs_check_method
-	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    name="`expr $a_deplib : '-l\(.*\)'`"
-	    # If $name is empty we are operating on a -L argument.
-	    if test -n "$name" && test "$name" != "0"; then
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval \\$echo \"$libname_spec\"`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		    potlib="$potent_lib" # see symlink-check above in file_magic test
-		    if eval $echo \"$potent_lib\" 2>/dev/null \
-		        | ${SED} 10q \
-		        | $EGREP "$match_pattern_regex" > /dev/null; then
-		      newdeplibs="$newdeplibs $a_deplib"
-		      a_deplib=""
-		      break 2
-		    fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		$echo
-		$echo "*** Warning: linker path does not have real file for library $a_deplib."
-		$echo "*** I have the capability to make that library automatically link in when"
-		$echo "*** you link to this library.  But I can only do this if you have a"
-		$echo "*** shared version of the library, which you do not appear to have"
-		$echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $echo "*** with $libname but no candidates were found. (...for regex pattern test)"
-		else
-		  $echo "*** with $libname and none of the candidates passed a file format test"
-		  $echo "*** using a regex pattern. Last file checked: $potlib"
-		fi
-	      fi
-	    else
-	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	    fi
-	  done # Gone through all deplibs.
-	  ;;
-	none | unknown | *)
-	  newdeplibs=""
-	  tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
-	    -e 's/ -[LR][^ ]*//g'`
-	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	    for i in $predeps $postdeps ; do
-	      # can't use Xsed below, because $i might contain '/'
-	      tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"`
-	    done
-	  fi
-	  if $echo "X $tmp_deplibs" | $Xsed -e 's/[ 	]//g' \
-	    | grep . >/dev/null; then
-	    $echo
-	    if test "X$deplibs_check_method" = "Xnone"; then
-	      $echo "*** Warning: inter-library dependencies are not supported in this platform."
-	    else
-	      $echo "*** Warning: inter-library dependencies are not known to be supported."
-	    fi
-	    $echo "*** All declared inter-library dependencies are being dropped."
-	    droppeddeps=yes
-	  fi
-	  ;;
-	esac
-	versuffix=$versuffix_save
-	major=$major_save
-	release=$release_save
-	libname=$libname_save
-	name=$name_save
-
-	case $host in
-	*-*-rhapsody* | *-*-darwin1.[012])
-	  # On Rhapsody replace the C library is the System framework
-	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	  ;;
-	esac
-
-	if test "$droppeddeps" = yes; then
-	  if test "$module" = yes; then
-	    $echo
-	    $echo "*** Warning: libtool could not satisfy all declared inter-library"
-	    $echo "*** dependencies of module $libname.  Therefore, libtool will create"
-	    $echo "*** a static module, that should work as long as the dlopening"
-	    $echo "*** application is linked with the -dlopen flag."
-	    if test -z "$global_symbol_pipe"; then
-	      $echo
-	      $echo "*** However, this would only work if libtool was able to extract symbol"
-	      $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-	      $echo "*** not find such a program.  So, this module is probably useless."
-	      $echo "*** \`nm' from GNU binutils and a full rebuild may help."
-	    fi
-	    if test "$build_old_libs" = no; then
-	      oldlibs="$output_objdir/$libname.$libext"
-	      build_libtool_libs=module
-	      build_old_libs=yes
-	    else
-	      build_libtool_libs=no
-	    fi
-	  else
-	    $echo "*** The inter-library dependencies that have been dropped here will be"
-	    $echo "*** automatically added whenever a program is linked with this library"
-	    $echo "*** or is declared to -dlopen it."
-
-	    if test "$allow_undefined" = no; then
-	      $echo
-	      $echo "*** Since this library must not contain undefined symbols,"
-	      $echo "*** because either the platform does not support them or"
-	      $echo "*** it was explicitly requested with -no-undefined,"
-	      $echo "*** libtool will only create a static version of it."
-	      if test "$build_old_libs" = no; then
-		oldlibs="$output_objdir/$libname.$libext"
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  fi
-	fi
-	# Done checking deplibs!
-	deplibs=$newdeplibs
-      fi
-
-      # All the library-specific variables (install_libdir is set above).
-      library_names=
-      old_library=
-      dlname=
-
-      # Test again, we may have decided not to build it any more
-      if test "$build_libtool_libs" = yes; then
-	if test "$hardcode_into_libs" = yes; then
-	  # Hardcode the library paths
-	  hardcode_libdirs=
-	  dep_rpath=
-	  rpath="$finalize_rpath"
-	  test "$mode" != relink && rpath="$compile_rpath$rpath"
-	  for libdir in $rpath; do
-	    if test -n "$hardcode_libdir_flag_spec"; then
-	      if test -n "$hardcode_libdir_separator"; then
-		if test -z "$hardcode_libdirs"; then
-		  hardcode_libdirs="$libdir"
-		else
-		  # Just accumulate the unique libdirs.
-		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		    ;;
-		  *)
-		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		    ;;
-		  esac
-		fi
-	      else
-		eval flag=\"$hardcode_libdir_flag_spec\"
-		dep_rpath="$dep_rpath $flag"
-	      fi
-	    elif test -n "$runpath_var"; then
-	      case "$perm_rpath " in
-	      *" $libdir "*) ;;
-	      *) perm_rpath="$perm_rpath $libdir" ;;
-	      esac
-	    fi
-	  done
-	  # Substitute the hardcoded libdirs into the rpath.
-	  if test -n "$hardcode_libdir_separator" &&
-	     test -n "$hardcode_libdirs"; then
-	    libdir="$hardcode_libdirs"
-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
-	  fi
-	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
-	    # We should set the runpath_var.
-	    rpath=
-	    for dir in $perm_rpath; do
-	      rpath="$rpath$dir:"
-	    done
-	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
-	  fi
-	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
-	fi
-
-	shlibpath="$finalize_shlibpath"
-	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
-	if test -n "$shlibpath"; then
-	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
-	fi
-
-	# Get the real and link names of the library.
-	eval shared_ext=\"$shrext_cmds\"
-	eval library_names=\"$library_names_spec\"
-	set dummy $library_names
-	realname="$2"
-	shift; shift
-
-	if test -n "$soname_spec"; then
-	  eval soname=\"$soname_spec\"
-	else
-	  soname="$realname"
-	fi
-	if test -z "$dlname"; then
-	  dlname=$soname
-	fi
-
-	lib="$output_objdir/$realname"
-	for link
-	do
-	  linknames="$linknames $link"
-	done
-
-	# Use standard objects if they are pic
-	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-
-	# Prepare the list of exported symbols
-	if test -z "$export_symbols"; then
-	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-	    $show "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $run $rm $export_symbols
-	    cmds=$export_symbols_cmds
-	    save_ifs="$IFS"; IFS='~'
-	    for cmd in $cmds; do
-	      IFS="$save_ifs"
-	      eval cmd=\"$cmd\"
-	      if len=`expr "X$cmd" : ".*"` &&
-	       test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	        $show "$cmd"
-	        $run eval "$cmd" || exit $?
-	        skipped_export=false
-	      else
-	        # The command line is too long to execute in one step.
-	        $show "using reloadable object file for export list..."
-	        skipped_export=:
-	      fi
-	    done
-	    IFS="$save_ifs"
-	    if test -n "$export_symbols_regex"; then
-	      $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
-	      $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
-	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
-	    fi
-	  fi
-	fi
-
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
-	fi
-
-	tmp_deplibs=
-	for test_deplib in $deplibs; do
-		case " $convenience " in
-		*" $test_deplib "*) ;;
-		*)
-			tmp_deplibs="$tmp_deplibs $test_deplib"
-			;;
-		esac
-	done
-	deplibs="$tmp_deplibs"
-
-	if test -n "$convenience"; then
-	  if test -n "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	  else
-	    gentop="$output_objdir/${outputname}x"
-	    $show "${rm}r $gentop"
-	    $run ${rm}r "$gentop"
-	    $show "$mkdir $gentop"
-	    $run $mkdir "$gentop"
-	    status=$?
-	    if test "$status" -ne 0 && test ! -d "$gentop"; then
-	      exit $status
-	    fi
-	    generated="$generated $gentop"
-
-	    for xlib in $convenience; do
-	      # Extract the objects.
-	      case $xlib in
-	      [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-	      *) xabs=`pwd`"/$xlib" ;;
-	      esac
-	      xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-	      xdir="$gentop/$xlib"
-
-	      $show "${rm}r $xdir"
-	      $run ${rm}r "$xdir"
-	      $show "$mkdir $xdir"
-	      $run $mkdir "$xdir"
-	      status=$?
-	      if test "$status" -ne 0 && test ! -d "$xdir"; then
-		exit $status
-	      fi
-	      # We will extract separately just the conflicting names and we will no
-	      # longer touch any unique names. It is faster to leave these extract
-	      # automatically by $AR in one run.
-	      $show "(cd $xdir && $AR x $xabs)"
-	      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-	      if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
-		:
-	      else
-		$echo "$modename: warning: object name conflicts; renaming object files" 1>&2
-		$echo "$modename: warning: to ensure that they will not overwrite" 1>&2
-		$AR t "$xabs" | sort | uniq -cd | while read -r count name
-		do
-		  i=1
-		  while test "$i" -le "$count"
-		  do
-		   # Put our $i before any first dot (extension)
-		   # Never overwrite any file
-		   name_to="$name"
-		   while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
-		   do
-		     name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
-		   done
-		   $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
-		   $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
-		   i=`expr $i + 1`
-		  done
-		done
-	      fi
-
-	      libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-	    done
-	  fi
-	fi
-
-	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
-	  eval flag=\"$thread_safe_flag_spec\"
-	  linker_flags="$linker_flags $flag"
-	fi
-
-	# Make a backup of the uninstalled library when relinking
-	if test "$mode" = relink; then
-	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
-	fi
-
-	# Do each of the archive commands.
-	if test "$module" = yes && test -n "$module_cmds" ; then
-	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	    eval test_cmds=\"$module_expsym_cmds\"
-	    cmds=$module_expsym_cmds
-	  else
-	    eval test_cmds=\"$module_cmds\"
-	    cmds=$module_cmds
-	  fi
-	else
-	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	  eval test_cmds=\"$archive_expsym_cmds\"
-	  cmds=$archive_expsym_cmds
-	else
-	  eval test_cmds=\"$archive_cmds\"
-	  cmds=$archive_cmds
-	  fi
-	fi
-
-	if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` &&
-	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  :
-	else
-	  # The command line is too long to link in one step, link piecewise.
-	  $echo "creating reloadable object files..."
-
-	  # Save the value of $output and $libobjs because we want to
-	  # use them later.  If we have whole_archive_flag_spec, we
-	  # want to use save_libobjs as it was before
-	  # whole_archive_flag_spec was expanded, because we can't
-	  # assume the linker understands whole_archive_flag_spec.
-	  # This may have to be revisited, in case too many
-	  # convenience libraries get linked in and end up exceeding
-	  # the spec.
-	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	  fi
-	  save_output=$output
-
-	  # Clear the reloadable object creation command queue and
-	  # initialize k to one.
-	  test_cmds=
-	  concat_cmds=
-	  objlist=
-	  delfiles=
-	  last_robj=
-	  k=1
-	  output=$output_objdir/$save_output-${k}.$objext
-	  # Loop over the list of objects to be linked.
-	  for obj in $save_libobjs
-	  do
-	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
-	    if test "X$objlist" = X ||
-	       { len=`expr "X$test_cmds" : ".*"` &&
-		 test "$len" -le "$max_cmd_len"; }; then
-	      objlist="$objlist $obj"
-	    else
-	      # The command $test_cmds is almost too long, add a
-	      # command to the queue.
-	      if test "$k" -eq 1 ; then
-		# The first file doesn't have a previous command to add.
-		eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
-	      else
-		# All subsequent reloadable object files will link in
-		# the last one created.
-		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
-	      fi
-	      last_robj=$output_objdir/$save_output-${k}.$objext
-	      k=`expr $k + 1`
-	      output=$output_objdir/$save_output-${k}.$objext
-	      objlist=$obj
-	      len=1
-	    fi
-	  done
-	  # Handle the remaining objects by creating one last
-	  # reloadable object file.  All subsequent reloadable object
-	  # files will link in the last one created.
-	  test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	  eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
-
-	  if ${skipped_export-false}; then
-	    $show "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $run $rm $export_symbols
-	    libobjs=$output
-	    # Append the command to create the export file.
-	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
-          fi
-
-	  # Set up a command to remove the reloadale object files
-	  # after they are used.
-	  i=0
-	  while test "$i" -lt "$k"
-	  do
-	    i=`expr $i + 1`
-	    delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
-	  done
-
-	  $echo "creating a temporary reloadable object file: $output"
-
-	  # Loop through the commands generated above and execute them.
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $concat_cmds; do
-	    IFS="$save_ifs"
-	    $show "$cmd"
-	    $run eval "$cmd" || exit $?
-	  done
-	  IFS="$save_ifs"
-
-	  libobjs=$output
-	  # Restore the value of output.
-	  output=$save_output
-
-	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	  fi
-	  # Expand the library linking commands again to reset the
-	  # value of $libobjs for piecewise linking.
-
-	  # Do each of the archive commands.
-	  if test "$module" = yes && test -n "$module_cmds" ; then
-	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	      cmds=$module_expsym_cmds
-	    else
-	      cmds=$module_cmds
-	    fi
-	  else
-	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	    cmds=$archive_expsym_cmds
-	  else
-	    cmds=$archive_cmds
-	    fi
-	  fi
-
-	  # Append the command to remove the reloadable object files
-	  # to the just-reset $cmds.
-	  eval cmds=\"\$cmds~\$rm $delfiles\"
-	fi
-	save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  eval cmd=\"$cmd\"
-	  $show "$cmd"
-	  $run eval "$cmd" || exit $?
-	done
-	IFS="$save_ifs"
-
-	# Restore the uninstalled library and exit
-	if test "$mode" = relink; then
-	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
-	  exit $EXIT_SUCCESS
-	fi
-
-	# Create links to the real library.
-	for linkname in $linknames; do
-	  if test "$realname" != "$linkname"; then
-	    $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
-	    $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
-	  fi
-	done
-
-	# If -module or -export-dynamic was specified, set the dlname.
-	if test "$module" = yes || test "$export_dynamic" = yes; then
-	  # On all known operating systems, these are identical.
-	  dlname="$soname"
-	fi
-      fi
-      ;;
-
-    obj)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
-      fi
-
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$rpath"; then
-	$echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$xrpath"; then
-	$echo "$modename: warning: \`-R' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for objects" 1>&2
-      fi
-
-      case $output in
-      *.lo)
-	if test -n "$objs$old_deplibs"; then
-	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-	libobj="$output"
-	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
-	;;
-      *)
-	libobj=
-	obj="$output"
-	;;
-      esac
-
-      # Delete the old objects.
-      $run $rm $obj $libobj
-
-      # Objects from convenience libraries.  This assumes
-      # single-version convenience libraries.  Whenever we create
-      # different ones for PIC/non-PIC, this we'll have to duplicate
-      # the extraction.
-      reload_conv_objs=
-      gentop=
-      # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec
-      wl=
-
-      if test -n "$convenience"; then
-	if test -n "$whole_archive_flag_spec"; then
-	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
-	else
-	  gentop="$output_objdir/${obj}x"
-	  $show "${rm}r $gentop"
-	  $run ${rm}r "$gentop"
-	  $show "$mkdir $gentop"
-	  $run $mkdir "$gentop"
-	  status=$?
-	  if test "$status" -ne 0 && test ! -d "$gentop"; then
-	    exit $status
-	  fi
-	  generated="$generated $gentop"
-
-	  for xlib in $convenience; do
-	    # Extract the objects.
-	    case $xlib in
-	    [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-	    *) xabs=`pwd`"/$xlib" ;;
-	    esac
-	    xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-	    xdir="$gentop/$xlib"
-
-	    $show "${rm}r $xdir"
-	    $run ${rm}r "$xdir"
-	    $show "$mkdir $xdir"
-	    $run $mkdir "$xdir"
-	    status=$?
-	    if test "$status" -ne 0 && test ! -d "$xdir"; then
-	      exit $status
-	    fi
-	    # We will extract separately just the conflicting names and we will no
-	    # longer touch any unique names. It is faster to leave these extract
-	    # automatically by $AR in one run.
-	    $show "(cd $xdir && $AR x $xabs)"
-	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-	    if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
-	      :
-	    else
-	      $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
-	      $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
-	      $AR t "$xabs" | sort | uniq -cd | while read -r count name
-	      do
-		i=1
-		while test "$i" -le "$count"
-		do
-		 # Put our $i before any first dot (extension)
-		 # Never overwrite any file
-		 name_to="$name"
-		 while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
-		 do
-		   name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
-		 done
-		 $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
-		 $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
-		 i=`expr $i + 1`
-		done
-	      done
-	    fi
-
-	    reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-	  done
-	fi
-      fi
-
-      # Create the old-style object.
-      reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
-
-      output="$obj"
-      cmds=$reload_cmds
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	eval cmd=\"$cmd\"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-
-      # Exit if we aren't doing a library object file.
-      if test -z "$libobj"; then
-	if test -n "$gentop"; then
-	  $show "${rm}r $gentop"
-	  $run ${rm}r $gentop
-	fi
-
-	exit $EXIT_SUCCESS
-      fi
-
-      if test "$build_libtool_libs" != yes; then
-	if test -n "$gentop"; then
-	  $show "${rm}r $gentop"
-	  $run ${rm}r $gentop
-	fi
-
-	# Create an invalid libtool object if no PIC, so that we don't
-	# accidentally link it into a program.
-	# $show "echo timestamp > $libobj"
-	# $run eval "echo timestamp > $libobj" || exit $?
-	exit $EXIT_SUCCESS
-      fi
-
-      if test -n "$pic_flag" || test "$pic_mode" != default; then
-	# Only do commands if we really have different PIC objects.
-	reload_objs="$libobjs $reload_conv_objs"
-	output="$libobj"
-	cmds=$reload_cmds
-	save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  eval cmd=\"$cmd\"
-	  $show "$cmd"
-	  $run eval "$cmd" || exit $?
-	done
-	IFS="$save_ifs"
-      fi
-
-      if test -n "$gentop"; then
-	$show "${rm}r $gentop"
-	$run ${rm}r $gentop
-      fi
-
-      exit $EXIT_SUCCESS
-      ;;
-
-    prog)
-      case $host in
-	*cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
-      esac
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for programs" 1>&2
-      fi
-
-      if test "$preload" = yes; then
-	if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
-	   test "$dlopen_self_static" = unknown; then
-	  $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
-	fi
-      fi
-
-      case $host in
-      *-*-rhapsody* | *-*-darwin1.[012])
-	# On Rhapsody replace the C library is the System framework
-	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	;;
-      esac
-
-      case $host in
-      *darwin*)
-        # Don't allow lazy linking, it breaks C++ global constructors
-        if test "$tagname" = CXX ; then
-        compile_command="$compile_command ${wl}-bind_at_load"
-        finalize_command="$finalize_command ${wl}-bind_at_load"
-        fi
-        ;;
-      esac
-
-      compile_command="$compile_command $compile_deplibs"
-      finalize_command="$finalize_command $finalize_deplibs"
-
-      if test -n "$rpath$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	for libdir in $rpath $xrpath; do
-	  # This is the magic to use -rpath.
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-	  esac
-	done
-      fi
-
-      # Now hardcode the library paths
-      rpath=
-      hardcode_libdirs=
-      for libdir in $compile_rpath $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) perm_rpath="$perm_rpath $libdir" ;;
-	  esac
-	fi
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  case :$dllsearchpath: in
-	  *":$libdir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$libdir";;
-	  esac
-	  ;;
-	esac
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      compile_rpath="$rpath"
-
-      rpath=
-      hardcode_libdirs=
-      for libdir in $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$finalize_perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
-	  esac
-	fi
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      finalize_rpath="$rpath"
-
-      if test -n "$libobjs" && test "$build_old_libs" = yes; then
-	# Transform all the library objects into standard objects.
-	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-      fi
-
-      dlsyms=
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	if test -n "$NM" && test -n "$global_symbol_pipe"; then
-	  dlsyms="${outputname}S.c"
-	else
-	  $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
-	fi
-      fi
-
-      if test -n "$dlsyms"; then
-	case $dlsyms in
-	"") ;;
-	*.c)
-	  # Discover the nlist of each of the dlfiles.
-	  nlist="$output_objdir/${outputname}.nm"
-
-	  $show "$rm $nlist ${nlist}S ${nlist}T"
-	  $run $rm "$nlist" "${nlist}S" "${nlist}T"
-
-	  # Parse the name list into a source file.
-	  $show "creating $output_objdir/$dlsyms"
-
-	  test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
-/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
-/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
-
-#ifdef __cplusplus
-extern \"C\" {
-#endif
-
-/* Prevent the only kind of declaration conflicts we can make. */
-#define lt_preloaded_symbols some_other_symbol
-
-/* External symbol declarations for the compiler. */\
-"
-
-	  if test "$dlself" = yes; then
-	    $show "generating symbol list for \`$output'"
-
-	    test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
-
-	    # Add our own program objects to the symbol list.
-	    progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	    for arg in $progfiles; do
-	      $show "extracting global C symbols from \`$arg'"
-	      $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-	    done
-
-	    if test -n "$exclude_expsyms"; then
-	      $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-	      $run eval '$mv "$nlist"T "$nlist"'
-	    fi
-
-	    if test -n "$export_symbols_regex"; then
-	      $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-	      $run eval '$mv "$nlist"T "$nlist"'
-	    fi
-
-	    # Prepare the list of exported symbols
-	    if test -z "$export_symbols"; then
-	      export_symbols="$output_objdir/$output.exp"
-	      $run $rm $export_symbols
-	      $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-	    else
-	      $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
-	      $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
-	      $run eval 'mv "$nlist"T "$nlist"'
-	    fi
-	  fi
-
-	  for arg in $dlprefiles; do
-	    $show "extracting global C symbols from \`$arg'"
-	    name=`$echo "$arg" | ${SED} -e 's%^.*/%%'`
-	    $run eval '$echo ": $name " >> "$nlist"'
-	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-	  done
-
-	  if test -z "$run"; then
-	    # Make sure we have at least an empty file.
-	    test -f "$nlist" || : > "$nlist"
-
-	    if test -n "$exclude_expsyms"; then
-	      $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
-	      $mv "$nlist"T "$nlist"
-	    fi
-
-	    # Try sorting and uniquifying the output.
-	    if grep -v "^: " < "$nlist" |
-		if sort -k 3 </dev/null >/dev/null 2>&1; then
-		  sort -k 3
-		else
-		  sort +2
-		fi |
-		uniq > "$nlist"S; then
-	      :
-	    else
-	      grep -v "^: " < "$nlist" > "$nlist"S
-	    fi
-
-	    if test -f "$nlist"S; then
-	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
-	    else
-	      $echo '/* NONE */' >> "$output_objdir/$dlsyms"
-	    fi
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-
-#undef lt_preloaded_symbols
-
-#if defined (__STDC__) && __STDC__
-# define lt_ptr void *
-#else
-# define lt_ptr char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-const struct {
-  const char *name;
-  lt_ptr address;
-}
-lt_preloaded_symbols[] =
-{\
-"
-
-	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-  {0, (lt_ptr) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif\
-"
-	  fi
-
-	  pic_flag_for_symtable=
-	  case $host in
-	  # compiling the symbol table file with pic_flag works around
-	  # a FreeBSD bug that causes programs to crash when -lm is
-	  # linked before any other PIC object.  But we must not use
-	  # pic_flag when linking with -static.  The problem exists in
-	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
-	    case "$compile_command " in
-	    *" -static "*) ;;
-	    *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;
-	    esac;;
-	  *-*-hpux*)
-	    case "$compile_command " in
-	    *" -static "*) ;;
-	    *) pic_flag_for_symtable=" $pic_flag";;
-	    esac
-	  esac
-
-	  # Now compile the dynamic symbol file.
-	  $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
-	  $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
-
-	  # Clean up the generated files.
-	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
-	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
-
-	  # Transform the symbol file into the correct name.
-	  compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-	  finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-	  ;;
-	*)
-	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-      else
-	# We keep going just in case the user didn't refer to
-	# lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
-	# really was required.
-
-	# Nullify the symbol file.
-	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
-      fi
-
-      if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-	# Replace the output file specification.
-	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-	link_command="$compile_command$compile_rpath"
-
-	# We have no uninstalled library dependencies, so finalize right now.
-	$show "$link_command"
-	$run eval "$link_command"
-	status=$?
-
-	# Delete the generated files.
-	if test -n "$dlsyms"; then
-	  $show "$rm $output_objdir/${outputname}S.${objext}"
-	  $run $rm "$output_objdir/${outputname}S.${objext}"
-	fi
-
-	exit $status
-      fi
-
-      if test -n "$shlibpath_var"; then
-	# We should set the shlibpath_var
-	rpath=
-	for dir in $temp_rpath; do
-	  case $dir in
-	  [\\/]* | [A-Za-z]:[\\/]*)
-	    # Absolute path.
-	    rpath="$rpath$dir:"
-	    ;;
-	  *)
-	    # Relative path: add a thisdir entry.
-	    rpath="$rpath\$thisdir/$dir:"
-	    ;;
-	  esac
-	done
-	temp_rpath="$rpath"
-      fi
-
-      if test -n "$compile_shlibpath$finalize_shlibpath"; then
-	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
-      fi
-      if test -n "$finalize_shlibpath"; then
-	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
-      fi
-
-      compile_var=
-      finalize_var=
-      if test -n "$runpath_var"; then
-	if test -n "$perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $perm_rpath; do
-	    rpath="$rpath$dir:"
-	  done
-	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-	if test -n "$finalize_perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $finalize_perm_rpath; do
-	    rpath="$rpath$dir:"
-	  done
-	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-      fi
-
-      if test "$no_install" = yes; then
-	# We don't need to create a wrapper script.
-	link_command="$compile_var$compile_command$compile_rpath"
-	# Replace the output file specification.
-	link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-	# Delete the old output file.
-	$run $rm $output
-	# Link the executable and exit
-	$show "$link_command"
-	$run eval "$link_command" || exit $?
-	exit $EXIT_SUCCESS
-      fi
-
-      if test "$hardcode_action" = relink; then
-	# Fast installation is not supported
-	link_command="$compile_var$compile_command$compile_rpath"
-	relink_command="$finalize_var$finalize_command$finalize_rpath"
-
-	$echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
-	$echo "$modename: \`$output' will be relinked during installation" 1>&2
-      else
-	if test "$fast_install" != no; then
-	  link_command="$finalize_var$compile_command$finalize_rpath"
-	  if test "$fast_install" = yes; then
-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
-	  else
-	    # fast_install is set to needless
-	    relink_command=
-	  fi
-	else
-	  link_command="$compile_var$compile_command$compile_rpath"
-	  relink_command="$finalize_var$finalize_command$finalize_rpath"
-	fi
-      fi
-
-      # Replace the output file specification.
-      link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-
-      # Delete the old output files.
-      $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
-
-      $show "$link_command"
-      $run eval "$link_command" || exit $?
-
-      # Now create the wrapper script.
-      $show "creating $output"
-
-      # Quote the relink command for shipping.
-      if test -n "$relink_command"; then
-	# Preserve any variables that may affect compiler behavior
-	for var in $variables_saved_for_relink; do
-	  if eval test -z \"\${$var+set}\"; then
-	    relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-	  elif eval var_value=\$$var; test -z "$var_value"; then
-	    relink_command="$var=; export $var; $relink_command"
-	  else
-	    var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
-	  fi
-	done
-	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-      fi
-
-      # Quote $echo for shipping.
-      if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
-	case $progpath in
-	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
-	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
-	esac
-	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
-      else
-	qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
-      fi
-
-      # Only actually do things if our run command is non-null.
-      if test -z "$run"; then
-	# win32 will think the script is a binary if it has
-	# a .exe suffix, so we strip it off here.
-	case $output in
-	  *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;;
-	esac
-	# test for cygwin because mv fails w/o .exe extensions
-	case $host in
-	  *cygwin*)
-	    exeext=.exe
-	    outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
-	  *) exeext= ;;
-	esac
-	case $host in
-	  *cygwin* | *mingw* )
-	    cwrappersource=`$echo ${objdir}/lt-${output}.c`
-	    cwrapper=`$echo ${output}.exe`
-	    $rm $cwrappersource $cwrapper
-	    trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
-
-	    cat > $cwrappersource <<EOF
-
-/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-   Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-
-   The $output program cannot be directly executed until all the libtool
-   libraries that it depends on are installed.
-
-   This wrapper executable should never be moved out of the build directory.
-   If it is, it will not operate correctly.
-
-   Currently, it simply execs the wrapper *script* "/bin/sh $output",
-   but could eventually absorb all of the scripts functionality and
-   exec $objdir/$outputname directly.
-*/
-EOF
-	    cat >> $cwrappersource<<"EOF"
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <malloc.h>
-#include <stdarg.h>
-#include <assert.h>
-
-#if defined(PATH_MAX)
-# define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
-# define LT_PATHMAX MAXPATHLEN
-#else
-# define LT_PATHMAX 1024
-#endif
-
-#ifndef DIR_SEPARATOR
-#define DIR_SEPARATOR '/'
-#endif
-
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-  defined (__OS2__)
-#define HAVE_DOS_BASED_FILE_SYSTEM
-#ifndef DIR_SEPARATOR_2
-#define DIR_SEPARATOR_2 '\\'
-#endif
-#endif
-
-#ifndef DIR_SEPARATOR_2
-# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-#else /* DIR_SEPARATOR_2 */
-# define IS_DIR_SEPARATOR(ch) \
-        (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-#endif /* DIR_SEPARATOR_2 */
-
-#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
-#define XFREE(stale) do { \
-  if (stale) { free ((void *) stale); stale = 0; } \
-} while (0)
-
-const char *program_name = NULL;
-
-void * xmalloc (size_t num);
-char * xstrdup (const char *string);
-char * basename (const char *name);
-char * fnqualify(const char *path);
-char * strendzap(char *str, const char *pat);
-void lt_fatal (const char *message, ...);
-
-int
-main (int argc, char *argv[])
-{
-  char **newargz;
-  int i;
-
-  program_name = (char *) xstrdup ((char *) basename (argv[0]));
-  newargz = XMALLOC(char *, argc+2);
-EOF
-
-	    cat >> $cwrappersource <<EOF
-  newargz[0] = "$SHELL";
-EOF
-
-	    cat >> $cwrappersource <<"EOF"
-  newargz[1] = fnqualify(argv[0]);
-  /* we know the script has the same name, without the .exe */
-  /* so make sure newargz[1] doesn't end in .exe */
-  strendzap(newargz[1],".exe");
-  for (i = 1; i < argc; i++)
-    newargz[i+1] = xstrdup(argv[i]);
-  newargz[argc+1] = NULL;
-EOF
-
-	    cat >> $cwrappersource <<EOF
-  execv("$SHELL",newargz);
-EOF
-
-	    cat >> $cwrappersource <<"EOF"
-}
-
-void *
-xmalloc (size_t num)
-{
-  void * p = (void *) malloc (num);
-  if (!p)
-    lt_fatal ("Memory exhausted");
-
-  return p;
-}
-
-char *
-xstrdup (const char *string)
-{
-  return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
-;
-}
-
-char *
-basename (const char *name)
-{
-  const char *base;
-
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  /* Skip over the disk name in MSDOS pathnames. */
-  if (isalpha (name[0]) && name[1] == ':')
-    name += 2;
-#endif
-
-  for (base = name; *name; name++)
-    if (IS_DIR_SEPARATOR (*name))
-      base = name + 1;
-  return (char *) base;
-}
-
-char *
-fnqualify(const char *path)
-{
-  size_t size;
-  char *p;
-  char tmp[LT_PATHMAX + 1];
-
-  assert(path != NULL);
-
-  /* Is it qualified already? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  if (isalpha (path[0]) && path[1] == ':')
-    return xstrdup (path);
-#endif
-  if (IS_DIR_SEPARATOR (path[0]))
-    return xstrdup (path);
-
-  /* prepend the current directory */
-  /* doesn't handle '~' */
-  if (getcwd (tmp, LT_PATHMAX) == NULL)
-    lt_fatal ("getcwd failed");
-  size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */
-  p = XMALLOC(char, size);
-  sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path);
-  return p;
-}
-
-char *
-strendzap(char *str, const char *pat)
-{
-  size_t len, patlen;
-
-  assert(str != NULL);
-  assert(pat != NULL);
-
-  len = strlen(str);
-  patlen = strlen(pat);
-
-  if (patlen <= len)
-  {
-    str += len - patlen;
-    if (strcmp(str, pat) == 0)
-      *str = '\0';
-  }
-  return str;
-}
-
-static void
-lt_error_core (int exit_status, const char * mode,
-          const char * message, va_list ap)
-{
-  fprintf (stderr, "%s: %s: ", program_name, mode);
-  vfprintf (stderr, message, ap);
-  fprintf (stderr, ".\n");
-
-  if (exit_status >= 0)
-    exit (exit_status);
-}
-
-void
-lt_fatal (const char *message, ...)
-{
-  va_list ap;
-  va_start (ap, message);
-  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
-  va_end (ap);
-}
-EOF
-	  # we should really use a build-platform specific compiler
-	  # here, but OTOH, the wrappers (shell script and this C one)
-	  # are only useful if you want to execute the "real" binary.
-	  # Since the "real" binary is built for $host, then this
-	  # wrapper might as well be built for $host, too.
-	  $run $LTCC -s -o $cwrapper $cwrappersource
-	  ;;
-	esac
-	$rm $output
-	trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
-
-	$echo > $output "\
-#! $SHELL
-
-# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# The $output program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='${SED} -e 1s/^X//'
-sed_quote_subst='$sed_quote_subst'
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
-
-relink_command=\"$relink_command\"
-
-# This environment variable determines our operation mode.
-if test \"\$libtool_install_magic\" = \"$magic\"; then
-  # install mode needs the following variable:
-  notinst_deplibs='$notinst_deplibs'
-else
-  # When we are sourced in execute mode, \$file and \$echo are already set.
-  if test \"\$libtool_execute_magic\" != \"$magic\"; then
-    echo=\"$qecho\"
-    file=\"\$0\"
-    # Make sure echo works.
-    if test \"X\$1\" = X--no-reexec; then
-      # Discard the --no-reexec flag, and continue.
-      shift
-    elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
-      # Yippee, \$echo works!
-      :
-    else
-      # Restart under the correct shell, and then maybe \$echo will work.
-      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
-    fi
-  fi\
-"
-	$echo >> $output "\
-
-  # Find the directory that this script lives in.
-  thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
-  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
-
-  # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
-  while test -n \"\$file\"; do
-    destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
-
-    # If there was a directory component, then change thisdir.
-    if test \"x\$destdir\" != \"x\$file\"; then
-      case \"\$destdir\" in
-      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
-      *) thisdir=\"\$thisdir/\$destdir\" ;;
-      esac
-    fi
-
-    file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
-  done
-
-  # Try to get the absolute directory name.
-  absdir=\`cd \"\$thisdir\" && pwd\`
-  test -n \"\$absdir\" && thisdir=\"\$absdir\"
-"
-
-	if test "$fast_install" = yes; then
-	  $echo >> $output "\
-  program=lt-'$outputname'$exeext
-  progdir=\"\$thisdir/$objdir\"
-
-  if test ! -f \"\$progdir/\$program\" || \\
-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
-       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
-
-    file=\"\$\$-\$program\"
-
-    if test ! -d \"\$progdir\"; then
-      $mkdir \"\$progdir\"
-    else
-      $rm \"\$progdir/\$file\"
-    fi"
-
-	  $echo >> $output "\
-
-    # relink executable if necessary
-    if test -n \"\$relink_command\"; then
-      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
-      else
-	$echo \"\$relink_command_output\" >&2
-	$rm \"\$progdir/\$file\"
-	exit $EXIT_FAILURE
-      fi
-    fi
-
-    $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-    { $rm \"\$progdir/\$program\";
-      $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-    $rm \"\$progdir/\$file\"
-  fi"
-	else
-	  $echo >> $output "\
-  program='$outputname'
-  progdir=\"\$thisdir/$objdir\"
-"
-	fi
-
-	$echo >> $output "\
-
-  if test -f \"\$progdir/\$program\"; then"
-
-	# Export our shlibpath_var if we have one.
-	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-	  $echo >> $output "\
-    # Add our own library path to $shlibpath_var
-    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
-
-    # Some systems cannot cope with colon-terminated $shlibpath_var
-    # The second colon is a workaround for a bug in BeOS R4 sed
-    $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
-
-    export $shlibpath_var
-"
-	fi
-
-	# fixup the dll searchpath if we need to.
-	if test -n "$dllsearchpath"; then
-	  $echo >> $output "\
-    # Add the dll search path components to the executable PATH
-    PATH=$dllsearchpath:\$PATH
-"
-	fi
-
-	$echo >> $output "\
-    if test \"\$libtool_execute_magic\" != \"$magic\"; then
-      # Run the actual program with our arguments.
-"
-	case $host in
-	# Backslashes separate directories on plain windows
-	*-*-mingw | *-*-os2*)
-	  $echo >> $output "\
-      exec \$progdir\\\\\$program \${1+\"\$@\"}
-"
-	  ;;
-
-	*)
-	  $echo >> $output "\
-      exec \$progdir/\$program \${1+\"\$@\"}
-"
-	  ;;
-	esac
-	$echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
-      exit $EXIT_FAILURE
-    fi
-  else
-    # The program doesn't exist.
-    \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
-    \$echo \"This script is just a wrapper for \$program.\" 1>&2
-    $echo \"See the $PACKAGE documentation for more information.\" 1>&2
-    exit $EXIT_FAILURE
-  fi
-fi\
-"
-	chmod +x $output
-      fi
-      exit $EXIT_SUCCESS
-      ;;
-    esac
-
-    # See if we need to build an old-fashioned archive.
-    for oldlib in $oldlibs; do
-
-      if test "$build_libtool_libs" = convenience; then
-	oldobjs="$libobjs_save"
-	addlibs="$convenience"
-	build_libtool_libs=no
-      else
-	if test "$build_libtool_libs" = module; then
-	  oldobjs="$libobjs_save"
-	  build_libtool_libs=no
-	else
-	  oldobjs="$old_deplibs $non_pic_objects"
-	fi
-	addlibs="$old_convenience"
-      fi
-
-      if test -n "$addlibs"; then
-	gentop="$output_objdir/${outputname}x"
-	$show "${rm}r $gentop"
-	$run ${rm}r "$gentop"
-	$show "$mkdir $gentop"
-	$run $mkdir "$gentop"
-	status=$?
-	if test "$status" -ne 0 && test ! -d "$gentop"; then
-	  exit $status
-	fi
-	generated="$generated $gentop"
-
-	# Add in members from convenience archives.
-	for xlib in $addlibs; do
-	  # Extract the objects.
-	  case $xlib in
-	  [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-	  *) xabs=`pwd`"/$xlib" ;;
-	  esac
-	  xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-	  xdir="$gentop/$xlib"
-
-	  $show "${rm}r $xdir"
-	  $run ${rm}r "$xdir"
-	  $show "$mkdir $xdir"
-	  $run $mkdir "$xdir"
-	  status=$?
-	  if test "$status" -ne 0 && test ! -d "$xdir"; then
-	    exit $status
-	  fi
-	  # We will extract separately just the conflicting names and we will no
-	  # longer touch any unique names. It is faster to leave these extract
-	  # automatically by $AR in one run.
-	  $show "(cd $xdir && $AR x $xabs)"
-	  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-	  if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
-	    :
-	  else
-	    $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
-	    $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
-	    $AR t "$xabs" | sort | uniq -cd | while read -r count name
-	    do
-	      i=1
-	      while test "$i" -le "$count"
-	      do
-	       # Put our $i before any first dot (extension)
-	       # Never overwrite any file
-	       name_to="$name"
-	       while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
-	       do
-		 name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
-	       done
-	       $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
-	       $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
-	       i=`expr $i + 1`
-	      done
-	    done
-	  fi
-
-	  oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
-	done
-      fi
-
-      # Do each command in the archive commands.
-      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-       cmds=$old_archive_from_new_cmds
-      else
-	eval cmds=\"$old_archive_cmds\"
-
-	if len=`expr "X$cmds" : ".*"` &&
-	     test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  cmds=$old_archive_cmds
-	else
-	  # the command line is too long to link in one step, link in parts
-	  $echo "using piecewise archive linking..."
-	  save_RANLIB=$RANLIB
-	  RANLIB=:
-	  objlist=
-	  concat_cmds=
-	  save_oldobjs=$oldobjs
-	  # GNU ar 2.10+ was changed to match POSIX; thus no paths are
-	  # encoded into archives.  This makes 'ar r' malfunction in
-	  # this piecewise linking case whenever conflicting object
-	  # names appear in distinct ar calls; check, warn and compensate.
-	    if (for obj in $save_oldobjs
-	    do
-	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
-	    done | sort | sort -uc >/dev/null 2>&1); then
-	    :
-	  else
-	    $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
-	    $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
-	    AR_FLAGS=cq
-	  fi
-	  # Is there a better way of finding the last object in the list?
-	  for obj in $save_oldobjs
-	  do
-	    last_oldobj=$obj
-	  done
-	  for obj in $save_oldobjs
-	  do
-	    oldobjs="$objlist $obj"
-	    objlist="$objlist $obj"
-	    eval test_cmds=\"$old_archive_cmds\"
-	    if len=`expr "X$test_cmds" : ".*"` &&
-	       test "$len" -le "$max_cmd_len"; then
-	      :
-	    else
-	      # the above command should be used before it gets too long
-	      oldobjs=$objlist
-	      if test "$obj" = "$last_oldobj" ; then
-	        RANLIB=$save_RANLIB
-	      fi
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
-	      objlist=
-	    fi
-	  done
-	  RANLIB=$save_RANLIB
-	  oldobjs=$objlist
-	  if test "X$oldobjs" = "X" ; then
-	    eval cmds=\"\$concat_cmds\"
-	  else
-	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
-	  fi
-	fi
-      fi
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-        eval cmd=\"$cmd\"
-	IFS="$save_ifs"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-    done
-
-    if test -n "$generated"; then
-      $show "${rm}r$generated"
-      $run ${rm}r$generated
-    fi
-
-    # Now create the libtool archive.
-    case $output in
-    *.la)
-      old_library=
-      test "$build_old_libs" = yes && old_library="$libname.$libext"
-      $show "creating $output"
-
-      # Preserve any variables that may affect compiler behavior
-      for var in $variables_saved_for_relink; do
-	if eval test -z \"\${$var+set}\"; then
-	  relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-	elif eval var_value=\$$var; test -z "$var_value"; then
-	  relink_command="$var=; export $var; $relink_command"
-	else
-	  var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-	  relink_command="$var=\"$var_value\"; export $var; $relink_command"
-	fi
-      done
-      # Quote the link command for shipping.
-      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-      if test "$hardcode_automatic" = yes ; then
-	relink_command=
-      fi
-
-
-      # Only create the output if not a dry run.
-      if test -z "$run"; then
-	for installed in no yes; do
-	  if test "$installed" = yes; then
-	    if test -z "$install_libdir"; then
-	      break
-	    fi
-	    output="$output_objdir/$outputname"i
-	    # Replace all uninstalled libtool libraries with the installed ones
-	    newdependency_libs=
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      *.la)
-		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		if test -z "$libdir"; then
-		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-		  exit $EXIT_FAILURE
-		fi
-		newdependency_libs="$newdependency_libs $libdir/$name"
-		;;
-	      *) newdependency_libs="$newdependency_libs $deplib" ;;
-	      esac
-	    done
-	    dependency_libs="$newdependency_libs"
-	    newdlfiles=
-	    for lib in $dlfiles; do
-	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-	      if test -z "$libdir"; then
-		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-		exit $EXIT_FAILURE
-	      fi
-	      newdlfiles="$newdlfiles $libdir/$name"
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-	      if test -z "$libdir"; then
-		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-		exit $EXIT_FAILURE
-	      fi
-	      newdlprefiles="$newdlprefiles $libdir/$name"
-	    done
-	    dlprefiles="$newdlprefiles"
-	  else
-	    newdlfiles=
-	    for lib in $dlfiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      newdlfiles="$newdlfiles $abs"
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      newdlprefiles="$newdlprefiles $abs"
-	    done
-	    dlprefiles="$newdlprefiles"
-	  fi
-	  $rm $output
-	  # place dlname in correct position for cygwin
-	  tdlname=$dlname
-	  case $host,$output,$installed,$module,$dlname in
-	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
-	  esac
-	  $echo > $output "\
-# $outputname - a libtool library file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='$tdlname'
-
-# Names of this library.
-library_names='$library_names'
-
-# The name of the static archive.
-old_library='$old_library'
-
-# Libraries that this one depends upon.
-dependency_libs='$dependency_libs'
-
-# Version information for $libname.
-current=$current
-age=$age
-revision=$revision
-
-# Is this an already installed library?
-installed=$installed
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=$module
-
-# Files to dlopen/dlpreopen
-dlopen='$dlfiles'
-dlpreopen='$dlprefiles'
-
-# Directory that this library needs to be installed in:
-libdir='$install_libdir'"
-	  if test "$installed" = no && test "$need_relink" = yes; then
-	    $echo >> $output "\
-relink_command=\"$relink_command\""
-	  fi
-	done
-      fi
-
-      # Do a symbolic link so that the libtool archive can be found in
-      # LD_LIBRARY_PATH before the program is installed.
-      $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
-      $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
-      ;;
-    esac
-    exit $EXIT_SUCCESS
-    ;;
-
-  # libtool install mode
-  install)
-    modename="$modename: install"
-
-    # There may be an optional sh(1) argument at the beginning of
-    # install_prog (especially on Windows NT).
-    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-       # Allow the use of GNU shtool's install command.
-       $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
-      # Aesthetically quote it.
-      arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-	arg="\"$arg\""
-	;;
-      esac
-      install_prog="$arg "
-      arg="$1"
-      shift
-    else
-      install_prog=
-      arg="$nonopt"
-    fi
-
-    # The real first argument should be the name of the installation program.
-    # Aesthetically quote it.
-    arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-    case $arg in
-    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-      arg="\"$arg\""
-      ;;
-    esac
-    install_prog="$install_prog$arg"
-
-    # We need to accept at least all the BSD install flags.
-    dest=
-    files=
-    opts=
-    prev=
-    install_type=
-    isdir=no
-    stripme=
-    for arg
-    do
-      if test -n "$dest"; then
-	files="$files $dest"
-	dest="$arg"
-	continue
-      fi
-
-      case $arg in
-      -d) isdir=yes ;;
-      -f) prev="-f" ;;
-      -g) prev="-g" ;;
-      -m) prev="-m" ;;
-      -o) prev="-o" ;;
-      -s)
-	stripme=" -s"
-	continue
-	;;
-      -*) ;;
-
-      *)
-	# If the previous option needed an argument, then skip it.
-	if test -n "$prev"; then
-	  prev=
-	else
-	  dest="$arg"
-	  continue
-	fi
-	;;
-      esac
-
-      # Aesthetically quote the argument.
-      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-	arg="\"$arg\""
-	;;
-      esac
-      install_prog="$install_prog $arg"
-    done
-
-    if test -z "$install_prog"; then
-      $echo "$modename: you must specify an install program" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prev' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    if test -z "$files"; then
-      if test -z "$dest"; then
-	$echo "$modename: no file or destination specified" 1>&2
-      else
-	$echo "$modename: you must specify a destination" 1>&2
-      fi
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    # Strip any trailing slash from the destination.
-    dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
-
-    # Check to see that the destination is a directory.
-    test -d "$dest" && isdir=yes
-    if test "$isdir" = yes; then
-      destdir="$dest"
-      destname=
-    else
-      destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
-      test "X$destdir" = "X$dest" && destdir=.
-      destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
-
-      # Not a directory, so check to see that there is only one file specified.
-      set dummy $files
-      if test "$#" -gt 2; then
-	$echo "$modename: \`$dest' is not a directory" 1>&2
-	$echo "$help" 1>&2
-	exit $EXIT_FAILURE
-      fi
-    fi
-    case $destdir in
-    [\\/]* | [A-Za-z]:[\\/]*) ;;
-    *)
-      for file in $files; do
-	case $file in
-	*.lo) ;;
-	*)
-	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-      done
-      ;;
-    esac
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    staticlibs=
-    future_libdirs=
-    current_libdirs=
-    for file in $files; do
-
-      # Do each installation.
-      case $file in
-      *.$libext)
-	# Do the static libraries later.
-	staticlibs="$staticlibs $file"
-	;;
-
-      *.la)
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	library_names=
-	old_library=
-	relink_command=
-	# If there is no directory component, then add one.
-	case $file in
-	*/* | *\\*) . $file ;;
-	*) . ./$file ;;
-	esac
-
-	# Add the libdir to current_libdirs if it is the destination.
-	if test "X$destdir" = "X$libdir"; then
-	  case "$current_libdirs " in
-	  *" $libdir "*) ;;
-	  *) current_libdirs="$current_libdirs $libdir" ;;
-	  esac
-	else
-	  # Note the libdir as a future libdir.
-	  case "$future_libdirs " in
-	  *" $libdir "*) ;;
-	  *) future_libdirs="$future_libdirs $libdir" ;;
-	  esac
-	fi
-
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
-	test "X$dir" = "X$file/" && dir=
-	dir="$dir$objdir"
-
-	if test -n "$relink_command"; then
-	  # Determine the prefix the user has applied to our future dir.
-	  inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"`
-
-	  # Don't allow the user to place us outside of our expected
-	  # location b/c this prevents finding dependent libraries that
-	  # are installed to the same prefix.
-	  # At present, this check doesn't affect windows .dll's that
-	  # are installed into $libdir/../bin (currently, that works fine)
-	  # but it's something to keep an eye on.
-	  if test "$inst_prefix_dir" = "$destdir"; then
-	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-
-	  if test -n "$inst_prefix_dir"; then
-	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-	  else
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
-	  fi
-
-	  $echo "$modename: warning: relinking \`$file'" 1>&2
-	  $show "$relink_command"
-	  if $run eval "$relink_command"; then :
-	  else
-	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	fi
-
-	# See the names of the shared library.
-	set dummy $library_names
-	if test -n "$2"; then
-	  realname="$2"
-	  shift
-	  shift
-
-	  srcname="$realname"
-	  test -n "$relink_command" && srcname="$realname"T
-
-	  # Install the shared library and build the symlinks.
-	  $show "$install_prog $dir/$srcname $destdir/$realname"
-	  $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
-	  if test -n "$stripme" && test -n "$striplib"; then
-	    $show "$striplib $destdir/$realname"
-	    $run eval "$striplib $destdir/$realname" || exit $?
-	  fi
-
-	  if test "$#" -gt 0; then
-	    # Delete the old symlinks, and create new ones.
-	    for linkname
-	    do
-	      if test "$linkname" != "$realname"; then
-		$show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
-		$run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
-	      fi
-	    done
-	  fi
-
-	  # Do each command in the postinstall commands.
-	  lib="$destdir/$realname"
-	  cmds=$postinstall_cmds
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $cmds; do
-	    IFS="$save_ifs"
-	    eval cmd=\"$cmd\"
-	    $show "$cmd"
-	    $run eval "$cmd" || exit $?
-	  done
-	  IFS="$save_ifs"
-	fi
-
-	# Install the pseudo-library for information purposes.
-	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	instname="$dir/$name"i
-	$show "$install_prog $instname $destdir/$name"
-	$run eval "$install_prog $instname $destdir/$name" || exit $?
-
-	# Maybe install the static library, too.
-	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-	;;
-
-      *.lo)
-	# Install (i.e. copy) a libtool object.
-
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	  destfile="$destdir/$destfile"
-	fi
-
-	# Deduce the name of the destination old-style object file.
-	case $destfile in
-	*.lo)
-	  staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
-	  ;;
-	*.$objext)
-	  staticdest="$destfile"
-	  destfile=
-	  ;;
-	*)
-	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	# Install the libtool object if requested.
-	if test -n "$destfile"; then
-	  $show "$install_prog $file $destfile"
-	  $run eval "$install_prog $file $destfile" || exit $?
-	fi
-
-	# Install the old object if enabled.
-	if test "$build_old_libs" = yes; then
-	  # Deduce the name of the old-style object file.
-	  staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
-
-	  $show "$install_prog $staticobj $staticdest"
-	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
-	fi
-	exit $EXIT_SUCCESS
-	;;
-
-      *)
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	  destfile="$destdir/$destfile"
-	fi
-
-	# If the file is missing, and there is a .exe on the end, strip it
-	# because it is most likely a libtool script we actually want to
-	# install
-	stripped_ext=""
-	case $file in
-	  *.exe)
-	    if test ! -f "$file"; then
-	      file=`$echo $file|${SED} 's,.exe$,,'`
-	      stripped_ext=".exe"
-	    fi
-	    ;;
-	esac
-
-	# Do a test to see if this is really a libtool program.
-	case $host in
-	*cygwin*|*mingw*)
-	    wrapper=`$echo $file | ${SED} -e 's,.exe$,,'`
-	    ;;
-	*)
-	    wrapper=$file
-	    ;;
-	esac
-	if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
-	  notinst_deplibs=
-	  relink_command=
-
-	  # To insure that "foo" is sourced, and not "foo.exe",
-	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
-	  # which disallows the automatic-append-.exe behavior.
-	  case $build in
-	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
-	  *) wrapperdot=${wrapper} ;;
-	  esac
-	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . ${wrapperdot} ;;
-	  *) . ./${wrapperdot} ;;
-	  esac
-
-	  # Check the variables that should have been set.
-	  if test -z "$notinst_deplibs"; then
-	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-
-	  finalize=yes
-	  for lib in $notinst_deplibs; do
-	    # Check to see that each library is installed.
-	    libdir=
-	    if test -f "$lib"; then
-	      # If there is no directory component, then add one.
-	      case $lib in
-	      */* | *\\*) . $lib ;;
-	      *) . ./$lib ;;
-	      esac
-	    fi
-	    libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
-	    if test -n "$libdir" && test ! -f "$libfile"; then
-	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
-	      finalize=no
-	    fi
-	  done
-
-	  relink_command=
-	  # To insure that "foo" is sourced, and not "foo.exe",
-	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
-	  # which disallows the automatic-append-.exe behavior.
-	  case $build in
-	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
-	  *) wrapperdot=${wrapper} ;;
-	  esac
-	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . ${wrapperdot} ;;
-	  *) . ./${wrapperdot} ;;
-	  esac
-
-	  outputname=
-	  if test "$fast_install" = no && test -n "$relink_command"; then
-	    if test "$finalize" = yes && test -z "$run"; then
-	      tmpdir="/tmp"
-	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
-	      tmpdir="$tmpdir/libtool-$$"
-	      save_umask=`umask`
-	      umask 0077
-	      if $mkdir "$tmpdir"; then
-	        umask $save_umask
-	      else
-	        umask $save_umask
-		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
-		continue
-	      fi
-	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
-	      outputname="$tmpdir/$file"
-	      # Replace the output file specification.
-	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
-
-	      $show "$relink_command"
-	      if $run eval "$relink_command"; then :
-	      else
-		$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-		${rm}r "$tmpdir"
-		continue
-	      fi
-	      file="$outputname"
-	    else
-	      $echo "$modename: warning: cannot relink \`$file'" 1>&2
-	    fi
-	  else
-	    # Install the binary that we compiled earlier.
-	    file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
-	  fi
-	fi
-
-	# remove .exe since cygwin /usr/bin/install will append another
-	# one anyways
-	case $install_prog,$host in
-	*/usr/bin/install*,*cygwin*)
-	  case $file:$destfile in
-	  *.exe:*.exe)
-	    # this is ok
-	    ;;
-	  *.exe:*)
-	    destfile=$destfile.exe
-	    ;;
-	  *:*.exe)
-	    destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
-	    ;;
-	  esac
-	  ;;
-	esac
-	$show "$install_prog$stripme $file $destfile"
-	$run eval "$install_prog\$stripme \$file \$destfile" || exit $?
-	test -n "$outputname" && ${rm}r "$tmpdir"
-	;;
-      esac
-    done
-
-    for file in $staticlibs; do
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-
-      # Set up the ranlib parameters.
-      oldlib="$destdir/$name"
-
-      $show "$install_prog $file $oldlib"
-      $run eval "$install_prog \$file \$oldlib" || exit $?
-
-      if test -n "$stripme" && test -n "$old_striplib"; then
-	$show "$old_striplib $oldlib"
-	$run eval "$old_striplib $oldlib" || exit $?
-      fi
-
-      # Do each command in the postinstall commands.
-      cmds=$old_postinstall_cmds
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	eval cmd=\"$cmd\"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-    done
-
-    if test -n "$future_libdirs"; then
-      $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
-    fi
-
-    if test -n "$current_libdirs"; then
-      # Maybe just do a dry run.
-      test -n "$run" && current_libdirs=" -n$current_libdirs"
-      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
-    else
-      exit $EXIT_SUCCESS
-    fi
-    ;;
-
-  # libtool finish mode
-  finish)
-    modename="$modename: finish"
-    libdirs="$nonopt"
-    admincmds=
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for dir
-      do
-	libdirs="$libdirs $dir"
-      done
-
-      for libdir in $libdirs; do
-	if test -n "$finish_cmds"; then
-	  # Do each command in the finish commands.
-	  cmds=$finish_cmds
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $cmds; do
-	    IFS="$save_ifs"
-	    eval cmd=\"$cmd\"
-	    $show "$cmd"
-	    $run eval "$cmd" || admincmds="$admincmds
-       $cmd"
-	  done
-	  IFS="$save_ifs"
-	fi
-	if test -n "$finish_eval"; then
-	  # Do the single finish_eval.
-	  eval cmds=\"$finish_eval\"
-	  $run eval "$cmds" || admincmds="$admincmds
-       $cmds"
-	fi
-      done
-    fi
-
-    # Exit here if they wanted silent mode.
-    test "$show" = : && exit $EXIT_SUCCESS
-
-    $echo "----------------------------------------------------------------------"
-    $echo "Libraries have been installed in:"
-    for libdir in $libdirs; do
-      $echo "   $libdir"
-    done
-    $echo
-    $echo "If you ever happen to want to link against installed libraries"
-    $echo "in a given directory, LIBDIR, you must either use libtool, and"
-    $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-    $echo "flag during linking and do at least one of the following:"
-    if test -n "$shlibpath_var"; then
-      $echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-      $echo "     during execution"
-    fi
-    if test -n "$runpath_var"; then
-      $echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-      $echo "     during linking"
-    fi
-    if test -n "$hardcode_libdir_flag_spec"; then
-      libdir=LIBDIR
-      eval flag=\"$hardcode_libdir_flag_spec\"
-
-      $echo "   - use the \`$flag' linker flag"
-    fi
-    if test -n "$admincmds"; then
-      $echo "   - have your system administrator run these commands:$admincmds"
-    fi
-    if test -f /etc/ld.so.conf; then
-      $echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-    fi
-    $echo
-    $echo "See any operating system documentation about shared libraries for"
-    $echo "more information, such as the ld(1) and ld.so(8) manual pages."
-    $echo "----------------------------------------------------------------------"
-    exit $EXIT_SUCCESS
-    ;;
-
-  # libtool execute mode
-  execute)
-    modename="$modename: execute"
-
-    # The first argument is the command name.
-    cmd="$nonopt"
-    if test -z "$cmd"; then
-      $echo "$modename: you must specify a COMMAND" 1>&2
-      $echo "$help"
-      exit $EXIT_FAILURE
-    fi
-
-    # Handle -dlopen flags immediately.
-    for file in $execute_dlfiles; do
-      if test ! -f "$file"; then
-	$echo "$modename: \`$file' is not a file" 1>&2
-	$echo "$help" 1>&2
-	exit $EXIT_FAILURE
-      fi
-
-      dir=
-      case $file in
-      *.la)
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# Read the libtool library.
-	dlname=
-	library_names=
-
-	# If there is no directory component, then add one.
-	case $file in
-	*/* | *\\*) . $file ;;
-	*) . ./$file ;;
-	esac
-
-	# Skip this library if it cannot be dlopened.
-	if test -z "$dlname"; then
-	  # Warn if it was a shared library.
-	  test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
-	  continue
-	fi
-
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$dir" = "X$file" && dir=.
-
-	if test -f "$dir/$objdir/$dlname"; then
-	  dir="$dir/$objdir"
-	else
-	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-	;;
-
-      *.lo)
-	# Just add the directory containing the .lo file.
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$dir" = "X$file" && dir=.
-	;;
-
-      *)
-	$echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
-	continue
-	;;
-      esac
-
-      # Get the absolute pathname.
-      absdir=`cd "$dir" && pwd`
-      test -n "$absdir" && dir="$absdir"
-
-      # Now add the directory to shlibpath_var.
-      if eval "test -z \"\$$shlibpath_var\""; then
-	eval "$shlibpath_var=\"\$dir\""
-      else
-	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-      fi
-    done
-
-    # This variable tells wrapper scripts just to set shlibpath_var
-    # rather than running their programs.
-    libtool_execute_magic="$magic"
-
-    # Check if any of the arguments is a wrapper script.
-    args=
-    for file
-    do
-      case $file in
-      -*) ;;
-      *)
-	# Do a test to see if this is really a libtool program.
-	if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . $file ;;
-	  *) . ./$file ;;
-	  esac
-
-	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
-	fi
-	;;
-      esac
-      # Quote arguments (to preserve shell metacharacters).
-      file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
-      args="$args \"$file\""
-    done
-
-    if test -z "$run"; then
-      if test -n "$shlibpath_var"; then
-	# Export the shlibpath_var.
-	eval "export $shlibpath_var"
-      fi
-
-      # Restore saved environment variables
-      if test "${save_LC_ALL+set}" = set; then
-	LC_ALL="$save_LC_ALL"; export LC_ALL
-      fi
-      if test "${save_LANG+set}" = set; then
-	LANG="$save_LANG"; export LANG
-      fi
-
-      # Now prepare to actually exec the command.
-      exec_cmd="\$cmd$args"
-    else
-      # Display what would be done.
-      if test -n "$shlibpath_var"; then
-	eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
-	$echo "export $shlibpath_var"
-      fi
-      $echo "$cmd$args"
-      exit $EXIT_SUCCESS
-    fi
-    ;;
-
-  # libtool clean and uninstall mode
-  clean | uninstall)
-    modename="$modename: $mode"
-    rm="$nonopt"
-    files=
-    rmforce=
-    exit_status=0
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    for arg
-    do
-      case $arg in
-      -f) rm="$rm $arg"; rmforce=yes ;;
-      -*) rm="$rm $arg" ;;
-      *) files="$files $arg" ;;
-      esac
-    done
-
-    if test -z "$rm"; then
-      $echo "$modename: you must specify an RM program" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    rmdirs=
-
-    origobjdir="$objdir"
-    for file in $files; do
-      dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-      if test "X$dir" = "X$file"; then
-	dir=.
-	objdir="$origobjdir"
-      else
-	objdir="$dir/$origobjdir"
-      fi
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-      test "$mode" = uninstall && objdir="$dir"
-
-      # Remember objdir for removal later, being careful to avoid duplicates
-      if test "$mode" = clean; then
-	case " $rmdirs " in
-	  *" $objdir "*) ;;
-	  *) rmdirs="$rmdirs $objdir" ;;
-	esac
-      fi
-
-      # Don't error if the file doesn't exist and rm -f was used.
-      if (test -L "$file") >/dev/null 2>&1 \
-	|| (test -h "$file") >/dev/null 2>&1 \
-	|| test -f "$file"; then
-	:
-      elif test -d "$file"; then
-	exit_status=1
-	continue
-      elif test "$rmforce" = yes; then
-	continue
-      fi
-
-      rmfiles="$file"
-
-      case $name in
-      *.la)
-	# Possibly a libtool archive, so verify it.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  . $dir/$name
-
-	  # Delete the libtool libraries and symlinks.
-	  for n in $library_names; do
-	    rmfiles="$rmfiles $objdir/$n"
-	  done
-	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
-	  test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
-
-	  if test "$mode" = uninstall; then
-	    if test -n "$library_names"; then
-	      # Do each command in the postuninstall commands.
-	      cmds=$postuninstall_cmds
-	      save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd"
-		if test "$?" -ne 0 && test "$rmforce" != yes; then
-		  exit_status=1
-		fi
-	      done
-	      IFS="$save_ifs"
-	    fi
-
-	    if test -n "$old_library"; then
-	      # Do each command in the old_postuninstall commands.
-	      cmds=$old_postuninstall_cmds
-	      save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd"
-		if test "$?" -ne 0 && test "$rmforce" != yes; then
-		  exit_status=1
-		fi
-	      done
-	      IFS="$save_ifs"
-	    fi
-	    # FIXME: should reinstall the best remaining shared library.
-	  fi
-	fi
-	;;
-
-      *.lo)
-	# Possibly a libtool object, so verify it.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-
-	  # Read the .lo file
-	  . $dir/$name
-
-	  # Add PIC object to the list of files to remove.
-	  if test -n "$pic_object" \
-	     && test "$pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$pic_object"
-	  fi
-
-	  # Add non-PIC object to the list of files to remove.
-	  if test -n "$non_pic_object" \
-	     && test "$non_pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$non_pic_object"
-	  fi
-	fi
-	;;
-
-      *)
-	if test "$mode" = clean ; then
-	  noexename=$name
-	  case $file in
-	  *.exe)
-	    file=`$echo $file|${SED} 's,.exe$,,'`
-	    noexename=`$echo $name|${SED} 's,.exe$,,'`
-	    # $file with .exe has already been added to rmfiles,
-	    # add $file without .exe
-	    rmfiles="$rmfiles $file"
-	    ;;
-	  esac
-	  # Do a test to see if this is a libtool program.
-	  if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	    relink_command=
-	    . $dir/$noexename
-
-	    # note $name still contains .exe if it was in $file originally
-	    # as does the version of $file that was added into $rmfiles
-	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
-	    if test "$fast_install" = yes && test -n "$relink_command"; then
-	      rmfiles="$rmfiles $objdir/lt-$name"
-	    fi
-	    if test "X$noexename" != "X$name" ; then
-	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
-	    fi
-	  fi
-	fi
-	;;
-      esac
-      $show "$rm $rmfiles"
-      $run $rm $rmfiles || exit_status=1
-    done
-    objdir="$origobjdir"
-
-    # Try to remove the ${objdir}s in the directories where we deleted files
-    for dir in $rmdirs; do
-      if test -d "$dir"; then
-	$show "rmdir $dir"
-	$run rmdir $dir >/dev/null 2>&1
-      fi
-    done
-
-    exit $exit_status
-    ;;
-
-  "")
-    $echo "$modename: you must specify a MODE" 1>&2
-    $echo "$generic_help" 1>&2
-    exit $EXIT_FAILURE
-    ;;
-  esac
-
-  if test -z "$exec_cmd"; then
-    $echo "$modename: invalid operation mode \`$mode'" 1>&2
-    $echo "$generic_help" 1>&2
-    exit $EXIT_FAILURE
-  fi
-fi # test -z "$show_help"
-
-if test -n "$exec_cmd"; then
-  eval exec $exec_cmd
-  exit $EXIT_FAILURE
-fi
-
-# We need to display help for each of the modes.
-case $mode in
-"") $echo \
-"Usage: $modename [OPTION]... [MODE-ARG]...
-
-Provide generalized library-building support services.
-
-    --config          show all configuration variables
-    --debug           enable verbose shell tracing
--n, --dry-run         display commands without modifying any files
-    --features        display basic configuration information and exit
-    --finish          same as \`--mode=finish'
-    --help            display this help message and exit
-    --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
-    --quiet           same as \`--silent'
-    --silent          don't print informational messages
-    --tag=TAG         use configuration variables from tag TAG
-    --version         print version information
-
-MODE must be one of the following:
-
-      clean           remove files from the build directory
-      compile         compile a source file into a libtool object
-      execute         automatically set library path, then run a program
-      finish          complete the installation of libtool libraries
-      install         install libraries or executables
-      link            create a library or an executable
-      uninstall       remove libraries from an installed directory
-
-MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
-a more detailed description of MODE.
-
-Report bugs to <bug-libtool@gnu.org>."
-  exit $EXIT_SUCCESS
-  ;;
-
-clean)
-  $echo \
-"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
-
-Remove files from the build directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, object or program, all the files associated
-with it are deleted. Otherwise, only FILE itself is deleted using RM."
-  ;;
-
-compile)
-  $echo \
-"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
-
-Compile a source file into a libtool library object.
-
-This mode accepts the following additional options:
-
-  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-  -prefer-pic       try to building PIC objects only
-  -prefer-non-pic   try to building non-PIC objects only
-  -static           always build a \`.o' file suitable for static linking
-
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
-from the given SOURCEFILE.
-
-The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
-  ;;
-
-execute)
-  $echo \
-"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
-
-Automatically set library path, then run a program.
-
-This mode accepts the following additional options:
-
-  -dlopen FILE      add the directory containing FILE to the library path
-
-This mode sets the library path environment variable according to \`-dlopen'
-flags.
-
-If any of the ARGS are libtool executable wrappers, then they are translated
-into their corresponding uninstalled binary, and any of their required library
-directories are added to the library path.
-
-Then, COMMAND is executed, with ARGS as arguments."
-  ;;
-
-finish)
-  $echo \
-"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
-
-Complete the installation of libtool libraries.
-
-Each LIBDIR is a directory that contains libtool libraries.
-
-The commands that this mode executes may require superuser privileges.  Use
-the \`--dry-run' option if you just want to see what would be executed."
-  ;;
-
-install)
-  $echo \
-"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
-
-Install executables or libraries.
-
-INSTALL-COMMAND is the installation command.  The first component should be
-either the \`install' or \`cp' program.
-
-The rest of the components are interpreted as arguments to that command (only
-BSD-compatible install options are recognized)."
-  ;;
-
-link)
-  $echo \
-"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
-
-Link object files or libraries together to form another library, or to
-create an executable program.
-
-LINK-COMMAND is a command using the C compiler that you would use to create
-a program from several object files.
-
-The following components of LINK-COMMAND are treated specially:
-
-  -all-static       do not do any dynamic linking at all
-  -avoid-version    do not add a version suffix if possible
-  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
-  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
-  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-  -export-symbols SYMFILE
-		    try to export only the symbols listed in SYMFILE
-  -export-symbols-regex REGEX
-		    try to export only the symbols matching REGEX
-  -LLIBDIR          search LIBDIR for required installed libraries
-  -lNAME            OUTPUT-FILE requires the installed library libNAME
-  -module           build a library that can dlopened
-  -no-fast-install  disable the fast-install mode
-  -no-install       link a not-installable executable
-  -no-undefined     declare that a library does not refer to external symbols
-  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-  -objectlist FILE  Use a list of object files found in FILE to specify objects
-  -precious-files-regex REGEX
-                    don't remove output files matching REGEX
-  -release RELEASE  specify package release information
-  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -static           do not do any dynamic linking of libtool libraries
-  -version-info CURRENT[:REVISION[:AGE]]
-		    specify library version info [each variable defaults to 0]
-
-All other options (arguments beginning with \`-') are ignored.
-
-Every other argument is treated as a filename.  Files ending in \`.la' are
-treated as uninstalled libtool libraries, other files are standard or library
-object files.
-
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
-required, except when creating a convenience library.
-
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
-
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
-is created, otherwise an executable program is created."
-  ;;
-
-uninstall)
-  $echo \
-"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
-
-Remove libraries from an installation directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, all the files associated with it are deleted.
-Otherwise, only FILE itself is deleted using RM."
-  ;;
-
-*)
-  $echo "$modename: invalid operation mode \`$mode'" 1>&2
-  $echo "$help" 1>&2
-  exit $EXIT_FAILURE
-  ;;
-esac
-
-$echo
-$echo "Try \`$modename --help' for more information about other modes."
-
-exit $EXIT_SUCCESS
-
-# The TAGs below are defined such that we never get into a situation
-# in which we disable both kinds of libraries.  Given conflicting
-# choices, we go for a static library, that is the most portable,
-# since we can't tell whether shared libraries were disabled because
-# the user asked for that or because the platform doesn't support
-# them.  This is particularly important on AIX, because we don't
-# support having both static and shared libraries enabled at the same
-# time on that platform, so we default to a shared-only configuration.
-# If a disable-shared tag is given, we'll fallback to a static-only
-# configuration.  But we'll never go from static-only to shared-only.
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-build_libtool_libs=no
-build_old_libs=yes
-# ### END LIBTOOL TAG CONFIG: disable-shared
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-static
-build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
-# ### END LIBTOOL TAG CONFIG: disable-static
-
-# Local Variables:
-# mode:shell-script
-# sh-indentation:2
-# End:
-# ### BEGIN LIBTOOL TAG CONFIG: CXX
-
-# Libtool was configured on host supertower.lan:
-
-# Shell to use when invoking shell scripts.
-SHELL="/bin/sh"
-
-# Whether or not to build shared libraries.
-build_libtool_libs=yes
-
-# Whether or not to build static libraries.
-build_old_libs=yes
-
-# Whether or not to add -lc for building shared libraries.
-build_libtool_need_lc=no
-
-# Whether or not to disallow shared libs when runtime libs are static
-allow_libtool_libs_with_static_runtimes=no
-
-# Whether or not to optimize for fast installation.
-fast_install=yes
-
-# The host system.
-host_alias=
-host=i686-pc-linux-gnu
-
-# An echo program that does not interpret backslashes.
-echo="echo"
-
-# The archiver.
-AR="ar"
-AR_FLAGS="cru"
-
-# A C compiler.
-LTCC="gcc"
-
-# A language-specific compiler.
-CC="g++"
-
-# Is the compiler the GNU C compiler?
-with_gcc=yes
-
-# An ERE matcher.
-EGREP="grep -E"
-
-# The linker used to build libraries.
-LD="/usr/bin/ld"
-
-# Whether we need hard or soft links.
-LN_S="ln -s"
-
-# A BSD-compatible nm program.
-NM="/usr/bin/nm -B"
-
-# A symbol stripping program
-STRIP="strip"
-
-# Used to examine libraries when file_magic_cmd begins "file"
-MAGIC_CMD=file
-
-# Used on cygwin: DLL creation program.
-DLLTOOL="dlltool"
-
-# Used on cygwin: object dumper.
-OBJDUMP="objdump"
-
-# Used on cygwin: assembler.
-AS="as"
-
-# The name of the directory that contains temporary libtool files.
-objdir=.libs
-
-# How to create reloadable object files.
-reload_flag=" -r"
-reload_cmds="\$LD\$reload_flag -o \$output\$reload_objs"
-
-# How to pass a linker flag through the compiler.
-wl="-Wl,"
-
-# Object file suffix (normally "o").
-objext="o"
-
-# Old archive suffix (normally "a").
-libext="a"
-
-# Shared library suffix (normally ".so").
-shrext_cmds='.so'
-
-# Executable file suffix (normally "").
-exeext=""
-
-# Additional compiler flags for building library objects.
-pic_flag=" -fPIC -DPIC"
-pic_mode=default
-
-# What is the maximum length of a command?
-max_cmd_len=32768
-
-# Does compiler simultaneously support -c and -o options?
-compiler_c_o="yes"
-
-# Must we lock files when doing compilation ?
-need_locks="no"
-
-# Do we need the lib prefix for modules?
-need_lib_prefix=no
-
-# Do we need a version for libraries?
-need_version=no
-
-# Whether dlopen is supported.
-dlopen_support=unknown
-
-# Whether dlopen of programs is supported.
-dlopen_self=unknown
-
-# Whether dlopen of statically linked programs is supported.
-dlopen_self_static=unknown
-
-# Compiler flag to prevent dynamic linking.
-link_static_flag="-static"
-
-# Compiler flag to turn off builtin functions.
-no_builtin_flag=" -fno-builtin"
-
-# Compiler flag to allow reflexive dlopens.
-export_dynamic_flag_spec="\${wl}--export-dynamic"
-
-# Compiler flag to generate shared objects directly from archives.
-whole_archive_flag_spec="\${wl}--whole-archive\$convenience \${wl}--no-whole-archive"
-
-# Compiler flag to generate thread-safe objects.
-thread_safe_flag_spec=""
-
-# Library versioning type.
-version_type=linux
-
-# Format of library name prefix.
-libname_spec="lib\$name"
-
-# List of archive names.  First name is the real one, the rest are links.
-# The last name is the one that the linker finds with -lNAME.
-library_names_spec="\${libname}\${release}\${shared_ext}\$versuffix \${libname}\${release}\${shared_ext}\$major \$libname\${shared_ext}"
-
-# The coded name of the library, if different from the real name.
-soname_spec="\${libname}\${release}\${shared_ext}\$major"
-
-# Commands used to build and install an old-style archive.
-RANLIB="ranlib"
-old_archive_cmds="\$AR \$AR_FLAGS \$oldlib\$oldobjs\$old_deplibs~\$RANLIB \$oldlib"
-old_postinstall_cmds="\$RANLIB \$oldlib~chmod 644 \$oldlib"
-old_postuninstall_cmds=""
-
-# Create an old-style archive from a shared archive.
-old_archive_from_new_cmds=""
-
-# Create a temporary old-style archive to link instead of a shared archive.
-old_archive_from_expsyms_cmds=""
-
-# Commands used to build and install a shared archive.
-archive_cmds="\$CC -shared -nostdlib \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags \${wl}-soname \$wl\$soname -o \$lib"
-archive_expsym_cmds="\$CC -shared -nostdlib \$predep_objects \$libobjs \$deplibs \$postdep_objects \$compiler_flags \${wl}-soname \$wl\$soname \${wl}-retain-symbols-file \$wl\$export_symbols -o \$lib"
-postinstall_cmds=""
-postuninstall_cmds=""
-
-# Commands used to build a loadable module (assumed same as above if empty)
-module_cmds=""
-module_expsym_cmds=""
-
-# Commands to strip libraries.
-old_striplib="strip --strip-debug"
-striplib="strip --strip-unneeded"
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predep_objects="/usr/lib/gcc/i686-pc-linux-gnu/4.2.1/../../../crti.o /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/crtbeginS.o"
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdep_objects="/usr/lib/gcc/i686-pc-linux-gnu/4.2.1/crtendS.o /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/../../../crtn.o"
-
-# Dependencies to place before the objects being linked to create a
-# shared library.
-predeps=""
-
-# Dependencies to place after the objects being linked to create a
-# shared library.
-postdeps="-lstdc++ -lm -lgcc_s -lc -lgcc_s"
-
-# The library search path used internally by the compiler when linking
-# a shared library.
-compiler_lib_search_path="-L/usr/lib/gcc/i686-pc-linux-gnu/4.2.1 -L/usr/lib/gcc/i686-pc-linux-gnu/4.2.1 -L/usr/lib/gcc/i686-pc-linux-gnu/4.2.1/../../.."
-
-# Method to check whether dependent libraries are shared objects.
-deplibs_check_method="pass_all"
-
-# Command to use when deplibs_check_method == file_magic.
-file_magic_cmd="\$MAGIC_CMD"
-
-# Flag that allows shared libraries with undefined symbols to be built.
-allow_undefined_flag=""
-
-# Flag that forces no undefined symbols.
-no_undefined_flag=""
-
-# Commands used to finish a libtool library installation in a directory.
-finish_cmds="PATH=\\\"\\\$PATH:/sbin\\\" ldconfig -n \$libdir"
-
-# Same as above, but a single script fragment to be evaled but not shown.
-finish_eval=""
-
-# Take the output of nm and produce a listing of raw symbols and C names.
-global_symbol_pipe="sed -n -e 's/^.*[ 	]\\([ABCDGIRSTW][ABCDGIRSTW]*\\)[ 	][ 	]*\\(\\)\\([_A-Za-z][_A-Za-z0-9]*\\)\$/\\1 \\2\\3 \\3/p'"
-
-# Transform the output of nm in a proper C declaration
-global_symbol_to_cdecl="sed -n -e 's/^. .* \\(.*\\)\$/extern int \\1;/p'"
-
-# Transform the output of nm in a C name address pair
-global_symbol_to_c_name_address="sed -n -e 's/^: \\([^ ]*\\) \$/  {\\\"\\1\\\", (lt_ptr) 0},/p' -e 's/^[BCDEGRST] \\([^ ]*\\) \\([^ ]*\\)\$/  {\"\\2\", (lt_ptr) \\&\\2},/p'"
-
-# This is the shared library runtime path variable.
-runpath_var=LD_RUN_PATH
-
-# This is the shared library path variable.
-shlibpath_var=LD_LIBRARY_PATH
-
-# Is shlibpath searched before the hard-coded library search path?
-shlibpath_overrides_runpath=no
-
-# How to hardcode a shared library path into an executable.
-hardcode_action=immediate
-
-# Whether we should hardcode library paths into libraries.
-hardcode_into_libs=yes
-
-# Flag to hardcode $libdir into a binary during linking.
-# This must work even if $libdir does not exist.
-hardcode_libdir_flag_spec="\${wl}--rpath \${wl}\$libdir"
-
-# If ld is used when linking, flag to hardcode $libdir into
-# a binary during linking. This must work even if $libdir does
-# not exist.
-hardcode_libdir_flag_spec_ld=""
-
-# Whether we need a single -rpath flag with a separated argument.
-hardcode_libdir_separator=""
-
-# Set to yes if using DIR/libNAME during linking hardcodes DIR into the
-# resulting binary.
-hardcode_direct=no
-
-# Set to yes if using the -LDIR flag during linking hardcodes DIR into the
-# resulting binary.
-hardcode_minus_L=no
-
-# Set to yes if using SHLIBPATH_VAR=DIR during linking hardcodes DIR into
-# the resulting binary.
-hardcode_shlibpath_var=
-
-# Set to yes if building a shared library automatically hardcodes DIR into the library
-# and all subsequent libraries and executables linked against it.
-hardcode_automatic=no
-
-# Variables whose values should be saved in libtool wrapper scripts and
-# restored at relink time.
-variables_saved_for_relink="PATH LD_LIBRARY_PATH LD_RUN_PATH GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
-
-# Whether libtool must link a program against all its dependency libraries.
-link_all_deplibs=no
-
-# Compile-time system search path for libraries
-sys_lib_search_path_spec=" /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/ /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/ /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/../../../../i686-pc-linux-gnu/lib/i686-pc-linux-gnu/4.2.1/ /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/../../../../i686-pc-linux-gnu/lib/ /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/../../../i686-pc-linux-gnu/4.2.1/ /usr/lib/gcc/i686-pc-linux-gnu/4.2.1/../../../ /lib/i686-pc-linux-gnu/4.2.1/ /lib/ /usr/lib/i686-pc-linux-gnu/4.2.1/ /usr/lib/"
-
-# Run-time system search path for libraries
-sys_lib_dlsearch_path_spec="/lib /usr/lib # # /etc/ld.so.conf #  /usr/X11R6/lib  # End of file /usr/lib/libfakeroot /opt/qt/lib /opt/e17/lib /opt/kde/lib /usr/local/lib "
-
-# Fix the shell variable $srcfile for the compiler.
-fix_srcfile_path=""
-
-# Set to yes if exported symbols are required.
-always_export_symbols=no
-
-# The commands to list exported symbols.
-export_symbols_cmds="\$NM \$libobjs \$convenience | \$global_symbol_pipe | \$SED 's/.* //' | sort | uniq > \$export_symbols"
-
-# The commands to extract the exported symbol list from a shared archive.
-extract_expsyms_cmds=""
-
-# Symbols that should not be listed in the preloaded symbols.
-exclude_expsyms=""
-
-# Symbols that must always be exported.
-include_expsyms=""
-
-# ### END LIBTOOL TAG CONFIG: CXX
-
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/ltmain.sh b/abs/mv-core/ghosd/ghosd-0.0.1/ltmain.sh
deleted file mode 100755
index 1a224ac..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/ltmain.sh
+++ /dev/null
@@ -1,6426 +0,0 @@
-# ltmain.sh - Provide generalized library-building support services.
-# NOTE: Changing this file will not affect anything until you rerun configure.
-#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004
-# Free Software Foundation, Inc.
-# Originally by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-basename="s,^.*/,,g"
-
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
-
-# The name of this program:
-progname=`echo "$progpath" | $SED $basename`
-modename="$progname"
-
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-
-PROGRAM=ltmain.sh
-PACKAGE=libtool
-VERSION=1.5.6
-TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42) Debian$Rev: 224 $"
-
-
-# Check that we have a working $echo.
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then
-  # Yippee, $echo works!
-  :
-else
-  # Restart under the correct shell, and then maybe $echo will work.
-  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit $EXIT_SUCCESS
-fi
-
-default_mode=
-help="Try \`$progname --help' for more information."
-magic="%%%MAGIC variable%%%"
-mkdir="mkdir"
-mv="mv -f"
-rm="rm -f"
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
-# test EBCDIC or ASCII
-case `echo A|tr A '\301'` in
- A) # EBCDIC based system
-  SP2NL="tr '\100' '\n'"
-  NL2SP="tr '\r\n' '\100\100'"
-  ;;
- *) # Assume ASCII based system
-  SP2NL="tr '\040' '\012'"
-  NL2SP="tr '\015\012' '\040\040'"
-  ;;
-esac
-
-# NLS nuisances.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
-# We save the old values to restore during execute mode.
-if test "${LC_ALL+set}" = set; then
-  save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
-fi
-if test "${LANG+set}" = set; then
-  save_LANG="$LANG"; LANG=C; export LANG
-fi
-
-# Make sure IFS has a sensible default
-: ${IFS=" 	
-"}
-
-if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-  $echo "$modename: not configured to build any kind of library" 1>&2
-  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-  exit $EXIT_FAILURE
-fi
-
-# Global variables.
-mode=$default_mode
-nonopt=
-prev=
-prevopt=
-run=
-show="$echo"
-show_help=
-execute_dlfiles=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-
-#####################################
-# Shell function definitions:
-# This seems to be the best place for them
-
-# func_win32_libid arg
-# return the library type of file 'arg'
-#
-# Need a lot of goo to handle *both* DLLs and import libs
-# Has to be a shell function in order to 'eat' the argument
-# that is supplied when $file_magic_command is called.
-func_win32_libid () {
-  win32_libid_type="unknown"
-  win32_fileres=`file -L $1 2>/dev/null`
-  case $win32_fileres in
-  *ar\ archive\ import\ library*) # definitely import
-    win32_libid_type="x86 archive import"
-    ;;
-  *ar\ archive*) # could be an import, or static
-    if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
-      $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
-      win32_nmres=`eval $NM -f posix -A $1 | \
-	sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
-      if test "X$win32_nmres" = "Ximport" ; then
-        win32_libid_type="x86 archive import"
-      else
-        win32_libid_type="x86 archive static"
-      fi
-    fi
-    ;;
-  *DLL*)
-    win32_libid_type="x86 DLL"
-    ;;
-  *executable*) # but shell scripts are "executable" too...
-    case $win32_fileres in
-    *MS\ Windows\ PE\ Intel*)
-      win32_libid_type="x86 DLL"
-      ;;
-    esac
-    ;;
-  esac
-  $echo $win32_libid_type
-}
-
-
-# func_infer_tag arg
-# Infer tagged configuration to use if any are available and
-# if one wasn't chosen via the "--tag" command line option.
-# Only attempt this if the compiler in the base compile
-# command doesn't match the default compiler.
-# arg is usually of the form 'gcc ...'
-func_infer_tag () {
-    if test -n "$available_tags" && test -z "$tagname"; then
-      CC_quoted=
-      for arg in $CC; do
-	case $arg in
-	  *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	CC_quoted="$CC_quoted $arg"
-      done
-      case $@ in
-      # Blanks in the command may have been stripped by the calling shell,
-      # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
-      # Blanks at the start of $base_compile will cause this to fail
-      # if we don't check for them as well.
-      *)
-	for z in $available_tags; do
-	  if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
-	    # Evaluate the configuration.
-	    eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
-	    CC_quoted=
-	    for arg in $CC; do
-	    # Double-quote args containing other shell metacharacters.
-	    case $arg in
-	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	      arg="\"$arg\""
-	      ;;
-	    esac
-	    CC_quoted="$CC_quoted $arg"
-	  done
-	    case "$@ " in
-	      " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
-	      # The compiler in the base compile command matches
-	      # the one in the tagged configuration.
-	      # Assume this is the tagged configuration we want.
-	      tagname=$z
-	      break
-	      ;;
-	    esac
-	  fi
-	done
-	# If $tagname still isn't set, then no tagged configuration
-	# was found and let the user know that the "--tag" command
-	# line option must be used.
-	if test -z "$tagname"; then
-	  $echo "$modename: unable to infer tagged configuration"
-	  $echo "$modename: specify a tag with \`--tag'" 1>&2
-	  exit $EXIT_FAILURE
-#        else
-#          $echo "$modename: using $tagname tagged configuration"
-	fi
-	;;
-      esac
-    fi
-}
-# End of Shell function definitions
-#####################################
-
-# Darwin sucks
-eval std_shrext=\"$shrext_cmds\"
-
-# Parse our command line options once, thoroughly.
-while test "$#" -gt 0
-do
-  arg="$1"
-  shift
-
-  case $arg in
-  -*=*) optarg=`$echo "X$arg" | $Xsed -e 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  # If the previous option needs an argument, assign it.
-  if test -n "$prev"; then
-    case $prev in
-    execute_dlfiles)
-      execute_dlfiles="$execute_dlfiles $arg"
-      ;;
-    tag)
-      tagname="$arg"
-      preserve_args="${preserve_args}=$arg"
-
-      # Check whether tagname contains only valid characters
-      case $tagname in
-      *[!-_A-Za-z0-9,/]*)
-	$echo "$progname: invalid tag name: $tagname" 1>&2
-	exit $EXIT_FAILURE
-	;;
-      esac
-
-      case $tagname in
-      CC)
-	# Don't test for the "default" C tag, as we know, it's there, but
-	# not specially marked.
-	;;
-      *)
-	if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
-	  taglist="$taglist $tagname"
-	  # Evaluate the configuration.
-	  eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
-	else
-	  $echo "$progname: ignoring unknown tag $tagname" 1>&2
-	fi
-	;;
-      esac
-      ;;
-    *)
-      eval "$prev=\$arg"
-      ;;
-    esac
-
-    prev=
-    prevopt=
-    continue
-  fi
-
-  # Have we seen a non-optional argument yet?
-  case $arg in
-  --help)
-    show_help=yes
-    ;;
-
-  --version)
-    $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
-    $echo
-    $echo "Copyright (C) 2003  Free Software Foundation, Inc."
-    $echo "This is free software; see the source for copying conditions.  There is NO"
-    $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-    exit $EXIT_SUCCESS
-    ;;
-
-  --config)
-    ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
-    # Now print the configurations for the tags.
-    for tagname in $taglist; do
-      ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
-    done
-    exit $EXIT_SUCCESS
-    ;;
-
-  --debug)
-    $echo "$progname: enabling shell trace mode"
-    set -x
-    preserve_args="$preserve_args $arg"
-    ;;
-
-  --dry-run | -n)
-    run=:
-    ;;
-
-  --features)
-    $echo "host: $host"
-    if test "$build_libtool_libs" = yes; then
-      $echo "enable shared libraries"
-    else
-      $echo "disable shared libraries"
-    fi
-    if test "$build_old_libs" = yes; then
-      $echo "enable static libraries"
-    else
-      $echo "disable static libraries"
-    fi
-    exit $EXIT_SUCCESS
-    ;;
-
-  --finish) mode="finish" ;;
-
-  --mode) prevopt="--mode" prev=mode ;;
-  --mode=*) mode="$optarg" ;;
-
-  --preserve-dup-deps) duplicate_deps="yes" ;;
-
-  --quiet | --silent)
-    show=:
-    preserve_args="$preserve_args $arg"
-    ;;
-
-  --tag) prevopt="--tag" prev=tag ;;
-  --tag=*)
-    set tag "$optarg" ${1+"$@"}
-    shift
-    prev=tag
-    preserve_args="$preserve_args --tag"
-    ;;
-
-  -dlopen)
-    prevopt="-dlopen"
-    prev=execute_dlfiles
-    ;;
-
-  -*)
-    $echo "$modename: unrecognized option \`$arg'" 1>&2
-    $echo "$help" 1>&2
-    exit $EXIT_FAILURE
-    ;;
-
-  *)
-    nonopt="$arg"
-    break
-    ;;
-  esac
-done
-
-if test -n "$prevopt"; then
-  $echo "$modename: option \`$prevopt' requires an argument" 1>&2
-  $echo "$help" 1>&2
-  exit $EXIT_FAILURE
-fi
-
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end.  This prevents here-documents from being
-# left over by shells.
-exec_cmd=
-
-if test -z "$show_help"; then
-
-  # Infer the operation mode.
-  if test -z "$mode"; then
-    $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
-    $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2
-    case $nonopt in
-    *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
-      mode=link
-      for arg
-      do
-	case $arg in
-	-c)
-	   mode=compile
-	   break
-	   ;;
-	esac
-      done
-      ;;
-    *db | *dbx | *strace | *truss)
-      mode=execute
-      ;;
-    *install*|cp|mv)
-      mode=install
-      ;;
-    *rm)
-      mode=uninstall
-      ;;
-    *)
-      # If we have no mode, but dlfiles were specified, then do execute mode.
-      test -n "$execute_dlfiles" && mode=execute
-
-      # Just use the default operation mode.
-      if test -z "$mode"; then
-	if test -n "$nonopt"; then
-	  $echo "$modename: warning: cannot infer operation mode from \`$nonopt'" 1>&2
-	else
-	  $echo "$modename: warning: cannot infer operation mode without MODE-ARGS" 1>&2
-	fi
-      fi
-      ;;
-    esac
-  fi
-
-  # Only execute mode is allowed to have -dlopen flags.
-  if test -n "$execute_dlfiles" && test "$mode" != execute; then
-    $echo "$modename: unrecognized option \`-dlopen'" 1>&2
-    $echo "$help" 1>&2
-    exit $EXIT_FAILURE
-  fi
-
-  # Change the help message to a mode-specific one.
-  generic_help="$help"
-  help="Try \`$modename --help --mode=$mode' for more information."
-
-  # These modes are in order of execution frequency so that they run quickly.
-  case $mode in
-  # libtool compile mode
-  compile)
-    modename="$modename: compile"
-    # Get the compilation command and the source file.
-    base_compile=
-    srcfile="$nonopt"  #  always keep a non-empty value in "srcfile"
-    suppress_opt=yes
-    suppress_output=
-    arg_mode=normal
-    libobj=
-    later=
-
-    for arg
-    do
-      case "$arg_mode" in
-      arg  )
-	# do not "continue".  Instead, add this to base_compile
-	lastarg="$arg"
-	arg_mode=normal
-	;;
-
-      target )
-	libobj="$arg"
-	arg_mode=normal
-	continue
-	;;
-
-      normal )
-	# Accept any command-line options.
-	case $arg in
-	-o)
-	  if test -n "$libobj" ; then
-	    $echo "$modename: you cannot specify \`-o' more than once" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  arg_mode=target
-	  continue
-	  ;;
-
-	-static | -prefer-pic | -prefer-non-pic)
-	  later="$later $arg"
-	  continue
-	  ;;
-
-	-no-suppress)
-	  suppress_opt=no
-	  continue
-	  ;;
-
-	-Xcompiler)
-	  arg_mode=arg  #  the next one goes into the "base_compile" arg list
-	  continue      #  The current "srcfile" will either be retained or
-	  ;;            #  replaced later.  I would guess that would be a bug.
-
-	-Wc,*)
-	  args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
-	  lastarg=
-	  save_ifs="$IFS"; IFS=','
- 	  for arg in $args; do
-	    IFS="$save_ifs"
-
-	    # Double-quote args containing other shell metacharacters.
-	    # Many Bourne shells cannot handle close brackets correctly
-	    # in scan sets, so we specify it separately.
-	    case $arg in
-	      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	      arg="\"$arg\""
-	      ;;
-	    esac
-	    lastarg="$lastarg $arg"
-	  done
-	  IFS="$save_ifs"
-	  lastarg=`$echo "X$lastarg" | $Xsed -e "s/^ //"`
-
-	  # Add the arguments to base_compile.
-	  base_compile="$base_compile $lastarg"
-	  continue
-	  ;;
-
-	* )
-	  # Accept the current argument as the source file.
-	  # The previous "srcfile" becomes the current argument.
-	  #
-	  lastarg="$srcfile"
-	  srcfile="$arg"
-	  ;;
-	esac  #  case $arg
-	;;
-      esac    #  case $arg_mode
-
-      # Aesthetically quote the previous argument.
-      lastarg=`$echo "X$lastarg" | $Xsed -e "$sed_quote_subst"`
-
-      case $lastarg in
-      # Double-quote args containing other shell metacharacters.
-      # Many Bourne shells cannot handle close brackets correctly
-      # in scan sets, so we specify it separately.
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	lastarg="\"$lastarg\""
-	;;
-      esac
-
-      base_compile="$base_compile $lastarg"
-    done # for arg
-
-    case $arg_mode in
-    arg)
-      $echo "$modename: you must specify an argument for -Xcompile"
-      exit $EXIT_FAILURE
-      ;;
-    target)
-      $echo "$modename: you must specify a target with \`-o'" 1>&2
-      exit $EXIT_FAILURE
-      ;;
-    *)
-      # Get the name of the library object.
-      [ -z "$libobj" ] && libobj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%'`
-      ;;
-    esac
-
-    # Recognize several different file suffixes.
-    # If the user specifies -o file.o, it is replaced with file.lo
-    xform='[cCFSifmso]'
-    case $libobj in
-    *.ada) xform=ada ;;
-    *.adb) xform=adb ;;
-    *.ads) xform=ads ;;
-    *.asm) xform=asm ;;
-    *.c++) xform=c++ ;;
-    *.cc) xform=cc ;;
-    *.ii) xform=ii ;;
-    *.class) xform=class ;;
-    *.cpp) xform=cpp ;;
-    *.cxx) xform=cxx ;;
-    *.f90) xform=f90 ;;
-    *.for) xform=for ;;
-    *.java) xform=java ;;
-    esac
-
-    libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
-
-    case $libobj in
-    *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
-    *)
-      $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
-      exit $EXIT_FAILURE
-      ;;
-    esac
-
-    func_infer_tag $base_compile
-
-    for arg in $later; do
-      case $arg in
-      -static)
-	build_old_libs=yes
-	continue
-	;;
-
-      -prefer-pic)
-	pic_mode=yes
-	continue
-	;;
-
-      -prefer-non-pic)
-	pic_mode=no
-	continue
-	;;
-      esac
-    done
-
-    objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
-    xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
-    if test "X$xdir" = "X$obj"; then
-      xdir=
-    else
-      xdir=$xdir/
-    fi
-    lobj=${xdir}$objdir/$objname
-
-    if test -z "$base_compile"; then
-      $echo "$modename: you must specify a compilation command" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    # Delete any leftover library objects.
-    if test "$build_old_libs" = yes; then
-      removelist="$obj $lobj $libobj ${libobj}T"
-    else
-      removelist="$lobj $libobj ${libobj}T"
-    fi
-
-    $run $rm $removelist
-    trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
-
-    # On Cygwin there's no "real" PIC flag so we must build both object types
-    case $host_os in
-    cygwin* | mingw* | pw32* | os2*)
-      pic_mode=default
-      ;;
-    esac
-    if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
-      # non-PIC code in shared libraries is not supported
-      pic_mode=default
-    fi
-
-    # Calculate the filename of the output object if compiler does
-    # not support -o with -c
-    if test "$compiler_c_o" = no; then
-      output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
-      lockfile="$output_obj.lock"
-      removelist="$removelist $output_obj $lockfile"
-      trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
-    else
-      output_obj=
-      need_locks=no
-      lockfile=
-    fi
-
-    # Lock this critical section if it is needed
-    # We use this script file to make the link, it avoids creating a new file
-    if test "$need_locks" = yes; then
-      until $run ln "$progpath" "$lockfile" 2>/dev/null; do
-	$show "Waiting for $lockfile to be removed"
-	sleep 2
-      done
-    elif test "$need_locks" = warn; then
-      if test -f "$lockfile"; then
-	$echo "\
-*** ERROR, $lockfile exists and contains:
-`cat $lockfile 2>/dev/null`
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-      $echo $srcfile > "$lockfile"
-    fi
-
-    if test -n "$fix_srcfile_path"; then
-      eval srcfile=\"$fix_srcfile_path\"
-    fi
-
-    $run $rm "$libobj" "${libobj}T"
-
-    # Create a libtool object file (analogous to a ".la" file),
-    # but don't create it if we're doing a dry run.
-    test -z "$run" && cat > ${libobj}T <<EOF
-# $libobj - a libtool object file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# Name of the PIC object.
-EOF
-
-    # Only build a PIC object if we are building libtool libraries.
-    if test "$build_libtool_libs" = yes; then
-      # Without this assignment, base_compile gets emptied.
-      fbsd_hideous_sh_bug=$base_compile
-
-      if test "$pic_mode" != no; then
-	command="$base_compile $srcfile $pic_flag"
-      else
-	# Don't build PIC code
-	command="$base_compile $srcfile"
-      fi
-
-      if test ! -d "${xdir}$objdir"; then
-	$show "$mkdir ${xdir}$objdir"
-	$run $mkdir ${xdir}$objdir
-	status=$?
-	if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
-	  exit $status
-	fi
-      fi
-
-      if test -z "$output_obj"; then
-	# Place PIC objects in $objdir
-	command="$command -o $lobj"
-      fi
-
-      $run $rm "$lobj" "$output_obj"
-
-      $show "$command"
-      if $run eval "$command"; then :
-      else
-	test -n "$output_obj" && $run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$echo "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed, then go on to compile the next one
-      if test -n "$output_obj" && test "X$output_obj" != "X$lobj"; then
-	$show "$mv $output_obj $lobj"
-	if $run $mv $output_obj $lobj; then :
-	else
-	  error=$?
-	  $run $rm $removelist
-	  exit $error
-	fi
-      fi
-
-      # Append the name of the PIC object to the libtool object file.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object='$objdir/$objname'
-
-EOF
-
-      # Allow error messages only from the first compilation.
-      if test "$suppress_opt" = yes; then
-        suppress_output=' >/dev/null 2>&1'
-      fi
-    else
-      # No PIC object so indicate it doesn't exist in the libtool
-      # object file.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-pic_object=none
-
-EOF
-    fi
-
-    # Only build a position-dependent object if we build old libraries.
-    if test "$build_old_libs" = yes; then
-      if test "$pic_mode" != yes; then
-	# Don't build PIC code
-	command="$base_compile $srcfile"
-      else
-	command="$base_compile $srcfile $pic_flag"
-      fi
-      if test "$compiler_c_o" = yes; then
-	command="$command -o $obj"
-      fi
-
-      # Suppress compiler output if we already did a PIC compilation.
-      command="$command$suppress_output"
-      $run $rm "$obj" "$output_obj"
-      $show "$command"
-      if $run eval "$command"; then :
-      else
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      if test "$need_locks" = warn &&
-	 test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
-	$echo "\
-*** ERROR, $lockfile contains:
-`cat $lockfile 2>/dev/null`
-
-but it should contain:
-$srcfile
-
-This indicates that another process is trying to use the same
-temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together.  If you
-repeat this compilation, it may succeed, by chance, but you had better
-avoid parallel builds (make -j) in this platform, or get a better
-compiler."
-
-	$run $rm $removelist
-	exit $EXIT_FAILURE
-      fi
-
-      # Just move the object if needed
-      if test -n "$output_obj" && test "X$output_obj" != "X$obj"; then
-	$show "$mv $output_obj $obj"
-	if $run $mv $output_obj $obj; then :
-	else
-	  error=$?
-	  $run $rm $removelist
-	  exit $error
-	fi
-      fi
-
-      # Append the name of the non-PIC object the libtool object file.
-      # Only append if the libtool object file exists.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object='$objname'
-
-EOF
-    else
-      # Append the name of the non-PIC object the libtool object file.
-      # Only append if the libtool object file exists.
-      test -z "$run" && cat >> ${libobj}T <<EOF
-# Name of the non-PIC object.
-non_pic_object=none
-
-EOF
-    fi
-
-    $run $mv "${libobj}T" "${libobj}"
-
-    # Unlock the critical section if it was locked
-    if test "$need_locks" != no; then
-      $run $rm "$lockfile"
-    fi
-
-    exit $EXIT_SUCCESS
-    ;;
-
-  # libtool link mode
-  link | relink)
-    modename="$modename: link"
-    case $host in
-    *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-      # It is impossible to link a dll without this setting, and
-      # we shouldn't force the makefile maintainer to figure out
-      # which system we are compiling for in order to pass an extra
-      # flag for every libtool invocation.
-      # allow_undefined=no
-
-      # FIXME: Unfortunately, there are problems with the above when trying
-      # to make a dll which has undefined symbols, in which case not
-      # even a static library is built.  For now, we need to specify
-      # -no-undefined on the libtool link line when we can be certain
-      # that all symbols are satisfied, otherwise we get a static library.
-      allow_undefined=yes
-      ;;
-    *)
-      allow_undefined=yes
-      ;;
-    esac
-    libtool_args="$nonopt"
-    base_compile="$nonopt $@"
-    compile_command="$nonopt"
-    finalize_command="$nonopt"
-
-    compile_rpath=
-    finalize_rpath=
-    compile_shlibpath=
-    finalize_shlibpath=
-    convenience=
-    old_convenience=
-    deplibs=
-    old_deplibs=
-    compiler_flags=
-    linker_flags=
-    dllsearchpath=
-    lib_search_path=`pwd`
-    inst_prefix_dir=
-
-    avoid_version=no
-    dlfiles=
-    dlprefiles=
-    dlself=no
-    export_dynamic=no
-    export_symbols=
-    export_symbols_regex=
-    generated=
-    libobjs=
-    ltlibs=
-    module=no
-    no_install=no
-    objs=
-    non_pic_objects=
-    precious_files_regex=
-    prefer_static_libs=no
-    preload=no
-    prev=
-    prevarg=
-    release=
-    rpath=
-    xrpath=
-    perm_rpath=
-    temp_rpath=
-    thread_safe=no
-    vinfo=
-    vinfo_number=no
-
-    func_infer_tag $base_compile
-
-    # We need to know -static, to get the right output filenames.
-    for arg
-    do
-      case $arg in
-      -all-static | -static)
-	if test "X$arg" = "X-all-static"; then
-	  if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
-	    $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
-	  fi
-	  if test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	else
-	  if test -z "$pic_flag" && test -n "$link_static_flag"; then
-	    dlopen_self=$dlopen_self_static
-	  fi
-	fi
-	build_libtool_libs=no
-	build_old_libs=yes
-	prefer_static_libs=yes
-	break
-	;;
-      esac
-    done
-
-    # See if our shared archives depend on static archives.
-    test -n "$old_archive_from_new_cmds" && build_old_libs=yes
-
-    # Go through the arguments, transforming them on the way.
-    while test "$#" -gt 0; do
-      arg="$1"
-      shift
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	qarg=\"`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`\" ### testsuite: skip nested quoting test
-	;;
-      *) qarg=$arg ;;
-      esac
-      libtool_args="$libtool_args $qarg"
-
-      # If the previous option needs an argument, assign it.
-      if test -n "$prev"; then
-	case $prev in
-	output)
-	  compile_command="$compile_command @OUTPUT@"
-	  finalize_command="$finalize_command @OUTPUT@"
-	  ;;
-	esac
-
-	case $prev in
-	dlfiles|dlprefiles)
-	  if test "$preload" = no; then
-	    # Add the symbol object into the linking commands.
-	    compile_command="$compile_command @SYMFILE@"
-	    finalize_command="$finalize_command @SYMFILE@"
-	    preload=yes
-	  fi
-	  case $arg in
-	  *.la | *.lo) ;;  # We handle these cases below.
-	  force)
-	    if test "$dlself" = no; then
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  self)
-	    if test "$prev" = dlprefiles; then
-	      dlself=yes
-	    elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
-	      dlself=yes
-	    else
-	      dlself=needless
-	      export_dynamic=yes
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  *)
-	    if test "$prev" = dlfiles; then
-	      dlfiles="$dlfiles $arg"
-	    else
-	      dlprefiles="$dlprefiles $arg"
-	    fi
-	    prev=
-	    continue
-	    ;;
-	  esac
-	  ;;
-	expsyms)
-	  export_symbols="$arg"
-	  if test ! -f "$arg"; then
-	    $echo "$modename: symbol file \`$arg' does not exist"
-	    exit $EXIT_FAILURE
-	  fi
-	  prev=
-	  continue
-	  ;;
-	expsyms_regex)
-	  export_symbols_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	inst_prefix)
-	  inst_prefix_dir="$arg"
-	  prev=
-	  continue
-	  ;;
-	precious_regex)
-	  precious_files_regex="$arg"
-	  prev=
-	  continue
-	  ;;
-	release)
-	  release="-$arg"
-	  prev=
-	  continue
-	  ;;
-	objectlist)
-	  if test -f "$arg"; then
-	    save_arg=$arg
-	    moreargs=
-	    for fil in `cat $save_arg`
-	    do
-#	      moreargs="$moreargs $fil"
-	      arg=$fil
-	      # A libtool-controlled object.
-
-	      # Check to see that this really is a libtool object.
-	      if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-		pic_object=
-		non_pic_object=
-
-		# Read the .lo file
-		# If there is no directory component, then add one.
-		case $arg in
-		*/* | *\\*) . $arg ;;
-		*) . ./$arg ;;
-		esac
-
-		if test -z "$pic_object" || \
-		   test -z "$non_pic_object" ||
-		   test "$pic_object" = none && \
-		   test "$non_pic_object" = none; then
-		  $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-		  exit $EXIT_FAILURE
-		fi
-
-		# Extract subdirectory from the argument.
-		xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-		if test "X$xdir" = "X$arg"; then
-		  xdir=
-		else
-		  xdir="$xdir/"
-		fi
-
-		if test "$pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  pic_object="$xdir$pic_object"
-
-		  if test "$prev" = dlfiles; then
-		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		      dlfiles="$dlfiles $pic_object"
-		      prev=
-		      continue
-		    else
-		      # If libtool objects are unsupported, then we need to preload.
-		      prev=dlprefiles
-		    fi
-		  fi
-
-		  # CHECK ME:  I think I busted this.  -Ossama
-		  if test "$prev" = dlprefiles; then
-		    # Preload the old-style object.
-		    dlprefiles="$dlprefiles $pic_object"
-		    prev=
-		  fi
-
-		  # A PIC object.
-		  libobjs="$libobjs $pic_object"
-		  arg="$pic_object"
-		fi
-
-		# Non-PIC object.
-		if test "$non_pic_object" != none; then
-		  # Prepend the subdirectory the object is found in.
-		  non_pic_object="$xdir$non_pic_object"
-
-		  # A standard non-PIC object
-		  non_pic_objects="$non_pic_objects $non_pic_object"
-		  if test -z "$pic_object" || test "$pic_object" = none ; then
-		    arg="$non_pic_object"
-		  fi
-		fi
-	      else
-		# Only an error if not doing a dry-run.
-		if test -z "$run"; then
-		  $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-		  exit $EXIT_FAILURE
-		else
-		  # Dry-run case.
-
-		  # Extract subdirectory from the argument.
-		  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-		  if test "X$xdir" = "X$arg"; then
-		    xdir=
-		  else
-		    xdir="$xdir/"
-		  fi
-
-		  pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-		  non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-		  libobjs="$libobjs $pic_object"
-		  non_pic_objects="$non_pic_objects $non_pic_object"
-		fi
-	      fi
-	    done
-	  else
-	    $echo "$modename: link input file \`$save_arg' does not exist"
-	    exit $EXIT_FAILURE
-	  fi
-	  arg=$save_arg
-	  prev=
-	  continue
-	  ;;
-	rpath | xrpath)
-	  # We need an absolute path.
-	  case $arg in
-	  [\\/]* | [A-Za-z]:[\\/]*) ;;
-	  *)
-	    $echo "$modename: only absolute run-paths are allowed" 1>&2
-	    exit $EXIT_FAILURE
-	    ;;
-	  esac
-	  if test "$prev" = rpath; then
-	    case "$rpath " in
-	    *" $arg "*) ;;
-	    *) rpath="$rpath $arg" ;;
-	    esac
-	  else
-	    case "$xrpath " in
-	    *" $arg "*) ;;
-	    *) xrpath="$xrpath $arg" ;;
-	    esac
-	  fi
-	  prev=
-	  continue
-	  ;;
-	xcompiler)
-	  compiler_flags="$compiler_flags $qarg"
-	  prev=
-	  compile_command="$compile_command $qarg"
-	  finalize_command="$finalize_command $qarg"
-	  continue
-	  ;;
-	xlinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $wl$qarg"
-	  prev=
-	  compile_command="$compile_command $wl$qarg"
-	  finalize_command="$finalize_command $wl$qarg"
-	  continue
-	  ;;
-	xcclinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $qarg"
-	  prev=
-	  compile_command="$compile_command $qarg"
-	  finalize_command="$finalize_command $qarg"
-	  continue
-	  ;;
-	shrext)
-  	  shrext_cmds="$arg"
-	  prev=
-	  continue
-	  ;;
-	*)
-	  eval "$prev=\"\$arg\""
-	  prev=
-	  continue
-	  ;;
-	esac
-      fi # test -n "$prev"
-
-      prevarg="$arg"
-
-      case $arg in
-      -all-static)
-	if test -n "$link_static_flag"; then
-	  compile_command="$compile_command $link_static_flag"
-	  finalize_command="$finalize_command $link_static_flag"
-	fi
-	continue
-	;;
-
-      -allow-undefined)
-	# FIXME: remove this flag sometime in the future.
-	$echo "$modename: \`-allow-undefined' is deprecated because it is the default" 1>&2
-	continue
-	;;
-
-      -avoid-version)
-	avoid_version=yes
-	continue
-	;;
-
-      -dlopen)
-	prev=dlfiles
-	continue
-	;;
-
-      -dlpreopen)
-	prev=dlprefiles
-	continue
-	;;
-
-      -export-dynamic)
-	export_dynamic=yes
-	continue
-	;;
-
-      -export-symbols | -export-symbols-regex)
-	if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	  $echo "$modename: more than one -exported-symbols argument is not allowed"
-	  exit $EXIT_FAILURE
-	fi
-	if test "X$arg" = "X-export-symbols"; then
-	  prev=expsyms
-	else
-	  prev=expsyms_regex
-	fi
-	continue
-	;;
-
-      -inst-prefix-dir)
-	prev=inst_prefix
-	continue
-	;;
-
-      # The native IRIX linker understands -LANG:*, -LIST:* and -LNO:*
-      # so, if we see these flags be careful not to treat them like -L
-      -L[A-Z][A-Z]*:*)
-	case $with_gcc/$host in
-	no/*-*-irix* | /*-*-irix*)
-	  compile_command="$compile_command $arg"
-	  finalize_command="$finalize_command $arg"
-	  ;;
-	esac
-	continue
-	;;
-
-      -L*)
-	dir=`$echo "X$arg" | $Xsed -e 's/^-L//'`
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  absdir=`cd "$dir" && pwd`
-	  if test -z "$absdir"; then
-	    $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  dir="$absdir"
-	  ;;
-	esac
-	case "$deplibs " in
-	*" -L$dir "*) ;;
-	*)
-	  deplibs="$deplibs -L$dir"
-	  lib_search_path="$lib_search_path $dir"
-	  ;;
-	esac
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  case :$dllsearchpath: in
-	  *":$dir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$dir";;
-	  esac
-	  ;;
-	esac
-	continue
-	;;
-
-      -l*)
-	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
-	  case $host in
-	  *-*-cygwin* | *-*-pw32* | *-*-beos*)
-	    # These systems don't actually have a C or math library (as such)
-	    continue
-	    ;;
-	  *-*-mingw* | *-*-os2*)
-	    # These systems don't actually have a C library (as such)
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-openbsd* | *-*-freebsd*)
-	    # Do not include libc due to us having libc/libc_r.
-	    test "X$arg" = "X-lc" && continue
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C and math libraries are in the System framework
-	    deplibs="$deplibs -framework System"
-	    continue
-	  esac
-	elif test "X$arg" = "X-lc_r"; then
-	 case $host in
-	 *-*-openbsd* | *-*-freebsd*)
-	   # Do not include libc_r directly, use -pthread flag.
-	   continue
-	   ;;
-	 esac
-	fi
-	deplibs="$deplibs $arg"
-	continue
-	;;
-
-     -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-	deplibs="$deplibs $arg"
-	continue
-	;;
-
-      -module)
-	module=yes
-	continue
-	;;
-
-      # gcc -m* arguments should be passed to the linker via $compiler_flags
-      # in order to pass architecture information to the linker
-      # (e.g. 32 vs 64-bit).  This may also be accomplished via -Wl,-mfoo
-      # but this is not reliable with gcc because gcc may use -mfoo to
-      # select a different linker, different libraries, etc, while
-      # -Wl,-mfoo simply passes -mfoo to the linker.
-      -m*)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-        compile_command="$compile_command $arg"
-        finalize_command="$finalize_command $arg"
-        if test "$with_gcc" = "yes" ; then
-          compiler_flags="$compiler_flags $arg"
-        fi
-        continue
-        ;;
-
-      -shrext)
-	prev=shrext
-	continue
-	;;
-
-      -no-fast-install)
-	fast_install=no
-	continue
-	;;
-
-      -no-install)
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  # The PATH hackery in wrapper scripts is required on Windows
-	  # in order for the loader to find any dlls it needs.
-	  $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
-	  $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
-	  fast_install=no
-	  ;;
-	*) no_install=yes ;;
-	esac
-	continue
-	;;
-
-      -no-undefined)
-	allow_undefined=no
-	continue
-	;;
-
-      -objectlist)
-	prev=objectlist
-	continue
-	;;
-
-      -o) prev=output ;;
-
-      -precious-files-regex)
-	prev=precious_regex
-	continue
-	;;
-
-      -release)
-	prev=release
-	continue
-	;;
-
-      -rpath)
-	prev=rpath
-	continue
-	;;
-
-      -R)
-	prev=xrpath
-	continue
-	;;
-
-      -R*)
-	dir=`$echo "X$arg" | $Xsed -e 's/^-R//'`
-	# We need an absolute path.
-	case $dir in
-	[\\/]* | [A-Za-z]:[\\/]*) ;;
-	*)
-	  $echo "$modename: only absolute run-paths are allowed" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-	case "$xrpath " in
-	*" $dir "*) ;;
-	*) xrpath="$xrpath $dir" ;;
-	esac
-	continue
-	;;
-
-      -static)
-	# The effects of -static are defined in a previous loop.
-	# We used to do the same as -all-static on platforms that
-	# didn't have a PIC flag, but the assumption that the effects
-	# would be equivalent was wrong.  It would break on at least
-	# Digital Unix and AIX.
-	continue
-	;;
-
-      -thread-safe)
-	thread_safe=yes
-	continue
-	;;
-
-      -version-info)
-	prev=vinfo
-	continue
-	;;
-      -version-number)
-	prev=vinfo
-	vinfo_number=yes
-	continue
-	;;
-
-      -Wc,*)
-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wc,//'`
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-	  case $flag in
-	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	    flag="\"$flag\""
-	    ;;
-	  esac
-	  arg="$arg $wl$flag"
-	  compiler_flags="$compiler_flags $flag"
-	done
-	IFS="$save_ifs"
-	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-	;;
-
-      -Wl,*)
-	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
-	arg=
-	save_ifs="$IFS"; IFS=','
-	for flag in $args; do
-	  IFS="$save_ifs"
-	  case $flag in
-	    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	    flag="\"$flag\""
-	    ;;
-	  esac
-	  arg="$arg $wl$flag"
-	  compiler_flags="$compiler_flags $wl$flag"
-	  linker_flags="$linker_flags $flag"
-	done
-	IFS="$save_ifs"
-	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
-	;;
-
-      -Xcompiler)
-	prev=xcompiler
-	continue
-	;;
-
-      -Xlinker)
-	prev=xlinker
-	continue
-	;;
-
-      -XCClinker)
-	prev=xcclinker
-	continue
-	;;
-
-      # Some other compiler flag.
-      -* | +*)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	;;
-
-      *.$objext)
-	# A standard object.
-	objs="$objs $arg"
-	;;
-
-      *.lo)
-	# A libtool-controlled object.
-
-	# Check to see that this really is a libtool object.
-	if (${SED} -e '2q' $arg | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  pic_object=
-	  non_pic_object=
-
-	  # Read the .lo file
-	  # If there is no directory component, then add one.
-	  case $arg in
-	  */* | *\\*) . $arg ;;
-	  *) . ./$arg ;;
-	  esac
-
-	  if test -z "$pic_object" || \
-	     test -z "$non_pic_object" ||
-	     test "$pic_object" = none && \
-	     test "$non_pic_object" = none; then
-	    $echo "$modename: cannot find name of object for \`$arg'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-
-	  # Extract subdirectory from the argument.
-	  xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-	  if test "X$xdir" = "X$arg"; then
-	    xdir=
- 	  else
-	    xdir="$xdir/"
-	  fi
-
-	  if test "$pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    pic_object="$xdir$pic_object"
-
-	    if test "$prev" = dlfiles; then
-	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		dlfiles="$dlfiles $pic_object"
-		prev=
-		continue
-	      else
-		# If libtool objects are unsupported, then we need to preload.
-		prev=dlprefiles
-	      fi
-	    fi
-
-	    # CHECK ME:  I think I busted this.  -Ossama
-	    if test "$prev" = dlprefiles; then
-	      # Preload the old-style object.
-	      dlprefiles="$dlprefiles $pic_object"
-	      prev=
-	    fi
-
-	    # A PIC object.
-	    libobjs="$libobjs $pic_object"
-	    arg="$pic_object"
-	  fi
-
-	  # Non-PIC object.
-	  if test "$non_pic_object" != none; then
-	    # Prepend the subdirectory the object is found in.
-	    non_pic_object="$xdir$non_pic_object"
-
-	    # A standard non-PIC object
-	    non_pic_objects="$non_pic_objects $non_pic_object"
-	    if test -z "$pic_object" || test "$pic_object" = none ; then
-	      arg="$non_pic_object"
-	    fi
-	  fi
-	else
-	  # Only an error if not doing a dry-run.
-	  if test -z "$run"; then
-	    $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
-	    exit $EXIT_FAILURE
-	  else
-	    # Dry-run case.
-
-	    # Extract subdirectory from the argument.
-	    xdir=`$echo "X$arg" | $Xsed -e 's%/[^/]*$%%'`
-	    if test "X$xdir" = "X$arg"; then
-	      xdir=
-	    else
-	      xdir="$xdir/"
-	    fi
-
-	    pic_object=`$echo "X${xdir}${objdir}/${arg}" | $Xsed -e "$lo2o"`
-	    non_pic_object=`$echo "X${xdir}${arg}" | $Xsed -e "$lo2o"`
-	    libobjs="$libobjs $pic_object"
-	    non_pic_objects="$non_pic_objects $non_pic_object"
-	  fi
-	fi
-	;;
-
-      *.$libext)
-	# An archive.
-	deplibs="$deplibs $arg"
-	old_deplibs="$old_deplibs $arg"
-	continue
-	;;
-
-      *.la)
-	# A libtool-controlled library.
-
-	if test "$prev" = dlfiles; then
-	  # This library was specified with -dlopen.
-	  dlfiles="$dlfiles $arg"
-	  prev=
-	elif test "$prev" = dlprefiles; then
-	  # The library was specified with -dlpreopen.
-	  dlprefiles="$dlprefiles $arg"
-	  prev=
-	else
-	  deplibs="$deplibs $arg"
-	fi
-	continue
-	;;
-
-      # Some other compiler argument.
-      *)
-	# Unknown arguments in both finalize_command and compile_command need
-	# to be aesthetically quoted because they are evaled later.
-	arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-	case $arg in
-	*[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*|"")
-	  arg="\"$arg\""
-	  ;;
-	esac
-	;;
-      esac # arg
-
-      # Now actually substitute the argument into the commands.
-      if test -n "$arg"; then
-	compile_command="$compile_command $arg"
-	finalize_command="$finalize_command $arg"
-      fi
-    done # argument parsing loop
-
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
-      eval arg=\"$export_dynamic_flag_spec\"
-      compile_command="$compile_command $arg"
-      finalize_command="$finalize_command $arg"
-    fi
-
-    oldlibs=
-    # calculate the name of the file, without its directory
-    outputname=`$echo "X$output" | $Xsed -e 's%^.*/%%'`
-    libobjs_save="$libobjs"
-
-    if test -n "$shlibpath_var"; then
-      # get the directories listed in $shlibpath_var
-      eval shlib_search_path=\`\$echo \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
-    else
-      shlib_search_path=
-    fi
-    eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
-    eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
-
-    output_objdir=`$echo "X$output" | $Xsed -e 's%/[^/]*$%%'`
-    if test "X$output_objdir" = "X$output"; then
-      output_objdir="$objdir"
-    else
-      output_objdir="$output_objdir/$objdir"
-    fi
-    # Create the object directory.
-    if test ! -d "$output_objdir"; then
-      $show "$mkdir $output_objdir"
-      $run $mkdir $output_objdir
-      status=$?
-      if test "$status" -ne 0 && test ! -d "$output_objdir"; then
-	exit $status
-      fi
-    fi
-
-    # Determine the type of output
-    case $output in
-    "")
-      $echo "$modename: you must specify an output file" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-      ;;
-    *.$libext) linkmode=oldlib ;;
-    *.lo | *.$objext) linkmode=obj ;;
-    *.la) linkmode=lib ;;
-    *) linkmode=prog ;; # Anything else should be a program.
-    esac
-
-    case $host in
-    *cygwin* | *mingw* | *pw32*)
-      # don't eliminate duplications in $postdeps and $predeps
-      duplicate_compiler_generated_deps=yes
-      ;;
-    *)
-      duplicate_compiler_generated_deps=$duplicate_deps
-      ;;
-    esac
-    specialdeplibs=
-
-    libs=
-    # Find all interdependent deplibs by searching for libraries
-    # that are linked more than once (e.g. -la -lb -la)
-    for deplib in $deplibs; do
-      if test "X$duplicate_deps" = "Xyes" ; then
-	case "$libs " in
-	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	esac
-      fi
-      libs="$libs $deplib"
-    done
-
-    if test "$linkmode" = lib; then
-      libs="$predeps $libs $compiler_lib_search_path $postdeps"
-
-      # Compute libraries that are listed more than once in $predeps
-      # $postdeps and mark them as special (i.e., whose duplicates are
-      # not to be eliminated).
-      pre_post_deps=
-      if test "X$duplicate_compiler_generated_deps" = "Xyes" ; then
-	for pre_post_dep in $predeps $postdeps; do
-	  case "$pre_post_deps " in
-	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
-	  esac
-	  pre_post_deps="$pre_post_deps $pre_post_dep"
-	done
-      fi
-      pre_post_deps=
-    fi
-
-    deplibs=
-    newdependency_libs=
-    newlib_search_path=
-    need_relink=no # whether we're linking any uninstalled libtool libraries
-    notinst_deplibs= # not-installed libtool libraries
-    notinst_path= # paths that contain not-installed libtool libraries
-    case $linkmode in
-    lib)
-	passes="conv link"
-	for file in $dlfiles $dlprefiles; do
-	  case $file in
-	  *.la) ;;
-	  *)
-	    $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
-	    exit $EXIT_FAILURE
-	    ;;
-	  esac
-	done
-	;;
-    prog)
-	compile_deplibs=
-	finalize_deplibs=
-	alldeplibs=no
-	newdlfiles=
-	newdlprefiles=
-	passes="conv scan dlopen dlpreopen link"
-	;;
-    *)  passes="conv"
-	;;
-    esac
-    for pass in $passes; do
-      if test "$linkmode,$pass" = "lib,link" ||
-	 test "$linkmode,$pass" = "prog,scan"; then
-	libs="$deplibs"
-	deplibs=
-      fi
-      if test "$linkmode" = prog; then
-	case $pass in
-	dlopen) libs="$dlfiles" ;;
-	dlpreopen) libs="$dlprefiles" ;;
-	link)
-	  libs="$deplibs %DEPLIBS%"
-	  test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
-	  ;;
-	esac
-      fi
-      if test "$pass" = dlopen; then
-	# Collect dlpreopened libraries
-	save_deplibs="$deplibs"
-	deplibs=
-      fi
-      for deplib in $libs; do
-	lib=
-	found=no
-	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
-	  if test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$deplib $compile_deplibs"
-	    finalize_deplibs="$deplib $finalize_deplibs"
-	  else
-	    deplibs="$deplib $deplibs"
-	  fi
-	  continue
-	  ;;
-	-l*)
-	  if test "$linkmode" != lib && test "$linkmode" != prog; then
-	    $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
-	    continue
-	  fi
-	  name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
-	  for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
-	    for search_ext in .la $std_shrext .so .a; do
-	      # Search the libtool library
-	      lib="$searchdir/lib${name}${search_ext}"
-	      if test -f "$lib"; then
-		if test "$search_ext" = ".la"; then
-		  found=yes
-		else
-		  found=no
-		fi
-		break 2
-	      fi
-	    done
-	  done
-	  if test "$found" != yes; then
-	    # deplib doesn't seem to be a libtool library
-	    if test "$linkmode,$pass" = "prog,link"; then
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      deplibs="$deplib $deplibs"
-	      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    continue
-	  else # deplib is a libtool library
-	    # If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
-	    # We need to do some special things here, and not later.
-	    if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	      case " $predeps $postdeps " in
-	      *" $deplib "*)
-		if (${SED} -e '2q' $lib |
-                    grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-		  library_names=
-		  old_library=
-		  case $lib in
-		  */* | *\\*) . $lib ;;
-		  *) . ./$lib ;;
-		  esac
-		  for l in $old_library $library_names; do
-		    ll="$l"
-		  done
-		  if test "X$ll" = "X$old_library" ; then # only static version available
-		    found=no
-		    ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-		    test "X$ladir" = "X$lib" && ladir="."
-		    lib=$ladir/$old_library
-		    if test "$linkmode,$pass" = "prog,link"; then
-		      compile_deplibs="$deplib $compile_deplibs"
-		      finalize_deplibs="$deplib $finalize_deplibs"
-		    else
-		      deplibs="$deplib $deplibs"
-		      test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
-		    fi
-		    continue
-		  fi
-		fi
-	        ;;
-	      *) ;;
-	      esac
-	    fi
-	  fi
-	  ;; # -l
-	-L*)
-	  case $linkmode in
-	  lib)
-	    deplibs="$deplib $deplibs"
-	    test "$pass" = conv && continue
-	    newdependency_libs="$deplib $newdependency_libs"
-	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-	    ;;
-	  prog)
-	    if test "$pass" = conv; then
-	      deplibs="$deplib $deplibs"
-	      continue
-	    fi
-	    if test "$pass" = scan; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
-	    ;;
-	  *)
-	    $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
-	    ;;
-	  esac # linkmode
-	  continue
-	  ;; # -L
-	-R*)
-	  if test "$pass" = link; then
-	    dir=`$echo "X$deplib" | $Xsed -e 's/^-R//'`
-	    # Make sure the xrpath contains only unique directories.
-	    case "$xrpath " in
-	    *" $dir "*) ;;
-	    *) xrpath="$xrpath $dir" ;;
-	    esac
-	  fi
-	  deplibs="$deplib $deplibs"
-	  continue
-	  ;;
-	*.la) lib="$deplib" ;;
-	*.$libext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	    continue
-	  fi
-	  case $linkmode in
-	  lib)
-	    if test "$deplibs_check_method" != pass_all; then
-	      $echo
-	      $echo "*** Warning: Trying to link with static lib archive $deplib."
-	      $echo "*** I have the capability to make that library automatically link in when"
-	      $echo "*** you link to this library.  But I can only do this if you have a"
-	      $echo "*** shared version of the library, which you do not appear to have"
-	      $echo "*** because the file extensions .$libext of this argument makes me believe"
-	      $echo "*** that it is just a static archive that I should not used here."
-	    else
-	      $echo
-	      $echo "*** Warning: Linking the shared library $output against the"
-	      $echo "*** static library $deplib is not portable!"
-	      deplibs="$deplib $deplibs"
-	    fi
-	    continue
-	    ;;
-	  prog)
-	    if test "$pass" != link; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    fi
-	    continue
-	    ;;
-	  esac # linkmode
-	  ;; # *.$libext
-	*.lo | *.$objext)
-	  if test "$pass" = conv; then
-	    deplibs="$deplib $deplibs"
-	  elif test "$linkmode" = prog; then
-	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
-	      # If there is no dlopen support or we're linking statically,
-	      # we need to preload.
-	      newdlprefiles="$newdlprefiles $deplib"
-	      compile_deplibs="$deplib $compile_deplibs"
-	      finalize_deplibs="$deplib $finalize_deplibs"
-	    else
-	      newdlfiles="$newdlfiles $deplib"
-	    fi
-	  fi
-	  continue
-	  ;;
-	%DEPLIBS%)
-	  alldeplibs=yes
-	  continue
-	  ;;
-	esac # case $deplib
-	if test "$found" = yes || test -f "$lib"; then :
-	else
-	  $echo "$modename: cannot find the library \`$lib'" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$ladir" = "X$lib" && ladir="."
-
-	dlname=
-	dlopen=
-	dlpreopen=
-	libdir=
-	library_names=
-	old_library=
-	# If the library was installed with an old release of libtool,
-	# it will not redefine variables installed, or shouldnotlink
-	installed=yes
-	shouldnotlink=no
-
-	# Read the .la file
-	case $lib in
-	*/* | *\\*) . $lib ;;
-	*) . ./$lib ;;
-	esac
-
-	if test "$linkmode,$pass" = "lib,link" ||
-	   test "$linkmode,$pass" = "prog,scan" ||
-	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
-	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
-	fi
-
-	if test "$pass" = conv; then
-	  # Only check for convenience libraries
-	  deplibs="$lib $deplibs"
-	  if test -z "$libdir"; then
-	    if test -z "$old_library"; then
-	      $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	      exit $EXIT_FAILURE
-	    fi
-	    # It is a libtool convenience library, so add in its objects.
-	    convenience="$convenience $ladir/$objdir/$old_library"
-	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
-	    tmp_libs=
-	    for deplib in $dependency_libs; do
-	      deplibs="$deplib $deplibs"
-              if test "X$duplicate_deps" = "Xyes" ; then
-	        case "$tmp_libs " in
-	        *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	        esac
-              fi
-	      tmp_libs="$tmp_libs $deplib"
-	    done
-	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
-	    $echo "$modename: \`$lib' is not a convenience library" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  continue
-	fi # $pass = conv
-
-
-	# Get the name of the library we link against.
-	linklib=
-	for l in $old_library $library_names; do
-	  linklib="$l"
-	done
-	if test -z "$linklib"; then
-	  $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# This library was specified with -dlopen.
-	if test "$pass" = dlopen; then
-	  if test -z "$libdir"; then
-	    $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  if test -z "$dlname" ||
-	     test "$dlopen_support" != yes ||
-	     test "$build_libtool_libs" = no; then
-	    # If there is no dlname, no dlopen support or we're linking
-	    # statically, we need to preload.  We also need to preload any
-	    # dependent libraries so libltdl's deplib preloader doesn't
-	    # bomb out in the load deplibs phase.
-	    dlprefiles="$dlprefiles $lib $dependency_libs"
-	  else
-	    newdlfiles="$newdlfiles $lib"
-	  fi
-	  continue
-	fi # $pass = dlopen
-
-	# We need an absolute path.
-	case $ladir in
-	[\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
-	*)
-	  abs_ladir=`cd "$ladir" && pwd`
-	  if test -z "$abs_ladir"; then
-	    $echo "$modename: warning: cannot determine absolute directory name of \`$ladir'" 1>&2
-	    $echo "$modename: passing it literally to the linker, although it might fail" 1>&2
-	    abs_ladir="$ladir"
-	  fi
-	  ;;
-	esac
-	laname=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-
-	# Find the relevant object directory and library name.
-	if test "X$installed" = Xyes; then
-	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
-	    $echo "$modename: warning: library \`$lib' was moved." 1>&2
-	    dir="$ladir"
-	    absdir="$abs_ladir"
-	    libdir="$abs_ladir"
-	  else
-	    dir="$libdir"
-	    absdir="$libdir"
-	  fi
-	else
-	  dir="$ladir/$objdir"
-	  absdir="$abs_ladir/$objdir"
-	  # Remove this search path later
-	  notinst_path="$notinst_path $abs_ladir"
-	fi # $installed = yes
-	name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-
-	# This library was specified with -dlpreopen.
-	if test "$pass" = dlpreopen; then
-	  if test -z "$libdir"; then
-	    $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	  # Prefer using a static library (so that no silly _DYNAMIC symbols
-	  # are required to link).
-	  if test -n "$old_library"; then
-	    newdlprefiles="$newdlprefiles $dir/$old_library"
-	  # Otherwise, use the dlname, so that lt_dlopen finds it.
-	  elif test -n "$dlname"; then
-	    newdlprefiles="$newdlprefiles $dir/$dlname"
-	  else
-	    newdlprefiles="$newdlprefiles $dir/$linklib"
-	  fi
-	fi # $pass = dlpreopen
-
-	if test -z "$libdir"; then
-	  # Link the convenience library
-	  if test "$linkmode" = lib; then
-	    deplibs="$dir/$old_library $deplibs"
-	  elif test "$linkmode,$pass" = "prog,link"; then
-	    compile_deplibs="$dir/$old_library $compile_deplibs"
-	    finalize_deplibs="$dir/$old_library $finalize_deplibs"
-	  else
-	    deplibs="$lib $deplibs" # used for prog,scan pass
-	  fi
-	  continue
-	fi
-
-
-	if test "$linkmode" = prog && test "$pass" != link; then
-	  newlib_search_path="$newlib_search_path $ladir"
-	  deplibs="$lib $deplibs"
-
-	  linkalldeplibs=no
-	  if test "$link_all_deplibs" != no || test -z "$library_names" ||
-	     test "$build_libtool_libs" = no; then
-	    linkalldeplibs=yes
-	  fi
-
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    case $deplib in
-	    -L*) newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`;; ### testsuite: skip nested quoting test
-	    esac
-	    # Need to link against all dependency_libs?
-	    if test "$linkalldeplibs" = yes; then
-	      deplibs="$deplib $deplibs"
-	    else
-	      # Need to hardcode shared library paths
-	      # or/and link against static libraries
-	      newdependency_libs="$deplib $newdependency_libs"
-	    fi
-	    if test "X$duplicate_deps" = "Xyes" ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done # for deplib
-	  continue
-	fi # $linkmode = prog...
-
-	if test "$linkmode,$pass" = "prog,link"; then
-	  if test -n "$library_names" &&
-	     { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
-	    # We need to hardcode the library path
-	    if test -n "$shlibpath_var"; then
-	      # Make sure the rpath contains only unique directories.
-	      case "$temp_rpath " in
-	      *" $dir "*) ;;
-	      *" $absdir "*) ;;
-	      *) temp_rpath="$temp_rpath $dir" ;;
-	      esac
-	    fi
-
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
-	      esac
-	      ;;
-	    esac
-	  fi # $linkmode,$pass = prog,link...
-
-	  if test "$alldeplibs" = yes &&
-	     { test "$deplibs_check_method" = pass_all ||
-	       { test "$build_libtool_libs" = yes &&
-		 test -n "$library_names"; }; }; then
-	    # We only need to search for static libraries
-	    continue
-	  fi
-	fi
-
-	link_static=no # Whether the deplib will be linked statically
-	if test -n "$library_names" &&
-	   { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
-	  if test "$installed" = no; then
-	    notinst_deplibs="$notinst_deplibs $lib"
-	    need_relink=yes
-	  fi
-	  # This is a shared library
-
-	  # Warn about portability, can't link against -module's on
-	  # some systems (darwin)
-	  if test "$shouldnotlink" = yes && test "$pass" = link ; then
-	    $echo
-	    if test "$linkmode" = prog; then
-	      $echo "*** Warning: Linking the executable $output against the loadable module"
-	    else
-	      $echo "*** Warning: Linking the shared library $output against the loadable module"
-	    fi
-	    $echo "*** $linklib is not portable!"
-	  fi
-	  if test "$linkmode" = lib &&
-	     test "$hardcode_into_libs" = yes; then
-	    # Hardcode the library path.
-	    # Skip directories that are in the system default run-time
-	    # search path.
-	    case " $sys_lib_dlsearch_path " in
-	    *" $absdir "*) ;;
-	    *)
-	      case "$compile_rpath " in
-	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
-	      esac
-	      ;;
-	    esac
-	    case " $sys_lib_dlsearch_path " in
-	    *" $libdir "*) ;;
-	    *)
-	      case "$finalize_rpath " in
-	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
-	      esac
-	      ;;
-	    esac
-	  fi
-
-	  if test -n "$old_archive_from_expsyms_cmds"; then
-	    # figure out the soname
-	    set dummy $library_names
-	    realname="$2"
-	    shift; shift
-	    libname=`eval \\$echo \"$libname_spec\"`
-	    # use dlname if we got it. it's perfectly good, no?
-	    if test -n "$dlname"; then
-	      soname="$dlname"
-	    elif test -n "$soname_spec"; then
-	      # bleh windows
-	      case $host in
-	      *cygwin* | mingw*)
-		major=`expr $current - $age`
-		versuffix="-$major"
-		;;
-	      esac
-	      eval soname=\"$soname_spec\"
-	    else
-	      soname="$realname"
-	    fi
-
-	    # Make a new name for the extract_expsyms_cmds to use
-	    soroot="$soname"
-	    soname=`$echo $soroot | ${SED} -e 's/^.*\///'`
-	    newlib="libimp-`$echo $soname | ${SED} 's/^lib//;s/\.dll$//'`.a"
-
-	    # If the library has no export list, then create one now
-	    if test -f "$output_objdir/$soname-def"; then :
-	    else
-	      $show "extracting exported symbol list from \`$soname'"
-	      save_ifs="$IFS"; IFS='~'
-	      cmds=$extract_expsyms_cmds
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd" || exit $?
-	      done
-	      IFS="$save_ifs"
-	    fi
-
-	    # Create $newlib
-	    if test -f "$output_objdir/$newlib"; then :; else
-	      $show "generating import library for \`$soname'"
-	      save_ifs="$IFS"; IFS='~'
-	      cmds=$old_archive_from_expsyms_cmds
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd" || exit $?
-	      done
-	      IFS="$save_ifs"
-	    fi
-	    # make sure the library variables are pointing to the new library
-	    dir=$output_objdir
-	    linklib=$newlib
-	  fi # test -n "$old_archive_from_expsyms_cmds"
-
-	  if test "$linkmode" = prog || test "$mode" != relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    lib_linked=yes
-	    case $hardcode_action in
-	    immediate | unsupported)
-	      if test "$hardcode_direct" = no; then
-		add="$dir/$linklib"
-		case $host in
-		  *-*-sco3.2v5* ) add_dir="-L$dir" ;;
-		  *-*-darwin* )
-		    # if the lib is a module then we can not link against
-		    # it, someone is ignoring the new warnings I added
-		    if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then
-		      $echo "** Warning, lib $linklib is a module, not a shared library"
-		      if test -z "$old_library" ; then
-		        $echo
-		        $echo "** And there doesn't seem to be a static archive available"
-		        $echo "** The link will probably fail, sorry"
-		      else
-		        add="$dir/$old_library"
-		      fi
-		    fi
-		esac
-	      elif test "$hardcode_minus_L" = no; then
-		case $host in
-		*-*-sunos*) add_shlibpath="$dir" ;;
-		esac
-		add_dir="-L$dir"
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = no; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    relink)
-	      if test "$hardcode_direct" = yes; then
-		add="$dir/$linklib"
-	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
-		# Try looking first in the location we're being installed to.
-		if test -n "$inst_prefix_dir"; then
-		  case "$libdir" in
-		    [\\/]*)
-		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
-		      ;;
-		  esac
-		fi
-		add="-l$name"
-	      elif test "$hardcode_shlibpath_var" = yes; then
-		add_shlibpath="$dir"
-		add="-l$name"
-	      else
-		lib_linked=no
-	      fi
-	      ;;
-	    *) lib_linked=no ;;
-	    esac
-
-	    if test "$lib_linked" != yes; then
-	      $echo "$modename: configuration error: unsupported hardcode properties"
-	      exit $EXIT_FAILURE
-	    fi
-
-	    if test -n "$add_shlibpath"; then
-	      case :$compile_shlibpath: in
-	      *":$add_shlibpath:"*) ;;
-	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
-	      esac
-	    fi
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
-	      test -n "$add" && compile_deplibs="$add $compile_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	      if test "$hardcode_direct" != yes && \
-		 test "$hardcode_minus_L" != yes && \
-		 test "$hardcode_shlibpath_var" = yes; then
-		case :$finalize_shlibpath: in
-		*":$libdir:"*) ;;
-		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-		esac
-	      fi
-	    fi
-	  fi
-
-	  if test "$linkmode" = prog || test "$mode" = relink; then
-	    add_shlibpath=
-	    add_dir=
-	    add=
-	    # Finalize command for both is simple: just hardcode it.
-	    if test "$hardcode_direct" = yes; then
-	      add="$libdir/$linklib"
-	    elif test "$hardcode_minus_L" = yes; then
-	      add_dir="-L$libdir"
-	      add="-l$name"
-	    elif test "$hardcode_shlibpath_var" = yes; then
-	      case :$finalize_shlibpath: in
-	      *":$libdir:"*) ;;
-	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
-	      esac
-	      add="-l$name"
-	    elif test "$hardcode_automatic" = yes; then
-	      if test -n "$inst_prefix_dir" &&
-		 test -f "$inst_prefix_dir$libdir/$linklib" ; then
-	        add="$inst_prefix_dir$libdir/$linklib"
-	      else
-	        add="$libdir/$linklib"
-	      fi
-	    else
-	      # We cannot seem to hardcode it, guess we'll fake it.
-	      add_dir="-L$libdir"
-	      # Try looking first in the location we're being installed to.
-	      if test -n "$inst_prefix_dir"; then
-		case "$libdir" in
-		  [\\/]*)
-		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
-		    ;;
-		esac
-	      fi
-	      add="-l$name"
-	    fi
-
-	    if test "$linkmode" = prog; then
-	      test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
-	      test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
-	    else
-	      test -n "$add_dir" && deplibs="$add_dir $deplibs"
-	      test -n "$add" && deplibs="$add $deplibs"
-	    fi
-	  fi
-	elif test "$linkmode" = prog; then
-	  # Here we assume that one of hardcode_direct or hardcode_minus_L
-	  # is not unsupported.  This is valid on all known static and
-	  # shared platforms.
-	  if test "$hardcode_direct" != unsupported; then
-	    test -n "$old_library" && linklib="$old_library"
-	    compile_deplibs="$dir/$linklib $compile_deplibs"
-	    finalize_deplibs="$dir/$linklib $finalize_deplibs"
-	  else
-	    compile_deplibs="-l$name -L$dir $compile_deplibs"
-	    finalize_deplibs="-l$name -L$dir $finalize_deplibs"
-	  fi
-	elif test "$build_libtool_libs" = yes; then
-	  # Not a shared library
-	  if test "$deplibs_check_method" != pass_all; then
-	    # We're trying link a shared library against a static one
-	    # but the system doesn't support it.
-
-	    # Just print a warning and add the library to dependency_libs so
-	    # that the program can be linked against the static library.
-	    $echo
-	    $echo "*** Warning: This system can not link to static lib archive $lib."
-	    $echo "*** I have the capability to make that library automatically link in when"
-	    $echo "*** you link to this library.  But I can only do this if you have a"
-	    $echo "*** shared version of the library, which you do not appear to have."
-	    if test "$module" = yes; then
-	      $echo "*** But as you try to build a module library, libtool will still create "
-	      $echo "*** a static module, that should work as long as the dlopening application"
-	      $echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
-	      if test -z "$global_symbol_pipe"; then
-		$echo
-		$echo "*** However, this would only work if libtool was able to extract symbol"
-		$echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-		$echo "*** not find such a program.  So, this module is probably useless."
-		$echo "*** \`nm' from GNU binutils and a full rebuild may help."
-	      fi
-	      if test "$build_old_libs" = no; then
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  else
-	    convenience="$convenience $dir/$old_library"
-	    old_convenience="$old_convenience $dir/$old_library"
-	    deplibs="$dir/$old_library $deplibs"
-	    link_static=yes
-	  fi
-	fi # link shared/static library?
-
-	if test "$linkmode" = lib; then
-	  if test -n "$dependency_libs" &&
-	     { test "$hardcode_into_libs" != yes ||
-	       test "$build_old_libs" = yes ||
-	       test "$link_static" = yes; }; then
-	    # Extract -R from dependency_libs
-	    temp_deplibs=
-	    for libdir in $dependency_libs; do
-	      case $libdir in
-	      -R*) temp_xrpath=`$echo "X$libdir" | $Xsed -e 's/^-R//'`
-		   case " $xrpath " in
-		   *" $temp_xrpath "*) ;;
-		   *) xrpath="$xrpath $temp_xrpath";;
-		   esac;;
-	      *) temp_deplibs="$temp_deplibs $libdir";;
-	      esac
-	    done
-	    dependency_libs="$temp_deplibs"
-	  fi
-
-	  newlib_search_path="$newlib_search_path $absdir"
-	  # Link against this library
-	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
-	  # ... and its dependency_libs
-	  tmp_libs=
-	  for deplib in $dependency_libs; do
-	    newdependency_libs="$deplib $newdependency_libs"
-	    if test "X$duplicate_deps" = "Xyes" ; then
-	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
-	      esac
-	    fi
-	    tmp_libs="$tmp_libs $deplib"
-	  done
-
-	  if test "$link_all_deplibs" != no; then
-	    # Add the search paths of all dependency libraries
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      -L*) path="$deplib" ;;
-	      *.la)
-		dir=`$echo "X$deplib" | $Xsed -e 's%/[^/]*$%%'`
-		test "X$dir" = "X$deplib" && dir="."
-		# We need an absolute path.
-		case $dir in
-		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
-		*)
-		  absdir=`cd "$dir" && pwd`
-		  if test -z "$absdir"; then
-		    $echo "$modename: warning: cannot determine absolute directory name of \`$dir'" 1>&2
-		    absdir="$dir"
-		  fi
-		  ;;
-		esac
-		if grep "^installed=no" $deplib > /dev/null; then
-		  path="$absdir/$objdir"
-		else
-		  eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		  if test -z "$libdir"; then
-		    $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-		    exit $EXIT_FAILURE
-		  fi
-		  if test "$absdir" != "$libdir"; then
-		    $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
-		  fi
-		  path="$absdir"
-		fi
-		depdepl=
-		case $host in
-		*-*-darwin*)
-		  # we do not want to link against static libs,
-		  # but need to link against shared
-		  eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
-		  if test -n "$deplibrary_names" ; then
-		    for tmp in $deplibrary_names ; do
-		      depdepl=$tmp
-		    done
-		    if test -f "$path/$depdepl" ; then
-		      depdepl="$path/$depdepl"
-		    fi
-		    # do not add paths which are already there
-		    case " $newlib_search_path " in
-		    *" $path "*) ;;
-		    *) newlib_search_path="$newlib_search_path $path";;
-		    esac
-		  fi
-		  path=""
-		  ;;
-		*)
-		  path="-L$path"
-		  ;;
-		esac
-		;;
-	      -l*)
-		case $host in
-		*-*-darwin*)
-		  # Again, we only want to link against shared libraries
-		  eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
-		  for tmp in $newlib_search_path ; do
-		    if test -f "$tmp/lib$tmp_libs.dylib" ; then
-		      eval depdepl="$tmp/lib$tmp_libs.dylib"
-		      break
-		    fi
-		  done
-		  path=""
-		  ;;
-		*) continue ;;
-		esac
-		;;
-	      *) continue ;;
-	      esac
-	      case " $deplibs " in
-	      *" $depdepl "*) ;;
-	      *) deplibs="$depdepl $deplibs" ;;
-	      esac
-	      case " $deplibs " in
-	      *" $path "*) ;;
-	      *) deplibs="$deplibs $path" ;;
-	      esac
-	    done
-	  fi # link_all_deplibs != no
-	fi # linkmode = lib
-      done # for deplib in $libs
-      dependency_libs="$newdependency_libs"
-      if test "$pass" = dlpreopen; then
-	# Link the dlpreopened libraries before other libraries
-	for deplib in $save_deplibs; do
-	  deplibs="$deplib $deplibs"
-	done
-      fi
-      if test "$pass" != dlopen; then
-	if test "$pass" != conv; then
-	  # Make sure lib_search_path contains only unique directories.
-	  lib_search_path=
-	  for dir in $newlib_search_path; do
-	    case "$lib_search_path " in
-	    *" $dir "*) ;;
-	    *) lib_search_path="$lib_search_path $dir" ;;
-	    esac
-	  done
-	  newlib_search_path=
-	fi
-
-	if test "$linkmode,$pass" != "prog,link"; then
-	  vars="deplibs"
-	else
-	  vars="compile_deplibs finalize_deplibs"
-	fi
-	for var in $vars dependency_libs; do
-	  # Add libraries to $var in reverse order
-	  eval tmp_libs=\"\$$var\"
-	  new_libs=
-	  for deplib in $tmp_libs; do
-	    # FIXME: Pedantically, this is the right thing to do, so
-	    #        that some nasty dependency loop isn't accidentally
-	    #        broken:
-	    #new_libs="$deplib $new_libs"
-	    # Pragmatically, this seems to cause very few problems in
-	    # practice:
-	    case $deplib in
-	    -L*) new_libs="$deplib $new_libs" ;;
-	    -R*) ;;
-	    *)
-	      # And here is the reason: when a library appears more
-	      # than once as an explicit dependence of a library, or
-	      # is implicitly linked in more than once by the
-	      # compiler, it is considered special, and multiple
-	      # occurrences thereof are not removed.  Compare this
-	      # with having the same library being listed as a
-	      # dependency of multiple other libraries: in this case,
-	      # we know (pedantically, we assume) the library does not
-	      # need to be listed more than once, so we keep only the
-	      # last copy.  This is not always right, but it is rare
-	      # enough that we require users that really mean to play
-	      # such unportable linking tricks to link the library
-	      # using -Wl,-lname, so that libtool does not consider it
-	      # for duplicate removal.
-	      case " $specialdeplibs " in
-	      *" $deplib "*) new_libs="$deplib $new_libs" ;;
-	      *)
-		case " $new_libs " in
-		*" $deplib "*) ;;
-		*) new_libs="$deplib $new_libs" ;;
-		esac
-		;;
-	      esac
-	      ;;
-	    esac
-	  done
-	  tmp_libs=
-	  for deplib in $new_libs; do
-	    case $deplib in
-	    -L*)
-	      case " $tmp_libs " in
-	      *" $deplib "*) ;;
-	      *) tmp_libs="$tmp_libs $deplib" ;;
-	      esac
-	      ;;
-	    *) tmp_libs="$tmp_libs $deplib" ;;
-	    esac
-	  done
-	  eval $var=\"$tmp_libs\"
-	done # for var
-      fi
-      # Last step: remove runtime libs from dependency_libs
-      # (they stay in deplibs)
-      tmp_libs=
-      for i in $dependency_libs ; do
-	case " $predeps $postdeps $compiler_lib_search_path " in
-	*" $i "*)
-	  i=""
-	  ;;
-	esac
-	if test -n "$i" ; then
-	  tmp_libs="$tmp_libs $i"
-	fi
-      done
-      dependency_libs=$tmp_libs
-    done # for pass
-    if test "$linkmode" = prog; then
-      dlfiles="$newdlfiles"
-      dlprefiles="$newdlprefiles"
-    fi
-
-    case $linkmode in
-    oldlib)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for archives" 1>&2
-      fi
-
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$rpath"; then
-	$echo "$modename: warning: \`-rpath' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$xrpath"; then
-	$echo "$modename: warning: \`-R' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info/-version-number' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for archives" 1>&2
-      fi
-
-      if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
-	$echo "$modename: warning: \`-export-symbols' is ignored for archives" 1>&2
-      fi
-
-      # Now set the variables for building old libraries.
-      build_libtool_libs=no
-      oldlibs="$output"
-      objs="$objs$old_deplibs"
-      ;;
-
-    lib)
-      # Make sure we only generate libraries of the form `libNAME.la'.
-      case $outputname in
-      lib*)
-	name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
-	eval shared_ext=\"$shrext_cmds\"
-	eval libname=\"$libname_spec\"
-	;;
-      *)
-	if test "$module" = no; then
-	  $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-	if test "$need_lib_prefix" != no; then
-	  # Add the "lib" prefix for modules if required
-	  name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-	  eval shared_ext=\"$shrext_cmds\"
-	  eval libname=\"$libname_spec\"
-	else
-	  libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
-	fi
-	;;
-      esac
-
-      if test -n "$objs"; then
-	if test "$deplibs_check_method" != pass_all; then
-	  $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
-	  exit $EXIT_FAILURE
-	else
-	  $echo
-	  $echo "*** Warning: Linking the shared library $output against the non-libtool"
-	  $echo "*** objects $objs is not portable!"
-	  libobjs="$libobjs $objs"
-	fi
-      fi
-
-      if test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen self' is ignored for libtool libraries" 1>&2
-      fi
-
-      set dummy $rpath
-      if test "$#" -gt 2; then
-	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
-      fi
-      install_libdir="$2"
-
-      oldlibs=
-      if test -z "$rpath"; then
-	if test "$build_libtool_libs" = yes; then
-	  # Building a libtool convenience library.
-	  # Some compilers have problems with a `.al' extension so
-	  # convenience libraries should have the same extension an
-	  # archive normally would.
-	  oldlibs="$output_objdir/$libname.$libext $oldlibs"
-	  build_libtool_libs=convenience
-	  build_old_libs=yes
-	fi
-
-	if test -n "$vinfo"; then
-	  $echo "$modename: warning: \`-version-info/-version-number' is ignored for convenience libraries" 1>&2
-	fi
-
-	if test -n "$release"; then
-	  $echo "$modename: warning: \`-release' is ignored for convenience libraries" 1>&2
-	fi
-      else
-
-	# Parse the version information argument.
-	save_ifs="$IFS"; IFS=':'
-	set dummy $vinfo 0 0 0
-	IFS="$save_ifs"
-
-	if test -n "$8"; then
-	  $echo "$modename: too many parameters to \`-version-info'" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# convert absolute version numbers to libtool ages
-	# this retains compatibility with .la files and attempts
-	# to make the code below a bit more comprehensible
-
-	case $vinfo_number in
-	yes)
-	  number_major="$2"
-	  number_minor="$3"
-	  number_revision="$4"
-	  #
-	  # There are really only two kinds -- those that
-	  # use the current revision as the major version
-	  # and those that subtract age and use age as
-	  # a minor version.  But, then there is irix
-	  # which has an extra 1 added just for fun
-	  #
-	  case $version_type in
-	  darwin|linux|osf|windows)
-	    current=`expr $number_major + $number_minor`
-	    age="$number_minor"
-	    revision="$number_revision"
-	    ;;
-	  freebsd-aout|freebsd-elf|sunos)
-	    current="$number_major"
-	    revision="$number_minor"
-	    age="0"
-	    ;;
-	  irix|nonstopux)
-	    current=`expr $number_major + $number_minor - 1`
-	    age="$number_minor"
-	    revision="$number_minor"
-	    ;;
-	  *)
-	    $echo "$modename: unknown library version type \`$version_type'" 1>&2
-	    $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-	    exit $EXIT_FAILURE
-	    ;;
-	  esac
-	  ;;
-	no)
-	  current="$2"
-	  revision="$3"
-	  age="$4"
-	  ;;
-	esac
-
-	# Check that each of the things are valid numbers.
-	case $current in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	case $revision in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	case $age in
-	0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
-	*)
-	  $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	if test "$age" -gt "$current"; then
-	  $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
-	  $echo "$modename: \`$vinfo' is not valid version information" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# Calculate the version variables.
-	major=
-	versuffix=
-	verstring=
-	case $version_type in
-	none) ;;
-
-	darwin)
-	  # Like Linux, but with the current version available in
-	  # verstring for coding it into the library header
-	  major=.`expr $current - $age`
-	  versuffix="$major.$age.$revision"
-	  # Darwin ld doesn't like 0 for these options...
-	  minor_current=`expr $current + 1`
-	  verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
-	  ;;
-
-	freebsd-aout)
-	  major=".$current"
-	  versuffix=".$current.$revision";
-	  ;;
-
-	freebsd-elf)
-	  major=".$current"
-	  versuffix=".$current";
-	  ;;
-
-	irix | nonstopux)
-	  major=`expr $current - $age + 1`
-
-	  case $version_type in
-	    nonstopux) verstring_prefix=nonstopux ;;
-	    *)         verstring_prefix=sgi ;;
-	  esac
-	  verstring="$verstring_prefix$major.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$revision
-	  while test "$loop" -ne 0; do
-	    iface=`expr $revision - $loop`
-	    loop=`expr $loop - 1`
-	    verstring="$verstring_prefix$major.$iface:$verstring"
-	  done
-
-	  # Before this point, $major must not contain `.'.
-	  major=.$major
-	  versuffix="$major.$revision"
-	  ;;
-
-	linux)
-	  major=.`expr $current - $age`
-	  versuffix="$major.$age.$revision"
-	  ;;
-
-	osf)
-	  major=.`expr $current - $age`
-	  versuffix=".$current.$age.$revision"
-	  verstring="$current.$age.$revision"
-
-	  # Add in all the interfaces that we are compatible with.
-	  loop=$age
-	  while test "$loop" -ne 0; do
-	    iface=`expr $current - $loop`
-	    loop=`expr $loop - 1`
-	    verstring="$verstring:${iface}.0"
-	  done
-
-	  # Make executables depend on our current version.
-	  verstring="$verstring:${current}.0"
-	  ;;
-
-	sunos)
-	  major=".$current"
-	  versuffix=".$current.$revision"
-	  ;;
-
-	windows)
-	  # Use '-' rather than '.', since we only want one
-	  # extension on DOS 8.3 filesystems.
-	  major=`expr $current - $age`
-	  versuffix="-$major"
-	  ;;
-
-	*)
-	  $echo "$modename: unknown library version type \`$version_type'" 1>&2
-	  $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	# Clear the version info if we defaulted, and they specified a release.
-	if test -z "$vinfo" && test -n "$release"; then
-	  major=
-	  case $version_type in
-	  darwin)
-	    # we can't check for "0.0" in archive_cmds due to quoting
-	    # problems, so we reset it completely
-	    verstring=
-	    ;;
-	  *)
-	    verstring="0.0"
-	    ;;
-	  esac
-	  if test "$need_version" = no; then
-	    versuffix=
-	  else
-	    versuffix=".0.0"
-	  fi
-	fi
-
-	# Remove version info from name if versioning should be avoided
-	if test "$avoid_version" = yes && test "$need_version" = no; then
-	  major=
-	  versuffix=
-	  verstring=""
-	fi
-
-	# Check to see if the archive will have undefined symbols.
-	if test "$allow_undefined" = yes; then
-	  if test "$allow_undefined_flag" = unsupported; then
-	    $echo "$modename: warning: undefined symbols not allowed in $host shared libraries" 1>&2
-	    build_libtool_libs=no
-	    build_old_libs=yes
-	  fi
-	else
-	  # Don't allow undefined symbols.
-	  allow_undefined_flag="$no_undefined_flag"
-	fi
-      fi
-
-      if test "$mode" != relink; then
-	# Remove our outputs, but don't remove object files since they
-	# may have been created when compiling PIC objects.
-	removelist=
-	tempremovelist=`$echo "$output_objdir/*"`
-	for p in $tempremovelist; do
-	  case $p in
-	    *.$objext)
-	       ;;
-	    $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
-	       if test "X$precious_files_regex" != "X"; then
-	         if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
-	         then
-		   continue
-		 fi
-	       fi
-	       removelist="$removelist $p"
-	       ;;
-	    *) ;;
-	  esac
-	done
-	if test -n "$removelist"; then
-	  $show "${rm}r $removelist"
-	  $run ${rm}r $removelist
-	fi
-      fi
-
-      # Now set the variables for building old libraries.
-      if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-	oldlibs="$oldlibs $output_objdir/$libname.$libext"
-
-	# Transform .lo files to .o files.
-	oldobjs="$objs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
-      fi
-
-      # Eliminate all temporary directories.
-      for path in $notinst_path; do
-	lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
-	deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
-	dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
-      done
-
-      if test -n "$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	temp_xrpath=
-	for libdir in $xrpath; do
-	  temp_xrpath="$temp_xrpath -R$libdir"
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-	  esac
-	done
-	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
-	  dependency_libs="$temp_xrpath $dependency_libs"
-	fi
-      fi
-
-      # Make sure dlfiles contains only unique files that won't be dlpreopened
-      old_dlfiles="$dlfiles"
-      dlfiles=
-      for lib in $old_dlfiles; do
-	case " $dlprefiles $dlfiles " in
-	*" $lib "*) ;;
-	*) dlfiles="$dlfiles $lib" ;;
-	esac
-      done
-
-      # Make sure dlprefiles contains only unique files
-      old_dlprefiles="$dlprefiles"
-      dlprefiles=
-      for lib in $old_dlprefiles; do
-	case "$dlprefiles " in
-	*" $lib "*) ;;
-	*) dlprefiles="$dlprefiles $lib" ;;
-	esac
-      done
-
-      if test "$build_libtool_libs" = yes; then
-	if test -n "$rpath"; then
-	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos*)
-	    # these systems don't actually have a c library (as such)!
-	    ;;
-	  *-*-rhapsody* | *-*-darwin1.[012])
-	    # Rhapsody C library is in the System framework
-	    deplibs="$deplibs -framework System"
-	    ;;
-	  *-*-netbsd*)
-	    # Don't link with libc until the a.out ld.so is fixed.
-	    ;;
-	  *-*-openbsd* | *-*-freebsd*)
-	    # Do not include libc due to us having libc/libc_r.
-	    test "X$arg" = "X-lc" && continue
-	    ;;
- 	  *)
-	    # Add libc to deplibs on all other systems if necessary.
-	    if test "$build_libtool_need_lc" = "yes"; then
-	      deplibs="$deplibs -lc"
-	    fi
-	    ;;
-	  esac
-	fi
-
-	# Transform deplibs into only deplibs that can be linked in shared.
-	name_save=$name
-	libname_save=$libname
-	release_save=$release
-	versuffix_save=$versuffix
-	major_save=$major
-	# I'm not sure if I'm treating the release correctly.  I think
-	# release should show up in the -l (ie -lgmp5) so we don't want to
-	# add it in twice.  Is that correct?
-	release=""
-	versuffix=""
-	major=""
-	newdeplibs=
-	droppeddeps=no
-	case $deplibs_check_method in
-	pass_all)
-	  # Don't check for shared/static.  Everything works.
-	  # This might be a little naive.  We might want to check
-	  # whether the library exists or not.  But this is on
-	  # osf3 & osf4 and I'm not really sure... Just
-	  # implementing what was already the behavior.
-	  newdeplibs=$deplibs
-	  ;;
-	test_compile)
-	  # This code stresses the "libraries are programs" paradigm to its
-	  # limits. Maybe even breaks it.  We compile a program, linking it
-	  # against the deplibs as a proxy for the library.  Then we can check
-	  # whether they linked in statically or dynamically with ldd.
-	  $rm conftest.c
-	  cat > conftest.c <<EOF
-	  int main() { return 0; }
-EOF
-	  $rm conftest
-	  $LTCC -o conftest conftest.c $deplibs
-	  if test "$?" -eq 0 ; then
-	    ldd_output=`ldd conftest`
-	    for i in $deplibs; do
-	      name="`expr $i : '-l\(.*\)'`"
-	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" -ne "0"; then
-		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		  case " $predeps $postdeps " in
-		  *" $i "*)
-		    newdeplibs="$newdeplibs $i"
-		    i=""
-		    ;;
-		  esac
-	        fi
-		if test -n "$i" ; then
-		  libname=`eval \\$echo \"$libname_spec\"`
-		  deplib_matches=`eval \\$echo \"$library_names_spec\"`
-		  set dummy $deplib_matches
-		  deplib_match=$2
-		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		    newdeplibs="$newdeplibs $i"
-		  else
-		    droppeddeps=yes
-		    $echo
-		    $echo "*** Warning: dynamic linker does not accept needed library $i."
-		    $echo "*** I have the capability to make that library automatically link in when"
-		    $echo "*** you link to this library.  But I can only do this if you have a"
-		    $echo "*** shared version of the library, which I believe you do not have"
-		    $echo "*** because a test_compile did reveal that the linker did not use it for"
-		    $echo "*** its dynamic dependency list that programs get resolved with at runtime."
-		  fi
-		fi
-	      else
-		newdeplibs="$newdeplibs $i"
-	      fi
-	    done
-	  else
-	    # Error occurred in the first compile.  Let's try to salvage
-	    # the situation: Compile a separate program for each library.
-	    for i in $deplibs; do
-	      name="`expr $i : '-l\(.*\)'`"
-	      # If $name is empty we are operating on a -L argument.
-              if test "$name" != "" && test "$name" != "0"; then
-		$rm conftest
-		$LTCC -o conftest conftest.c $i
-		# Did it work?
-		if test "$?" -eq 0 ; then
-		  ldd_output=`ldd conftest`
-		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		    case " $predeps $postdeps " in
-		    *" $i "*)
-		      newdeplibs="$newdeplibs $i"
-		      i=""
-		      ;;
-		    esac
-		  fi
-		  if test -n "$i" ; then
-		    libname=`eval \\$echo \"$libname_spec\"`
-		    deplib_matches=`eval \\$echo \"$library_names_spec\"`
-		    set dummy $deplib_matches
-		    deplib_match=$2
-		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		      newdeplibs="$newdeplibs $i"
-		    else
-		      droppeddeps=yes
-		      $echo
-		      $echo "*** Warning: dynamic linker does not accept needed library $i."
-		      $echo "*** I have the capability to make that library automatically link in when"
-		      $echo "*** you link to this library.  But I can only do this if you have a"
-		      $echo "*** shared version of the library, which you do not appear to have"
-		      $echo "*** because a test_compile did reveal that the linker did not use this one"
-		      $echo "*** as a dynamic dependency that programs can get resolved with at runtime."
-		    fi
-		  fi
-		else
-		  droppeddeps=yes
-		  $echo
-		  $echo "*** Warning!  Library $i is needed by this library but I was not able to"
-		  $echo "***  make it link in!  You will probably need to install it or some"
-		  $echo "*** library that it depends on before this library will be fully"
-		  $echo "*** functional.  Installing it before continuing would be even better."
-		fi
-	      else
-		newdeplibs="$newdeplibs $i"
-	      fi
-	    done
-	  fi
-	  ;;
-	file_magic*)
-	  set dummy $deplibs_check_method
-	  file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    name="`expr $a_deplib : '-l\(.*\)'`"
-	    # If $name is empty we are operating on a -L argument.
-            if test "$name" != "" && test  "$name" != "0"; then
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval \\$echo \"$libname_spec\"`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		      # Follow soft links.
-		      if ls -lLd "$potent_lib" 2>/dev/null \
-			 | grep " -> " >/dev/null; then
-			continue
-		      fi
-		      # The statement above tries to avoid entering an
-		      # endless loop below, in case of cyclic links.
-		      # We might still enter an endless loop, since a link
-		      # loop can be closed while we follow links,
-		      # but so what?
-		      potlib="$potent_lib"
-		      while test -h "$potlib" 2>/dev/null; do
-			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
-			case $potliblink in
-			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-			*) potlib=`$echo "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
-			esac
-		      done
-		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null \
-			 | ${SED} 10q \
-			 | $EGREP "$file_magic_regex" > /dev/null; then
-			newdeplibs="$newdeplibs $a_deplib"
-			a_deplib=""
-			break 2
-		      fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		$echo
-		$echo "*** Warning: linker path does not have real file for library $a_deplib."
-		$echo "*** I have the capability to make that library automatically link in when"
-		$echo "*** you link to this library.  But I can only do this if you have a"
-		$echo "*** shared version of the library, which you do not appear to have"
-		$echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $echo "*** with $libname but no candidates were found. (...for file magic test)"
-		else
-		  $echo "*** with $libname and none of the candidates passed a file format test"
-		  $echo "*** using a file magic. Last file checked: $potlib"
-		fi
-	      fi
-	    else
-	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	    fi
-	  done # Gone through all deplibs.
-	  ;;
-	match_pattern*)
-	  set dummy $deplibs_check_method
-	  match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
-	  for a_deplib in $deplibs; do
-	    name="`expr $a_deplib : '-l\(.*\)'`"
-	    # If $name is empty we are operating on a -L argument.
-	    if test -n "$name" && test "$name" != "0"; then
-	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-		case " $predeps $postdeps " in
-		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
-		  a_deplib=""
-		  ;;
-		esac
-	      fi
-	      if test -n "$a_deplib" ; then
-		libname=`eval \\$echo \"$libname_spec\"`
-		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
-		  for potent_lib in $potential_libs; do
-		    potlib="$potent_lib" # see symlink-check above in file_magic test
-		    if eval $echo \"$potent_lib\" 2>/dev/null \
-		        | ${SED} 10q \
-		        | $EGREP "$match_pattern_regex" > /dev/null; then
-		      newdeplibs="$newdeplibs $a_deplib"
-		      a_deplib=""
-		      break 2
-		    fi
-		  done
-		done
-	      fi
-	      if test -n "$a_deplib" ; then
-		droppeddeps=yes
-		$echo
-		$echo "*** Warning: linker path does not have real file for library $a_deplib."
-		$echo "*** I have the capability to make that library automatically link in when"
-		$echo "*** you link to this library.  But I can only do this if you have a"
-		$echo "*** shared version of the library, which you do not appear to have"
-		$echo "*** because I did check the linker path looking for a file starting"
-		if test -z "$potlib" ; then
-		  $echo "*** with $libname but no candidates were found. (...for regex pattern test)"
-		else
-		  $echo "*** with $libname and none of the candidates passed a file format test"
-		  $echo "*** using a regex pattern. Last file checked: $potlib"
-		fi
-	      fi
-	    else
-	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
-	    fi
-	  done # Gone through all deplibs.
-	  ;;
-	none | unknown | *)
-	  newdeplibs=""
-	  tmp_deplibs=`$echo "X $deplibs" | $Xsed -e 's/ -lc$//' \
-	    -e 's/ -[LR][^ ]*//g'`
-	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
-	    for i in $predeps $postdeps ; do
-	      # can't use Xsed below, because $i might contain '/'
-	      tmp_deplibs=`$echo "X $tmp_deplibs" | ${SED} -e "1s,^X,," -e "s,$i,,"`
-	    done
-	  fi
-	  if $echo "X $tmp_deplibs" | $Xsed -e 's/[ 	]//g' \
-	    | grep . >/dev/null; then
-	    $echo
-	    if test "X$deplibs_check_method" = "Xnone"; then
-	      $echo "*** Warning: inter-library dependencies are not supported in this platform."
-	    else
-	      $echo "*** Warning: inter-library dependencies are not known to be supported."
-	    fi
-	    $echo "*** All declared inter-library dependencies are being dropped."
-	    droppeddeps=yes
-	  fi
-	  ;;
-	esac
-	versuffix=$versuffix_save
-	major=$major_save
-	release=$release_save
-	libname=$libname_save
-	name=$name_save
-
-	case $host in
-	*-*-rhapsody* | *-*-darwin1.[012])
-	  # On Rhapsody replace the C library is the System framework
-	  newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	  ;;
-	esac
-
-	if test "$droppeddeps" = yes; then
-	  if test "$module" = yes; then
-	    $echo
-	    $echo "*** Warning: libtool could not satisfy all declared inter-library"
-	    $echo "*** dependencies of module $libname.  Therefore, libtool will create"
-	    $echo "*** a static module, that should work as long as the dlopening"
-	    $echo "*** application is linked with the -dlopen flag."
-	    if test -z "$global_symbol_pipe"; then
-	      $echo
-	      $echo "*** However, this would only work if libtool was able to extract symbol"
-	      $echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
-	      $echo "*** not find such a program.  So, this module is probably useless."
-	      $echo "*** \`nm' from GNU binutils and a full rebuild may help."
-	    fi
-	    if test "$build_old_libs" = no; then
-	      oldlibs="$output_objdir/$libname.$libext"
-	      build_libtool_libs=module
-	      build_old_libs=yes
-	    else
-	      build_libtool_libs=no
-	    fi
-	  else
-	    $echo "*** The inter-library dependencies that have been dropped here will be"
-	    $echo "*** automatically added whenever a program is linked with this library"
-	    $echo "*** or is declared to -dlopen it."
-
-	    if test "$allow_undefined" = no; then
-	      $echo
-	      $echo "*** Since this library must not contain undefined symbols,"
-	      $echo "*** because either the platform does not support them or"
-	      $echo "*** it was explicitly requested with -no-undefined,"
-	      $echo "*** libtool will only create a static version of it."
-	      if test "$build_old_libs" = no; then
-		oldlibs="$output_objdir/$libname.$libext"
-		build_libtool_libs=module
-		build_old_libs=yes
-	      else
-		build_libtool_libs=no
-	      fi
-	    fi
-	  fi
-	fi
-	# Done checking deplibs!
-	deplibs=$newdeplibs
-      fi
-
-      # All the library-specific variables (install_libdir is set above).
-      library_names=
-      old_library=
-      dlname=
-
-      # Test again, we may have decided not to build it any more
-      if test "$build_libtool_libs" = yes; then
-	if test "$hardcode_into_libs" = yes; then
-	  # Hardcode the library paths
-	  hardcode_libdirs=
-	  dep_rpath=
-	  rpath="$finalize_rpath"
-	  test "$mode" != relink && rpath="$compile_rpath$rpath"
-	  for libdir in $rpath; do
-	    if test -n "$hardcode_libdir_flag_spec"; then
-	      if test -n "$hardcode_libdir_separator"; then
-		if test -z "$hardcode_libdirs"; then
-		  hardcode_libdirs="$libdir"
-		else
-		  # Just accumulate the unique libdirs.
-		  case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		    ;;
-		  *)
-		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		    ;;
-		  esac
-		fi
-	      else
-		eval flag=\"$hardcode_libdir_flag_spec\"
-		dep_rpath="$dep_rpath $flag"
-	      fi
-	    elif test -n "$runpath_var"; then
-	      case "$perm_rpath " in
-	      *" $libdir "*) ;;
-	      *) perm_rpath="$perm_rpath $libdir" ;;
-	      esac
-	    fi
-	  done
-	  # Substitute the hardcoded libdirs into the rpath.
-	  if test -n "$hardcode_libdir_separator" &&
-	     test -n "$hardcode_libdirs"; then
-	    libdir="$hardcode_libdirs"
-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
-	  fi
-	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
-	    # We should set the runpath_var.
-	    rpath=
-	    for dir in $perm_rpath; do
-	      rpath="$rpath$dir:"
-	    done
-	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
-	  fi
-	  test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
-	fi
-
-	shlibpath="$finalize_shlibpath"
-	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
-	if test -n "$shlibpath"; then
-	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
-	fi
-
-	# Get the real and link names of the library.
-	eval shared_ext=\"$shrext_cmds\"
-	eval library_names=\"$library_names_spec\"
-	set dummy $library_names
-	realname="$2"
-	shift; shift
-
-	if test -n "$soname_spec"; then
-	  eval soname=\"$soname_spec\"
-	else
-	  soname="$realname"
-	fi
-	if test -z "$dlname"; then
-	  dlname=$soname
-	fi
-
-	lib="$output_objdir/$realname"
-	for link
-	do
-	  linknames="$linknames $link"
-	done
-
-	# Use standard objects if they are pic
-	test -z "$pic_flag" && libobjs=`$echo "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-
-	# Prepare the list of exported symbols
-	if test -z "$export_symbols"; then
-	  if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
-	    $show "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $run $rm $export_symbols
-	    cmds=$export_symbols_cmds
-	    save_ifs="$IFS"; IFS='~'
-	    for cmd in $cmds; do
-	      IFS="$save_ifs"
-	      eval cmd=\"$cmd\"
-	      if len=`expr "X$cmd" : ".*"` &&
-	       test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	        $show "$cmd"
-	        $run eval "$cmd" || exit $?
-	        skipped_export=false
-	      else
-	        # The command line is too long to execute in one step.
-	        $show "using reloadable object file for export list..."
-	        skipped_export=:
-	      fi
-	    done
-	    IFS="$save_ifs"
-	    if test -n "$export_symbols_regex"; then
-	      $show "$EGREP -e \"$export_symbols_regex\" \"$export_symbols\" > \"${export_symbols}T\""
-	      $run eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
-	      $show "$mv \"${export_symbols}T\" \"$export_symbols\""
-	      $run eval '$mv "${export_symbols}T" "$export_symbols"'
-	    fi
-	  fi
-	fi
-
-	if test -n "$export_symbols" && test -n "$include_expsyms"; then
-	  $run eval '$echo "X$include_expsyms" | $SP2NL >> "$export_symbols"'
-	fi
-
-	tmp_deplibs=
-	for test_deplib in $deplibs; do
-		case " $convenience " in
-		*" $test_deplib "*) ;;
-		*)
-			tmp_deplibs="$tmp_deplibs $test_deplib"
-			;;
-		esac
-	done
-	deplibs="$tmp_deplibs"
-
-	if test -n "$convenience"; then
-	  if test -n "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	  else
-	    gentop="$output_objdir/${outputname}x"
-	    $show "${rm}r $gentop"
-	    $run ${rm}r "$gentop"
-	    $show "$mkdir $gentop"
-	    $run $mkdir "$gentop"
-	    status=$?
-	    if test "$status" -ne 0 && test ! -d "$gentop"; then
-	      exit $status
-	    fi
-	    generated="$generated $gentop"
-
-	    for xlib in $convenience; do
-	      # Extract the objects.
-	      case $xlib in
-	      [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-	      *) xabs=`pwd`"/$xlib" ;;
-	      esac
-	      xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-	      xdir="$gentop/$xlib"
-
-	      $show "${rm}r $xdir"
-	      $run ${rm}r "$xdir"
-	      $show "$mkdir $xdir"
-	      $run $mkdir "$xdir"
-	      status=$?
-	      if test "$status" -ne 0 && test ! -d "$xdir"; then
-		exit $status
-	      fi
-	      # We will extract separately just the conflicting names and we will no
-	      # longer touch any unique names. It is faster to leave these extract
-	      # automatically by $AR in one run.
-	      $show "(cd $xdir && $AR x $xabs)"
-	      $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-	      if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
-		:
-	      else
-		$echo "$modename: warning: object name conflicts; renaming object files" 1>&2
-		$echo "$modename: warning: to ensure that they will not overwrite" 1>&2
-		$AR t "$xabs" | sort | uniq -cd | while read -r count name
-		do
-		  i=1
-		  while test "$i" -le "$count"
-		  do
-		   # Put our $i before any first dot (extension)
-		   # Never overwrite any file
-		   name_to="$name"
-		   while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
-		   do
-		     name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
-		   done
-		   $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
-		   $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
-		   i=`expr $i + 1`
-		  done
-		done
-	      fi
-
-	      libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-	    done
-	  fi
-	fi
-
-	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
-	  eval flag=\"$thread_safe_flag_spec\"
-	  linker_flags="$linker_flags $flag"
-	fi
-
-	# Make a backup of the uninstalled library when relinking
-	if test "$mode" = relink; then
-	  $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
-	fi
-
-	# Do each of the archive commands.
-	if test "$module" = yes && test -n "$module_cmds" ; then
-	  if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	    eval test_cmds=\"$module_expsym_cmds\"
-	    cmds=$module_expsym_cmds
-	  else
-	    eval test_cmds=\"$module_cmds\"
-	    cmds=$module_cmds
-	  fi
-	else
-	if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	  eval test_cmds=\"$archive_expsym_cmds\"
-	  cmds=$archive_expsym_cmds
-	else
-	  eval test_cmds=\"$archive_cmds\"
-	  cmds=$archive_cmds
-	  fi
-	fi
-
-	if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` &&
-	   test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  :
-	else
-	  # The command line is too long to link in one step, link piecewise.
-	  $echo "creating reloadable object files..."
-
-	  # Save the value of $output and $libobjs because we want to
-	  # use them later.  If we have whole_archive_flag_spec, we
-	  # want to use save_libobjs as it was before
-	  # whole_archive_flag_spec was expanded, because we can't
-	  # assume the linker understands whole_archive_flag_spec.
-	  # This may have to be revisited, in case too many
-	  # convenience libraries get linked in and end up exceeding
-	  # the spec.
-	  if test -z "$convenience" || test -z "$whole_archive_flag_spec"; then
-	    save_libobjs=$libobjs
-	  fi
-	  save_output=$output
-
-	  # Clear the reloadable object creation command queue and
-	  # initialize k to one.
-	  test_cmds=
-	  concat_cmds=
-	  objlist=
-	  delfiles=
-	  last_robj=
-	  k=1
-	  output=$output_objdir/$save_output-${k}.$objext
-	  # Loop over the list of objects to be linked.
-	  for obj in $save_libobjs
-	  do
-	    eval test_cmds=\"$reload_cmds $objlist $last_robj\"
-	    if test "X$objlist" = X ||
-	       { len=`expr "X$test_cmds" : ".*"` &&
-		 test "$len" -le "$max_cmd_len"; }; then
-	      objlist="$objlist $obj"
-	    else
-	      # The command $test_cmds is almost too long, add a
-	      # command to the queue.
-	      if test "$k" -eq 1 ; then
-		# The first file doesn't have a previous command to add.
-		eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
-	      else
-		# All subsequent reloadable object files will link in
-		# the last one created.
-		eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
-	      fi
-	      last_robj=$output_objdir/$save_output-${k}.$objext
-	      k=`expr $k + 1`
-	      output=$output_objdir/$save_output-${k}.$objext
-	      objlist=$obj
-	      len=1
-	    fi
-	  done
-	  # Handle the remaining objects by creating one last
-	  # reloadable object file.  All subsequent reloadable object
-	  # files will link in the last one created.
-	  test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	  eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
-
-	  if ${skipped_export-false}; then
-	    $show "generating symbol list for \`$libname.la'"
-	    export_symbols="$output_objdir/$libname.exp"
-	    $run $rm $export_symbols
-	    libobjs=$output
-	    # Append the command to create the export file.
-	    eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
-          fi
-
-	  # Set up a command to remove the reloadale object files
-	  # after they are used.
-	  i=0
-	  while test "$i" -lt "$k"
-	  do
-	    i=`expr $i + 1`
-	    delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
-	  done
-
-	  $echo "creating a temporary reloadable object file: $output"
-
-	  # Loop through the commands generated above and execute them.
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $concat_cmds; do
-	    IFS="$save_ifs"
-	    $show "$cmd"
-	    $run eval "$cmd" || exit $?
-	  done
-	  IFS="$save_ifs"
-
-	  libobjs=$output
-	  # Restore the value of output.
-	  output=$save_output
-
-	  if test -n "$convenience" && test -n "$whole_archive_flag_spec"; then
-	    eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
-	  fi
-	  # Expand the library linking commands again to reset the
-	  # value of $libobjs for piecewise linking.
-
-	  # Do each of the archive commands.
-	  if test "$module" = yes && test -n "$module_cmds" ; then
-	    if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
-	      cmds=$module_expsym_cmds
-	    else
-	      cmds=$module_cmds
-	    fi
-	  else
-	  if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
-	    cmds=$archive_expsym_cmds
-	  else
-	    cmds=$archive_cmds
-	    fi
-	  fi
-
-	  # Append the command to remove the reloadable object files
-	  # to the just-reset $cmds.
-	  eval cmds=\"\$cmds~\$rm $delfiles\"
-	fi
-	save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  eval cmd=\"$cmd\"
-	  $show "$cmd"
-	  $run eval "$cmd" || exit $?
-	done
-	IFS="$save_ifs"
-
-	# Restore the uninstalled library and exit
-	if test "$mode" = relink; then
-	  $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
-	  exit $EXIT_SUCCESS
-	fi
-
-	# Create links to the real library.
-	for linkname in $linknames; do
-	  if test "$realname" != "$linkname"; then
-	    $show "(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)"
-	    $run eval '(cd $output_objdir && $rm $linkname && $LN_S $realname $linkname)' || exit $?
-	  fi
-	done
-
-	# If -module or -export-dynamic was specified, set the dlname.
-	if test "$module" = yes || test "$export_dynamic" = yes; then
-	  # On all known operating systems, these are identical.
-	  dlname="$soname"
-	fi
-      fi
-      ;;
-
-    obj)
-      if test -n "$deplibs"; then
-	$echo "$modename: warning: \`-l' and \`-L' are ignored for objects" 1>&2
-      fi
-
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	$echo "$modename: warning: \`-dlopen' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$rpath"; then
-	$echo "$modename: warning: \`-rpath' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$xrpath"; then
-	$echo "$modename: warning: \`-R' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info' is ignored for objects" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for objects" 1>&2
-      fi
-
-      case $output in
-      *.lo)
-	if test -n "$objs$old_deplibs"; then
-	  $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-	libobj="$output"
-	obj=`$echo "X$output" | $Xsed -e "$lo2o"`
-	;;
-      *)
-	libobj=
-	obj="$output"
-	;;
-      esac
-
-      # Delete the old objects.
-      $run $rm $obj $libobj
-
-      # Objects from convenience libraries.  This assumes
-      # single-version convenience libraries.  Whenever we create
-      # different ones for PIC/non-PIC, this we'll have to duplicate
-      # the extraction.
-      reload_conv_objs=
-      gentop=
-      # reload_cmds runs $LD directly, so let us get rid of
-      # -Wl from whole_archive_flag_spec
-      wl=
-
-      if test -n "$convenience"; then
-	if test -n "$whole_archive_flag_spec"; then
-	  eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
-	else
-	  gentop="$output_objdir/${obj}x"
-	  $show "${rm}r $gentop"
-	  $run ${rm}r "$gentop"
-	  $show "$mkdir $gentop"
-	  $run $mkdir "$gentop"
-	  status=$?
-	  if test "$status" -ne 0 && test ! -d "$gentop"; then
-	    exit $status
-	  fi
-	  generated="$generated $gentop"
-
-	  for xlib in $convenience; do
-	    # Extract the objects.
-	    case $xlib in
-	    [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-	    *) xabs=`pwd`"/$xlib" ;;
-	    esac
-	    xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-	    xdir="$gentop/$xlib"
-
-	    $show "${rm}r $xdir"
-	    $run ${rm}r "$xdir"
-	    $show "$mkdir $xdir"
-	    $run $mkdir "$xdir"
-	    status=$?
-	    if test "$status" -ne 0 && test ! -d "$xdir"; then
-	      exit $status
-	    fi
-	    # We will extract separately just the conflicting names and we will no
-	    # longer touch any unique names. It is faster to leave these extract
-	    # automatically by $AR in one run.
-	    $show "(cd $xdir && $AR x $xabs)"
-	    $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-	    if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
-	      :
-	    else
-	      $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
-	      $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
-	      $AR t "$xabs" | sort | uniq -cd | while read -r count name
-	      do
-		i=1
-		while test "$i" -le "$count"
-		do
-		 # Put our $i before any first dot (extension)
-		 # Never overwrite any file
-		 name_to="$name"
-		 while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
-		 do
-		   name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
-		 done
-		 $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
-		 $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
-		 i=`expr $i + 1`
-		done
-	      done
-	    fi
-
-	    reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
-	  done
-	fi
-      fi
-
-      # Create the old-style object.
-      reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
-
-      output="$obj"
-      cmds=$reload_cmds
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	eval cmd=\"$cmd\"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-
-      # Exit if we aren't doing a library object file.
-      if test -z "$libobj"; then
-	if test -n "$gentop"; then
-	  $show "${rm}r $gentop"
-	  $run ${rm}r $gentop
-	fi
-
-	exit $EXIT_SUCCESS
-      fi
-
-      if test "$build_libtool_libs" != yes; then
-	if test -n "$gentop"; then
-	  $show "${rm}r $gentop"
-	  $run ${rm}r $gentop
-	fi
-
-	# Create an invalid libtool object if no PIC, so that we don't
-	# accidentally link it into a program.
-	# $show "echo timestamp > $libobj"
-	# $run eval "echo timestamp > $libobj" || exit $?
-	exit $EXIT_SUCCESS
-      fi
-
-      if test -n "$pic_flag" || test "$pic_mode" != default; then
-	# Only do commands if we really have different PIC objects.
-	reload_objs="$libobjs $reload_conv_objs"
-	output="$libobj"
-	cmds=$reload_cmds
-	save_ifs="$IFS"; IFS='~'
-	for cmd in $cmds; do
-	  IFS="$save_ifs"
-	  eval cmd=\"$cmd\"
-	  $show "$cmd"
-	  $run eval "$cmd" || exit $?
-	done
-	IFS="$save_ifs"
-      fi
-
-      if test -n "$gentop"; then
-	$show "${rm}r $gentop"
-	$run ${rm}r $gentop
-      fi
-
-      exit $EXIT_SUCCESS
-      ;;
-
-    prog)
-      case $host in
-	*cygwin*) output=`$echo $output | ${SED} -e 's,.exe$,,;s,$,.exe,'` ;;
-      esac
-      if test -n "$vinfo"; then
-	$echo "$modename: warning: \`-version-info' is ignored for programs" 1>&2
-      fi
-
-      if test -n "$release"; then
-	$echo "$modename: warning: \`-release' is ignored for programs" 1>&2
-      fi
-
-      if test "$preload" = yes; then
-	if test "$dlopen_support" = unknown && test "$dlopen_self" = unknown &&
-	   test "$dlopen_self_static" = unknown; then
-	  $echo "$modename: warning: \`AC_LIBTOOL_DLOPEN' not used. Assuming no dlopen support."
-	fi
-      fi
-
-      case $host in
-      *-*-rhapsody* | *-*-darwin1.[012])
-	# On Rhapsody replace the C library is the System framework
-	compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
-	;;
-      esac
-
-      case $host in
-      *darwin*)
-        # Don't allow lazy linking, it breaks C++ global constructors
-        if test "$tagname" = CXX ; then
-        compile_command="$compile_command ${wl}-bind_at_load"
-        finalize_command="$finalize_command ${wl}-bind_at_load"
-        fi
-        ;;
-      esac
-
-      compile_command="$compile_command $compile_deplibs"
-      finalize_command="$finalize_command $finalize_deplibs"
-
-      if test -n "$rpath$xrpath"; then
-	# If the user specified any rpath flags, then add them.
-	for libdir in $rpath $xrpath; do
-	  # This is the magic to use -rpath.
-	  case "$finalize_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
-	  esac
-	done
-      fi
-
-      # Now hardcode the library paths
-      rpath=
-      hardcode_libdirs=
-      for libdir in $compile_rpath $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) perm_rpath="$perm_rpath $libdir" ;;
-	  esac
-	fi
-	case $host in
-	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
-	  case :$dllsearchpath: in
-	  *":$libdir:"*) ;;
-	  *) dllsearchpath="$dllsearchpath:$libdir";;
-	  esac
-	  ;;
-	esac
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      compile_rpath="$rpath"
-
-      rpath=
-      hardcode_libdirs=
-      for libdir in $finalize_rpath; do
-	if test -n "$hardcode_libdir_flag_spec"; then
-	  if test -n "$hardcode_libdir_separator"; then
-	    if test -z "$hardcode_libdirs"; then
-	      hardcode_libdirs="$libdir"
-	    else
-	      # Just accumulate the unique libdirs.
-	      case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
-	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
-		;;
-	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
-		;;
-	      esac
-	    fi
-	  else
-	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
-	  fi
-	elif test -n "$runpath_var"; then
-	  case "$finalize_perm_rpath " in
-	  *" $libdir "*) ;;
-	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
-	  esac
-	fi
-      done
-      # Substitute the hardcoded libdirs into the rpath.
-      if test -n "$hardcode_libdir_separator" &&
-	 test -n "$hardcode_libdirs"; then
-	libdir="$hardcode_libdirs"
-	eval rpath=\" $hardcode_libdir_flag_spec\"
-      fi
-      finalize_rpath="$rpath"
-
-      if test -n "$libobjs" && test "$build_old_libs" = yes; then
-	# Transform all the library objects into standard objects.
-	compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-      fi
-
-      dlsyms=
-      if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
-	if test -n "$NM" && test -n "$global_symbol_pipe"; then
-	  dlsyms="${outputname}S.c"
-	else
-	  $echo "$modename: not configured to extract global symbols from dlpreopened files" 1>&2
-	fi
-      fi
-
-      if test -n "$dlsyms"; then
-	case $dlsyms in
-	"") ;;
-	*.c)
-	  # Discover the nlist of each of the dlfiles.
-	  nlist="$output_objdir/${outputname}.nm"
-
-	  $show "$rm $nlist ${nlist}S ${nlist}T"
-	  $run $rm "$nlist" "${nlist}S" "${nlist}T"
-
-	  # Parse the name list into a source file.
-	  $show "creating $output_objdir/$dlsyms"
-
-	  test -z "$run" && $echo > "$output_objdir/$dlsyms" "\
-/* $dlsyms - symbol resolution table for \`$outputname' dlsym emulation. */
-/* Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP */
-
-#ifdef __cplusplus
-extern \"C\" {
-#endif
-
-/* Prevent the only kind of declaration conflicts we can make. */
-#define lt_preloaded_symbols some_other_symbol
-
-/* External symbol declarations for the compiler. */\
-"
-
-	  if test "$dlself" = yes; then
-	    $show "generating symbol list for \`$output'"
-
-	    test -z "$run" && $echo ': @PROGRAM@ ' > "$nlist"
-
-	    # Add our own program objects to the symbol list.
-	    progfiles=`$echo "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	    for arg in $progfiles; do
-	      $show "extracting global C symbols from \`$arg'"
-	      $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-	    done
-
-	    if test -n "$exclude_expsyms"; then
-	      $run eval '$EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T'
-	      $run eval '$mv "$nlist"T "$nlist"'
-	    fi
-
-	    if test -n "$export_symbols_regex"; then
-	      $run eval '$EGREP -e "$export_symbols_regex" "$nlist" > "$nlist"T'
-	      $run eval '$mv "$nlist"T "$nlist"'
-	    fi
-
-	    # Prepare the list of exported symbols
-	    if test -z "$export_symbols"; then
-	      export_symbols="$output_objdir/$output.exp"
-	      $run $rm $export_symbols
-	      $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
-	    else
-	      $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
-	      $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
-	      $run eval 'mv "$nlist"T "$nlist"'
-	    fi
-	  fi
-
-	  for arg in $dlprefiles; do
-	    $show "extracting global C symbols from \`$arg'"
-	    name=`$echo "$arg" | ${SED} -e 's%^.*/%%'`
-	    $run eval '$echo ": $name " >> "$nlist"'
-	    $run eval "$NM $arg | $global_symbol_pipe >> '$nlist'"
-	  done
-
-	  if test -z "$run"; then
-	    # Make sure we have at least an empty file.
-	    test -f "$nlist" || : > "$nlist"
-
-	    if test -n "$exclude_expsyms"; then
-	      $EGREP -v " ($exclude_expsyms)$" "$nlist" > "$nlist"T
-	      $mv "$nlist"T "$nlist"
-	    fi
-
-	    # Try sorting and uniquifying the output.
-	    if grep -v "^: " < "$nlist" |
-		if sort -k 3 </dev/null >/dev/null 2>&1; then
-		  sort -k 3
-		else
-		  sort +2
-		fi |
-		uniq > "$nlist"S; then
-	      :
-	    else
-	      grep -v "^: " < "$nlist" > "$nlist"S
-	    fi
-
-	    if test -f "$nlist"S; then
-	      eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$dlsyms"'
-	    else
-	      $echo '/* NONE */' >> "$output_objdir/$dlsyms"
-	    fi
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-
-#undef lt_preloaded_symbols
-
-#if defined (__STDC__) && __STDC__
-# define lt_ptr void *
-#else
-# define lt_ptr char *
-# define const
-#endif
-
-/* The mapping between symbol names and symbols. */
-const struct {
-  const char *name;
-  lt_ptr address;
-}
-lt_preloaded_symbols[] =
-{\
-"
-
-	    eval "$global_symbol_to_c_name_address" < "$nlist" >> "$output_objdir/$dlsyms"
-
-	    $echo >> "$output_objdir/$dlsyms" "\
-  {0, (lt_ptr) 0}
-};
-
-/* This works around a problem in FreeBSD linker */
-#ifdef FREEBSD_WORKAROUND
-static const void *lt_preloaded_setup() {
-  return lt_preloaded_symbols;
-}
-#endif
-
-#ifdef __cplusplus
-}
-#endif\
-"
-	  fi
-
-	  pic_flag_for_symtable=
-	  case $host in
-	  # compiling the symbol table file with pic_flag works around
-	  # a FreeBSD bug that causes programs to crash when -lm is
-	  # linked before any other PIC object.  But we must not use
-	  # pic_flag when linking with -static.  The problem exists in
-	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
-	    case "$compile_command " in
-	    *" -static "*) ;;
-	    *) pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND";;
-	    esac;;
-	  *-*-hpux*)
-	    case "$compile_command " in
-	    *" -static "*) ;;
-	    *) pic_flag_for_symtable=" $pic_flag";;
-	    esac
-	  esac
-
-	  # Now compile the dynamic symbol file.
-	  $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
-	  $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
-
-	  # Clean up the generated files.
-	  $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
-	  $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
-
-	  # Transform the symbol file into the correct name.
-	  compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-	  finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
-	  ;;
-	*)
-	  $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-      else
-	# We keep going just in case the user didn't refer to
-	# lt_preloaded_symbols.  The linker will fail if global_symbol_pipe
-	# really was required.
-
-	# Nullify the symbol file.
-	compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-	finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
-      fi
-
-      if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
-	# Replace the output file specification.
-	compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-	link_command="$compile_command$compile_rpath"
-
-	# We have no uninstalled library dependencies, so finalize right now.
-	$show "$link_command"
-	$run eval "$link_command"
-	status=$?
-
-	# Delete the generated files.
-	if test -n "$dlsyms"; then
-	  $show "$rm $output_objdir/${outputname}S.${objext}"
-	  $run $rm "$output_objdir/${outputname}S.${objext}"
-	fi
-
-	exit $status
-      fi
-
-      if test -n "$shlibpath_var"; then
-	# We should set the shlibpath_var
-	rpath=
-	for dir in $temp_rpath; do
-	  case $dir in
-	  [\\/]* | [A-Za-z]:[\\/]*)
-	    # Absolute path.
-	    rpath="$rpath$dir:"
-	    ;;
-	  *)
-	    # Relative path: add a thisdir entry.
-	    rpath="$rpath\$thisdir/$dir:"
-	    ;;
-	  esac
-	done
-	temp_rpath="$rpath"
-      fi
-
-      if test -n "$compile_shlibpath$finalize_shlibpath"; then
-	compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
-      fi
-      if test -n "$finalize_shlibpath"; then
-	finalize_command="$shlibpath_var=\"$finalize_shlibpath\$$shlibpath_var\" $finalize_command"
-      fi
-
-      compile_var=
-      finalize_var=
-      if test -n "$runpath_var"; then
-	if test -n "$perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $perm_rpath; do
-	    rpath="$rpath$dir:"
-	  done
-	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-	if test -n "$finalize_perm_rpath"; then
-	  # We should set the runpath_var.
-	  rpath=
-	  for dir in $finalize_perm_rpath; do
-	    rpath="$rpath$dir:"
-	  done
-	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
-	fi
-      fi
-
-      if test "$no_install" = yes; then
-	# We don't need to create a wrapper script.
-	link_command="$compile_var$compile_command$compile_rpath"
-	# Replace the output file specification.
-	link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
-	# Delete the old output file.
-	$run $rm $output
-	# Link the executable and exit
-	$show "$link_command"
-	$run eval "$link_command" || exit $?
-	exit $EXIT_SUCCESS
-      fi
-
-      if test "$hardcode_action" = relink; then
-	# Fast installation is not supported
-	link_command="$compile_var$compile_command$compile_rpath"
-	relink_command="$finalize_var$finalize_command$finalize_rpath"
-
-	$echo "$modename: warning: this platform does not like uninstalled shared libraries" 1>&2
-	$echo "$modename: \`$output' will be relinked during installation" 1>&2
-      else
-	if test "$fast_install" != no; then
-	  link_command="$finalize_var$compile_command$finalize_rpath"
-	  if test "$fast_install" = yes; then
-	    relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
-	  else
-	    # fast_install is set to needless
-	    relink_command=
-	  fi
-	else
-	  link_command="$compile_var$compile_command$compile_rpath"
-	  relink_command="$finalize_var$finalize_command$finalize_rpath"
-	fi
-      fi
-
-      # Replace the output file specification.
-      link_command=`$echo "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
-
-      # Delete the old output files.
-      $run $rm $output $output_objdir/$outputname $output_objdir/lt-$outputname
-
-      $show "$link_command"
-      $run eval "$link_command" || exit $?
-
-      # Now create the wrapper script.
-      $show "creating $output"
-
-      # Quote the relink command for shipping.
-      if test -n "$relink_command"; then
-	# Preserve any variables that may affect compiler behavior
-	for var in $variables_saved_for_relink; do
-	  if eval test -z \"\${$var+set}\"; then
-	    relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-	  elif eval var_value=\$$var; test -z "$var_value"; then
-	    relink_command="$var=; export $var; $relink_command"
-	  else
-	    var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-	    relink_command="$var=\"$var_value\"; export $var; $relink_command"
-	  fi
-	done
-	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-      fi
-
-      # Quote $echo for shipping.
-      if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
-	case $progpath in
-	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
-	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
-	esac
-	qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
-      else
-	qecho=`$echo "X$echo" | $Xsed -e "$sed_quote_subst"`
-      fi
-
-      # Only actually do things if our run command is non-null.
-      if test -z "$run"; then
-	# win32 will think the script is a binary if it has
-	# a .exe suffix, so we strip it off here.
-	case $output in
-	  *.exe) output=`$echo $output|${SED} 's,.exe$,,'` ;;
-	esac
-	# test for cygwin because mv fails w/o .exe extensions
-	case $host in
-	  *cygwin*)
-	    exeext=.exe
-	    outputname=`$echo $outputname|${SED} 's,.exe$,,'` ;;
-	  *) exeext= ;;
-	esac
-	case $host in
-	  *cygwin* | *mingw* )
-	    cwrappersource=`$echo ${objdir}/lt-${output}.c`
-	    cwrapper=`$echo ${output}.exe`
-	    $rm $cwrappersource $cwrapper
-	    trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
-
-	    cat > $cwrappersource <<EOF
-
-/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
-   Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-
-   The $output program cannot be directly executed until all the libtool
-   libraries that it depends on are installed.
-
-   This wrapper executable should never be moved out of the build directory.
-   If it is, it will not operate correctly.
-
-   Currently, it simply execs the wrapper *script* "/bin/sh $output",
-   but could eventually absorb all of the scripts functionality and
-   exec $objdir/$outputname directly.
-*/
-EOF
-	    cat >> $cwrappersource<<"EOF"
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <malloc.h>
-#include <stdarg.h>
-#include <assert.h>
-
-#if defined(PATH_MAX)
-# define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
-# define LT_PATHMAX MAXPATHLEN
-#else
-# define LT_PATHMAX 1024
-#endif
-
-#ifndef DIR_SEPARATOR
-#define DIR_SEPARATOR '/'
-#endif
-
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
-  defined (__OS2__)
-#define HAVE_DOS_BASED_FILE_SYSTEM
-#ifndef DIR_SEPARATOR_2
-#define DIR_SEPARATOR_2 '\\'
-#endif
-#endif
-
-#ifndef DIR_SEPARATOR_2
-# define IS_DIR_SEPARATOR(ch) ((ch) == DIR_SEPARATOR)
-#else /* DIR_SEPARATOR_2 */
-# define IS_DIR_SEPARATOR(ch) \
-        (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
-#endif /* DIR_SEPARATOR_2 */
-
-#define XMALLOC(type, num)      ((type *) xmalloc ((num) * sizeof(type)))
-#define XFREE(stale) do { \
-  if (stale) { free ((void *) stale); stale = 0; } \
-} while (0)
-
-const char *program_name = NULL;
-
-void * xmalloc (size_t num);
-char * xstrdup (const char *string);
-char * basename (const char *name);
-char * fnqualify(const char *path);
-char * strendzap(char *str, const char *pat);
-void lt_fatal (const char *message, ...);
-
-int
-main (int argc, char *argv[])
-{
-  char **newargz;
-  int i;
-
-  program_name = (char *) xstrdup ((char *) basename (argv[0]));
-  newargz = XMALLOC(char *, argc+2);
-EOF
-
-	    cat >> $cwrappersource <<EOF
-  newargz[0] = "$SHELL";
-EOF
-
-	    cat >> $cwrappersource <<"EOF"
-  newargz[1] = fnqualify(argv[0]);
-  /* we know the script has the same name, without the .exe */
-  /* so make sure newargz[1] doesn't end in .exe */
-  strendzap(newargz[1],".exe");
-  for (i = 1; i < argc; i++)
-    newargz[i+1] = xstrdup(argv[i]);
-  newargz[argc+1] = NULL;
-EOF
-
-	    cat >> $cwrappersource <<EOF
-  execv("$SHELL",newargz);
-EOF
-
-	    cat >> $cwrappersource <<"EOF"
-}
-
-void *
-xmalloc (size_t num)
-{
-  void * p = (void *) malloc (num);
-  if (!p)
-    lt_fatal ("Memory exhausted");
-
-  return p;
-}
-
-char *
-xstrdup (const char *string)
-{
-  return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
-;
-}
-
-char *
-basename (const char *name)
-{
-  const char *base;
-
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  /* Skip over the disk name in MSDOS pathnames. */
-  if (isalpha (name[0]) && name[1] == ':')
-    name += 2;
-#endif
-
-  for (base = name; *name; name++)
-    if (IS_DIR_SEPARATOR (*name))
-      base = name + 1;
-  return (char *) base;
-}
-
-char *
-fnqualify(const char *path)
-{
-  size_t size;
-  char *p;
-  char tmp[LT_PATHMAX + 1];
-
-  assert(path != NULL);
-
-  /* Is it qualified already? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
-  if (isalpha (path[0]) && path[1] == ':')
-    return xstrdup (path);
-#endif
-  if (IS_DIR_SEPARATOR (path[0]))
-    return xstrdup (path);
-
-  /* prepend the current directory */
-  /* doesn't handle '~' */
-  if (getcwd (tmp, LT_PATHMAX) == NULL)
-    lt_fatal ("getcwd failed");
-  size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */
-  p = XMALLOC(char, size);
-  sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path);
-  return p;
-}
-
-char *
-strendzap(char *str, const char *pat)
-{
-  size_t len, patlen;
-
-  assert(str != NULL);
-  assert(pat != NULL);
-
-  len = strlen(str);
-  patlen = strlen(pat);
-
-  if (patlen <= len)
-  {
-    str += len - patlen;
-    if (strcmp(str, pat) == 0)
-      *str = '\0';
-  }
-  return str;
-}
-
-static void
-lt_error_core (int exit_status, const char * mode,
-          const char * message, va_list ap)
-{
-  fprintf (stderr, "%s: %s: ", program_name, mode);
-  vfprintf (stderr, message, ap);
-  fprintf (stderr, ".\n");
-
-  if (exit_status >= 0)
-    exit (exit_status);
-}
-
-void
-lt_fatal (const char *message, ...)
-{
-  va_list ap;
-  va_start (ap, message);
-  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
-  va_end (ap);
-}
-EOF
-	  # we should really use a build-platform specific compiler
-	  # here, but OTOH, the wrappers (shell script and this C one)
-	  # are only useful if you want to execute the "real" binary.
-	  # Since the "real" binary is built for $host, then this
-	  # wrapper might as well be built for $host, too.
-	  $run $LTCC -s -o $cwrapper $cwrappersource
-	  ;;
-	esac
-	$rm $output
-	trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
-
-	$echo > $output "\
-#! $SHELL
-
-# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# The $output program cannot be directly executed until all the libtool
-# libraries that it depends on are installed.
-#
-# This wrapper script should never be moved out of the build directory.
-# If it is, it will not operate correctly.
-
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed='${SED} -e 1s/^X//'
-sed_quote_subst='$sed_quote_subst'
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
-
-relink_command=\"$relink_command\"
-
-# This environment variable determines our operation mode.
-if test \"\$libtool_install_magic\" = \"$magic\"; then
-  # install mode needs the following variable:
-  notinst_deplibs='$notinst_deplibs'
-else
-  # When we are sourced in execute mode, \$file and \$echo are already set.
-  if test \"\$libtool_execute_magic\" != \"$magic\"; then
-    echo=\"$qecho\"
-    file=\"\$0\"
-    # Make sure echo works.
-    if test \"X\$1\" = X--no-reexec; then
-      # Discard the --no-reexec flag, and continue.
-      shift
-    elif test \"X\`(\$echo '\t') 2>/dev/null\`\" = 'X\t'; then
-      # Yippee, \$echo works!
-      :
-    else
-      # Restart under the correct shell, and then maybe \$echo will work.
-      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
-    fi
-  fi\
-"
-	$echo >> $output "\
-
-  # Find the directory that this script lives in.
-  thisdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
-  test \"x\$thisdir\" = \"x\$file\" && thisdir=.
-
-  # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
-  while test -n \"\$file\"; do
-    destdir=\`\$echo \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
-
-    # If there was a directory component, then change thisdir.
-    if test \"x\$destdir\" != \"x\$file\"; then
-      case \"\$destdir\" in
-      [\\\\/]* | [A-Za-z]:[\\\\/]*) thisdir=\"\$destdir\" ;;
-      *) thisdir=\"\$thisdir/\$destdir\" ;;
-      esac
-    fi
-
-    file=\`\$echo \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
-  done
-
-  # Try to get the absolute directory name.
-  absdir=\`cd \"\$thisdir\" && pwd\`
-  test -n \"\$absdir\" && thisdir=\"\$absdir\"
-"
-
-	if test "$fast_install" = yes; then
-	  $echo >> $output "\
-  program=lt-'$outputname'$exeext
-  progdir=\"\$thisdir/$objdir\"
-
-  if test ! -f \"\$progdir/\$program\" || \\
-     { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
-       test \"X\$file\" != \"X\$progdir/\$program\"; }; then
-
-    file=\"\$\$-\$program\"
-
-    if test ! -d \"\$progdir\"; then
-      $mkdir \"\$progdir\"
-    else
-      $rm \"\$progdir/\$file\"
-    fi"
-
-	  $echo >> $output "\
-
-    # relink executable if necessary
-    if test -n \"\$relink_command\"; then
-      if relink_command_output=\`eval \$relink_command 2>&1\`; then :
-      else
-	$echo \"\$relink_command_output\" >&2
-	$rm \"\$progdir/\$file\"
-	exit $EXIT_FAILURE
-      fi
-    fi
-
-    $mv \"\$progdir/\$file\" \"\$progdir/\$program\" 2>/dev/null ||
-    { $rm \"\$progdir/\$program\";
-      $mv \"\$progdir/\$file\" \"\$progdir/\$program\"; }
-    $rm \"\$progdir/\$file\"
-  fi"
-	else
-	  $echo >> $output "\
-  program='$outputname'
-  progdir=\"\$thisdir/$objdir\"
-"
-	fi
-
-	$echo >> $output "\
-
-  if test -f \"\$progdir/\$program\"; then"
-
-	# Export our shlibpath_var if we have one.
-	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-	  $echo >> $output "\
-    # Add our own library path to $shlibpath_var
-    $shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
-
-    # Some systems cannot cope with colon-terminated $shlibpath_var
-    # The second colon is a workaround for a bug in BeOS R4 sed
-    $shlibpath_var=\`\$echo \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
-
-    export $shlibpath_var
-"
-	fi
-
-	# fixup the dll searchpath if we need to.
-	if test -n "$dllsearchpath"; then
-	  $echo >> $output "\
-    # Add the dll search path components to the executable PATH
-    PATH=$dllsearchpath:\$PATH
-"
-	fi
-
-	$echo >> $output "\
-    if test \"\$libtool_execute_magic\" != \"$magic\"; then
-      # Run the actual program with our arguments.
-"
-	case $host in
-	# Backslashes separate directories on plain windows
-	*-*-mingw | *-*-os2*)
-	  $echo >> $output "\
-      exec \$progdir\\\\\$program \${1+\"\$@\"}
-"
-	  ;;
-
-	*)
-	  $echo >> $output "\
-      exec \$progdir/\$program \${1+\"\$@\"}
-"
-	  ;;
-	esac
-	$echo >> $output "\
-      \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
-      exit $EXIT_FAILURE
-    fi
-  else
-    # The program doesn't exist.
-    \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
-    \$echo \"This script is just a wrapper for \$program.\" 1>&2
-    $echo \"See the $PACKAGE documentation for more information.\" 1>&2
-    exit $EXIT_FAILURE
-  fi
-fi\
-"
-	chmod +x $output
-      fi
-      exit $EXIT_SUCCESS
-      ;;
-    esac
-
-    # See if we need to build an old-fashioned archive.
-    for oldlib in $oldlibs; do
-
-      if test "$build_libtool_libs" = convenience; then
-	oldobjs="$libobjs_save"
-	addlibs="$convenience"
-	build_libtool_libs=no
-      else
-	if test "$build_libtool_libs" = module; then
-	  oldobjs="$libobjs_save"
-	  build_libtool_libs=no
-	else
-	  oldobjs="$old_deplibs $non_pic_objects"
-	fi
-	addlibs="$old_convenience"
-      fi
-
-      if test -n "$addlibs"; then
-	gentop="$output_objdir/${outputname}x"
-	$show "${rm}r $gentop"
-	$run ${rm}r "$gentop"
-	$show "$mkdir $gentop"
-	$run $mkdir "$gentop"
-	status=$?
-	if test "$status" -ne 0 && test ! -d "$gentop"; then
-	  exit $status
-	fi
-	generated="$generated $gentop"
-
-	# Add in members from convenience archives.
-	for xlib in $addlibs; do
-	  # Extract the objects.
-	  case $xlib in
-	  [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
-	  *) xabs=`pwd`"/$xlib" ;;
-	  esac
-	  xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
-	  xdir="$gentop/$xlib"
-
-	  $show "${rm}r $xdir"
-	  $run ${rm}r "$xdir"
-	  $show "$mkdir $xdir"
-	  $run $mkdir "$xdir"
-	  status=$?
-	  if test "$status" -ne 0 && test ! -d "$xdir"; then
-	    exit $status
-	  fi
-	  # We will extract separately just the conflicting names and we will no
-	  # longer touch any unique names. It is faster to leave these extract
-	  # automatically by $AR in one run.
-	  $show "(cd $xdir && $AR x $xabs)"
-	  $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
-	  if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
-	    :
-	  else
-	    $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
-	    $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
-	    $AR t "$xabs" | sort | uniq -cd | while read -r count name
-	    do
-	      i=1
-	      while test "$i" -le "$count"
-	      do
-	       # Put our $i before any first dot (extension)
-	       # Never overwrite any file
-	       name_to="$name"
-	       while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
-	       do
-		 name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
-	       done
-	       $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
-	       $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
-	       i=`expr $i + 1`
-	      done
-	    done
-	  fi
-
-	  oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
-	done
-      fi
-
-      # Do each command in the archive commands.
-      if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
-       cmds=$old_archive_from_new_cmds
-      else
-	eval cmds=\"$old_archive_cmds\"
-
-	if len=`expr "X$cmds" : ".*"` &&
-	     test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
-	  cmds=$old_archive_cmds
-	else
-	  # the command line is too long to link in one step, link in parts
-	  $echo "using piecewise archive linking..."
-	  save_RANLIB=$RANLIB
-	  RANLIB=:
-	  objlist=
-	  concat_cmds=
-	  save_oldobjs=$oldobjs
-	  # GNU ar 2.10+ was changed to match POSIX; thus no paths are
-	  # encoded into archives.  This makes 'ar r' malfunction in
-	  # this piecewise linking case whenever conflicting object
-	  # names appear in distinct ar calls; check, warn and compensate.
-	    if (for obj in $save_oldobjs
-	    do
-	      $echo "X$obj" | $Xsed -e 's%^.*/%%'
-	    done | sort | sort -uc >/dev/null 2>&1); then
-	    :
-	  else
-	    $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
-	    $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
-	    AR_FLAGS=cq
-	  fi
-	  # Is there a better way of finding the last object in the list?
-	  for obj in $save_oldobjs
-	  do
-	    last_oldobj=$obj
-	  done
-	  for obj in $save_oldobjs
-	  do
-	    oldobjs="$objlist $obj"
-	    objlist="$objlist $obj"
-	    eval test_cmds=\"$old_archive_cmds\"
-	    if len=`expr "X$test_cmds" : ".*"` &&
-	       test "$len" -le "$max_cmd_len"; then
-	      :
-	    else
-	      # the above command should be used before it gets too long
-	      oldobjs=$objlist
-	      if test "$obj" = "$last_oldobj" ; then
-	        RANLIB=$save_RANLIB
-	      fi
-	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
-	      objlist=
-	    fi
-	  done
-	  RANLIB=$save_RANLIB
-	  oldobjs=$objlist
-	  if test "X$oldobjs" = "X" ; then
-	    eval cmds=\"\$concat_cmds\"
-	  else
-	    eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
-	  fi
-	fi
-      fi
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-        eval cmd=\"$cmd\"
-	IFS="$save_ifs"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-    done
-
-    if test -n "$generated"; then
-      $show "${rm}r$generated"
-      $run ${rm}r$generated
-    fi
-
-    # Now create the libtool archive.
-    case $output in
-    *.la)
-      old_library=
-      test "$build_old_libs" = yes && old_library="$libname.$libext"
-      $show "creating $output"
-
-      # Preserve any variables that may affect compiler behavior
-      for var in $variables_saved_for_relink; do
-	if eval test -z \"\${$var+set}\"; then
-	  relink_command="{ test -z \"\${$var+set}\" || unset $var || { $var=; export $var; }; }; $relink_command"
-	elif eval var_value=\$$var; test -z "$var_value"; then
-	  relink_command="$var=; export $var; $relink_command"
-	else
-	  var_value=`$echo "X$var_value" | $Xsed -e "$sed_quote_subst"`
-	  relink_command="$var=\"$var_value\"; export $var; $relink_command"
-	fi
-      done
-      # Quote the link command for shipping.
-      relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-      if test "$hardcode_automatic" = yes ; then
-	relink_command=
-      fi
-
-
-      # Only create the output if not a dry run.
-      if test -z "$run"; then
-	for installed in no yes; do
-	  if test "$installed" = yes; then
-	    if test -z "$install_libdir"; then
-	      break
-	    fi
-	    output="$output_objdir/$outputname"i
-	    # Replace all uninstalled libtool libraries with the installed ones
-	    newdependency_libs=
-	    for deplib in $dependency_libs; do
-	      case $deplib in
-	      *.la)
-		name=`$echo "X$deplib" | $Xsed -e 's%^.*/%%'`
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
-		if test -z "$libdir"; then
-		  $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
-		  exit $EXIT_FAILURE
-		fi
-		newdependency_libs="$newdependency_libs $libdir/$name"
-		;;
-	      *) newdependency_libs="$newdependency_libs $deplib" ;;
-	      esac
-	    done
-	    dependency_libs="$newdependency_libs"
-	    newdlfiles=
-	    for lib in $dlfiles; do
-	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-	      if test -z "$libdir"; then
-		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-		exit $EXIT_FAILURE
-	      fi
-	      newdlfiles="$newdlfiles $libdir/$name"
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      name=`$echo "X$lib" | $Xsed -e 's%^.*/%%'`
-	      eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
-	      if test -z "$libdir"; then
-		$echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-		exit $EXIT_FAILURE
-	      fi
-	      newdlprefiles="$newdlprefiles $libdir/$name"
-	    done
-	    dlprefiles="$newdlprefiles"
-	  else
-	    newdlfiles=
-	    for lib in $dlfiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      newdlfiles="$newdlfiles $abs"
-	    done
-	    dlfiles="$newdlfiles"
-	    newdlprefiles=
-	    for lib in $dlprefiles; do
-	      case $lib in
-		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
-		*) abs=`pwd`"/$lib" ;;
-	      esac
-	      newdlprefiles="$newdlprefiles $abs"
-	    done
-	    dlprefiles="$newdlprefiles"
-	  fi
-	  $rm $output
-	  # place dlname in correct position for cygwin
-	  tdlname=$dlname
-	  case $host,$output,$installed,$module,$dlname in
-	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
-	  esac
-	  $echo > $output "\
-# $outputname - a libtool library file
-# Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
-#
-# Please DO NOT delete this file!
-# It is necessary for linking the library.
-
-# The name that we can dlopen(3).
-dlname='$tdlname'
-
-# Names of this library.
-library_names='$library_names'
-
-# The name of the static archive.
-old_library='$old_library'
-
-# Libraries that this one depends upon.
-dependency_libs='$dependency_libs'
-
-# Version information for $libname.
-current=$current
-age=$age
-revision=$revision
-
-# Is this an already installed library?
-installed=$installed
-
-# Should we warn about portability when linking against -modules?
-shouldnotlink=$module
-
-# Files to dlopen/dlpreopen
-dlopen='$dlfiles'
-dlpreopen='$dlprefiles'
-
-# Directory that this library needs to be installed in:
-libdir='$install_libdir'"
-	  if test "$installed" = no && test "$need_relink" = yes; then
-	    $echo >> $output "\
-relink_command=\"$relink_command\""
-	  fi
-	done
-      fi
-
-      # Do a symbolic link so that the libtool archive can be found in
-      # LD_LIBRARY_PATH before the program is installed.
-      $show "(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)"
-      $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
-      ;;
-    esac
-    exit $EXIT_SUCCESS
-    ;;
-
-  # libtool install mode
-  install)
-    modename="$modename: install"
-
-    # There may be an optional sh(1) argument at the beginning of
-    # install_prog (especially on Windows NT).
-    if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
-       # Allow the use of GNU shtool's install command.
-       $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
-      # Aesthetically quote it.
-      arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-	arg="\"$arg\""
-	;;
-      esac
-      install_prog="$arg "
-      arg="$1"
-      shift
-    else
-      install_prog=
-      arg="$nonopt"
-    fi
-
-    # The real first argument should be the name of the installation program.
-    # Aesthetically quote it.
-    arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-    case $arg in
-    *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-      arg="\"$arg\""
-      ;;
-    esac
-    install_prog="$install_prog$arg"
-
-    # We need to accept at least all the BSD install flags.
-    dest=
-    files=
-    opts=
-    prev=
-    install_type=
-    isdir=no
-    stripme=
-    for arg
-    do
-      if test -n "$dest"; then
-	files="$files $dest"
-	dest="$arg"
-	continue
-      fi
-
-      case $arg in
-      -d) isdir=yes ;;
-      -f) prev="-f" ;;
-      -g) prev="-g" ;;
-      -m) prev="-m" ;;
-      -o) prev="-o" ;;
-      -s)
-	stripme=" -s"
-	continue
-	;;
-      -*) ;;
-
-      *)
-	# If the previous option needed an argument, then skip it.
-	if test -n "$prev"; then
-	  prev=
-	else
-	  dest="$arg"
-	  continue
-	fi
-	;;
-      esac
-
-      # Aesthetically quote the argument.
-      arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
-      case $arg in
-      *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \	]*|*]*)
-	arg="\"$arg\""
-	;;
-      esac
-      install_prog="$install_prog $arg"
-    done
-
-    if test -z "$install_prog"; then
-      $echo "$modename: you must specify an install program" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    if test -n "$prev"; then
-      $echo "$modename: the \`$prev' option requires an argument" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    if test -z "$files"; then
-      if test -z "$dest"; then
-	$echo "$modename: no file or destination specified" 1>&2
-      else
-	$echo "$modename: you must specify a destination" 1>&2
-      fi
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    # Strip any trailing slash from the destination.
-    dest=`$echo "X$dest" | $Xsed -e 's%/$%%'`
-
-    # Check to see that the destination is a directory.
-    test -d "$dest" && isdir=yes
-    if test "$isdir" = yes; then
-      destdir="$dest"
-      destname=
-    else
-      destdir=`$echo "X$dest" | $Xsed -e 's%/[^/]*$%%'`
-      test "X$destdir" = "X$dest" && destdir=.
-      destname=`$echo "X$dest" | $Xsed -e 's%^.*/%%'`
-
-      # Not a directory, so check to see that there is only one file specified.
-      set dummy $files
-      if test "$#" -gt 2; then
-	$echo "$modename: \`$dest' is not a directory" 1>&2
-	$echo "$help" 1>&2
-	exit $EXIT_FAILURE
-      fi
-    fi
-    case $destdir in
-    [\\/]* | [A-Za-z]:[\\/]*) ;;
-    *)
-      for file in $files; do
-	case $file in
-	*.lo) ;;
-	*)
-	  $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-      done
-      ;;
-    esac
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    staticlibs=
-    future_libdirs=
-    current_libdirs=
-    for file in $files; do
-
-      # Do each installation.
-      case $file in
-      *.$libext)
-	# Do the static libraries later.
-	staticlibs="$staticlibs $file"
-	;;
-
-      *.la)
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	library_names=
-	old_library=
-	relink_command=
-	# If there is no directory component, then add one.
-	case $file in
-	*/* | *\\*) . $file ;;
-	*) . ./$file ;;
-	esac
-
-	# Add the libdir to current_libdirs if it is the destination.
-	if test "X$destdir" = "X$libdir"; then
-	  case "$current_libdirs " in
-	  *" $libdir "*) ;;
-	  *) current_libdirs="$current_libdirs $libdir" ;;
-	  esac
-	else
-	  # Note the libdir as a future libdir.
-	  case "$future_libdirs " in
-	  *" $libdir "*) ;;
-	  *) future_libdirs="$future_libdirs $libdir" ;;
-	  esac
-	fi
-
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`/
-	test "X$dir" = "X$file/" && dir=
-	dir="$dir$objdir"
-
-	if test -n "$relink_command"; then
-	  # Determine the prefix the user has applied to our future dir.
-	  inst_prefix_dir=`$echo "$destdir" | $SED "s%$libdir\$%%"`
-
-	  # Don't allow the user to place us outside of our expected
-	  # location b/c this prevents finding dependent libraries that
-	  # are installed to the same prefix.
-	  # At present, this check doesn't affect windows .dll's that
-	  # are installed into $libdir/../bin (currently, that works fine)
-	  # but it's something to keep an eye on.
-	  if test "$inst_prefix_dir" = "$destdir"; then
-	    $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-
-	  if test -n "$inst_prefix_dir"; then
-	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
-	  else
-	    relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
-	  fi
-
-	  $echo "$modename: warning: relinking \`$file'" 1>&2
-	  $show "$relink_command"
-	  if $run eval "$relink_command"; then :
-	  else
-	    $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-	fi
-
-	# See the names of the shared library.
-	set dummy $library_names
-	if test -n "$2"; then
-	  realname="$2"
-	  shift
-	  shift
-
-	  srcname="$realname"
-	  test -n "$relink_command" && srcname="$realname"T
-
-	  # Install the shared library and build the symlinks.
-	  $show "$install_prog $dir/$srcname $destdir/$realname"
-	  $run eval "$install_prog $dir/$srcname $destdir/$realname" || exit $?
-	  if test -n "$stripme" && test -n "$striplib"; then
-	    $show "$striplib $destdir/$realname"
-	    $run eval "$striplib $destdir/$realname" || exit $?
-	  fi
-
-	  if test "$#" -gt 0; then
-	    # Delete the old symlinks, and create new ones.
-	    for linkname
-	    do
-	      if test "$linkname" != "$realname"; then
-		$show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
-		$run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
-	      fi
-	    done
-	  fi
-
-	  # Do each command in the postinstall commands.
-	  lib="$destdir/$realname"
-	  cmds=$postinstall_cmds
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $cmds; do
-	    IFS="$save_ifs"
-	    eval cmd=\"$cmd\"
-	    $show "$cmd"
-	    $run eval "$cmd" || exit $?
-	  done
-	  IFS="$save_ifs"
-	fi
-
-	# Install the pseudo-library for information purposes.
-	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	instname="$dir/$name"i
-	$show "$install_prog $instname $destdir/$name"
-	$run eval "$install_prog $instname $destdir/$name" || exit $?
-
-	# Maybe install the static library, too.
-	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
-	;;
-
-      *.lo)
-	# Install (i.e. copy) a libtool object.
-
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	  destfile="$destdir/$destfile"
-	fi
-
-	# Deduce the name of the destination old-style object file.
-	case $destfile in
-	*.lo)
-	  staticdest=`$echo "X$destfile" | $Xsed -e "$lo2o"`
-	  ;;
-	*.$objext)
-	  staticdest="$destfile"
-	  destfile=
-	  ;;
-	*)
-	  $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	  ;;
-	esac
-
-	# Install the libtool object if requested.
-	if test -n "$destfile"; then
-	  $show "$install_prog $file $destfile"
-	  $run eval "$install_prog $file $destfile" || exit $?
-	fi
-
-	# Install the old object if enabled.
-	if test "$build_old_libs" = yes; then
-	  # Deduce the name of the old-style object file.
-	  staticobj=`$echo "X$file" | $Xsed -e "$lo2o"`
-
-	  $show "$install_prog $staticobj $staticdest"
-	  $run eval "$install_prog \$staticobj \$staticdest" || exit $?
-	fi
-	exit $EXIT_SUCCESS
-	;;
-
-      *)
-	# Figure out destination file name, if it wasn't already specified.
-	if test -n "$destname"; then
-	  destfile="$destdir/$destname"
-	else
-	  destfile=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-	  destfile="$destdir/$destfile"
-	fi
-
-	# If the file is missing, and there is a .exe on the end, strip it
-	# because it is most likely a libtool script we actually want to
-	# install
-	stripped_ext=""
-	case $file in
-	  *.exe)
-	    if test ! -f "$file"; then
-	      file=`$echo $file|${SED} 's,.exe$,,'`
-	      stripped_ext=".exe"
-	    fi
-	    ;;
-	esac
-
-	# Do a test to see if this is really a libtool program.
-	case $host in
-	*cygwin*|*mingw*)
-	    wrapper=`$echo $file | ${SED} -e 's,.exe$,,'`
-	    ;;
-	*)
-	    wrapper=$file
-	    ;;
-	esac
-	if (${SED} -e '4q' $wrapper | grep "^# Generated by .*$PACKAGE")>/dev/null 2>&1; then
-	  notinst_deplibs=
-	  relink_command=
-
-	  # To insure that "foo" is sourced, and not "foo.exe",
-	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
-	  # which disallows the automatic-append-.exe behavior.
-	  case $build in
-	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
-	  *) wrapperdot=${wrapper} ;;
-	  esac
-	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . ${wrapperdot} ;;
-	  *) . ./${wrapperdot} ;;
-	  esac
-
-	  # Check the variables that should have been set.
-	  if test -z "$notinst_deplibs"; then
-	    $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
-	    exit $EXIT_FAILURE
-	  fi
-
-	  finalize=yes
-	  for lib in $notinst_deplibs; do
-	    # Check to see that each library is installed.
-	    libdir=
-	    if test -f "$lib"; then
-	      # If there is no directory component, then add one.
-	      case $lib in
-	      */* | *\\*) . $lib ;;
-	      *) . ./$lib ;;
-	      esac
-	    fi
-	    libfile="$libdir/"`$echo "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
-	    if test -n "$libdir" && test ! -f "$libfile"; then
-	      $echo "$modename: warning: \`$lib' has not been installed in \`$libdir'" 1>&2
-	      finalize=no
-	    fi
-	  done
-
-	  relink_command=
-	  # To insure that "foo" is sourced, and not "foo.exe",
-	  # finese the cygwin/MSYS system by explicitly sourcing "foo."
-	  # which disallows the automatic-append-.exe behavior.
-	  case $build in
-	  *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
-	  *) wrapperdot=${wrapper} ;;
-	  esac
-	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . ${wrapperdot} ;;
-	  *) . ./${wrapperdot} ;;
-	  esac
-
-	  outputname=
-	  if test "$fast_install" = no && test -n "$relink_command"; then
-	    if test "$finalize" = yes && test -z "$run"; then
-	      tmpdir="/tmp"
-	      test -n "$TMPDIR" && tmpdir="$TMPDIR"
-	      tmpdir="$tmpdir/libtool-$$"
-	      save_umask=`umask`
-	      umask 0077
-	      if $mkdir "$tmpdir"; then
-	        umask $save_umask
-	      else
-	        umask $save_umask
-		$echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
-		continue
-	      fi
-	      file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
-	      outputname="$tmpdir/$file"
-	      # Replace the output file specification.
-	      relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
-
-	      $show "$relink_command"
-	      if $run eval "$relink_command"; then :
-	      else
-		$echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
-		${rm}r "$tmpdir"
-		continue
-	      fi
-	      file="$outputname"
-	    else
-	      $echo "$modename: warning: cannot relink \`$file'" 1>&2
-	    fi
-	  else
-	    # Install the binary that we compiled earlier.
-	    file=`$echo "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
-	  fi
-	fi
-
-	# remove .exe since cygwin /usr/bin/install will append another
-	# one anyways
-	case $install_prog,$host in
-	*/usr/bin/install*,*cygwin*)
-	  case $file:$destfile in
-	  *.exe:*.exe)
-	    # this is ok
-	    ;;
-	  *.exe:*)
-	    destfile=$destfile.exe
-	    ;;
-	  *:*.exe)
-	    destfile=`$echo $destfile | ${SED} -e 's,.exe$,,'`
-	    ;;
-	  esac
-	  ;;
-	esac
-	$show "$install_prog$stripme $file $destfile"
-	$run eval "$install_prog\$stripme \$file \$destfile" || exit $?
-	test -n "$outputname" && ${rm}r "$tmpdir"
-	;;
-      esac
-    done
-
-    for file in $staticlibs; do
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-
-      # Set up the ranlib parameters.
-      oldlib="$destdir/$name"
-
-      $show "$install_prog $file $oldlib"
-      $run eval "$install_prog \$file \$oldlib" || exit $?
-
-      if test -n "$stripme" && test -n "$old_striplib"; then
-	$show "$old_striplib $oldlib"
-	$run eval "$old_striplib $oldlib" || exit $?
-      fi
-
-      # Do each command in the postinstall commands.
-      cmds=$old_postinstall_cmds
-      save_ifs="$IFS"; IFS='~'
-      for cmd in $cmds; do
-	IFS="$save_ifs"
-	eval cmd=\"$cmd\"
-	$show "$cmd"
-	$run eval "$cmd" || exit $?
-      done
-      IFS="$save_ifs"
-    done
-
-    if test -n "$future_libdirs"; then
-      $echo "$modename: warning: remember to run \`$progname --finish$future_libdirs'" 1>&2
-    fi
-
-    if test -n "$current_libdirs"; then
-      # Maybe just do a dry run.
-      test -n "$run" && current_libdirs=" -n$current_libdirs"
-      exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
-    else
-      exit $EXIT_SUCCESS
-    fi
-    ;;
-
-  # libtool finish mode
-  finish)
-    modename="$modename: finish"
-    libdirs="$nonopt"
-    admincmds=
-
-    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for dir
-      do
-	libdirs="$libdirs $dir"
-      done
-
-      for libdir in $libdirs; do
-	if test -n "$finish_cmds"; then
-	  # Do each command in the finish commands.
-	  cmds=$finish_cmds
-	  save_ifs="$IFS"; IFS='~'
-	  for cmd in $cmds; do
-	    IFS="$save_ifs"
-	    eval cmd=\"$cmd\"
-	    $show "$cmd"
-	    $run eval "$cmd" || admincmds="$admincmds
-       $cmd"
-	  done
-	  IFS="$save_ifs"
-	fi
-	if test -n "$finish_eval"; then
-	  # Do the single finish_eval.
-	  eval cmds=\"$finish_eval\"
-	  $run eval "$cmds" || admincmds="$admincmds
-       $cmds"
-	fi
-      done
-    fi
-
-    # Exit here if they wanted silent mode.
-    test "$show" = : && exit $EXIT_SUCCESS
-
-    $echo "----------------------------------------------------------------------"
-    $echo "Libraries have been installed in:"
-    for libdir in $libdirs; do
-      $echo "   $libdir"
-    done
-    $echo
-    $echo "If you ever happen to want to link against installed libraries"
-    $echo "in a given directory, LIBDIR, you must either use libtool, and"
-    $echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
-    $echo "flag during linking and do at least one of the following:"
-    if test -n "$shlibpath_var"; then
-      $echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-      $echo "     during execution"
-    fi
-    if test -n "$runpath_var"; then
-      $echo "   - add LIBDIR to the \`$runpath_var' environment variable"
-      $echo "     during linking"
-    fi
-    if test -n "$hardcode_libdir_flag_spec"; then
-      libdir=LIBDIR
-      eval flag=\"$hardcode_libdir_flag_spec\"
-
-      $echo "   - use the \`$flag' linker flag"
-    fi
-    if test -n "$admincmds"; then
-      $echo "   - have your system administrator run these commands:$admincmds"
-    fi
-    if test -f /etc/ld.so.conf; then
-      $echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-    fi
-    $echo
-    $echo "See any operating system documentation about shared libraries for"
-    $echo "more information, such as the ld(1) and ld.so(8) manual pages."
-    $echo "----------------------------------------------------------------------"
-    exit $EXIT_SUCCESS
-    ;;
-
-  # libtool execute mode
-  execute)
-    modename="$modename: execute"
-
-    # The first argument is the command name.
-    cmd="$nonopt"
-    if test -z "$cmd"; then
-      $echo "$modename: you must specify a COMMAND" 1>&2
-      $echo "$help"
-      exit $EXIT_FAILURE
-    fi
-
-    # Handle -dlopen flags immediately.
-    for file in $execute_dlfiles; do
-      if test ! -f "$file"; then
-	$echo "$modename: \`$file' is not a file" 1>&2
-	$echo "$help" 1>&2
-	exit $EXIT_FAILURE
-      fi
-
-      dir=
-      case $file in
-      *.la)
-	# Check to see that this really is a libtool archive.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
-	else
-	  $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
-	  $echo "$help" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-
-	# Read the libtool library.
-	dlname=
-	library_names=
-
-	# If there is no directory component, then add one.
-	case $file in
-	*/* | *\\*) . $file ;;
-	*) . ./$file ;;
-	esac
-
-	# Skip this library if it cannot be dlopened.
-	if test -z "$dlname"; then
-	  # Warn if it was a shared library.
-	  test -n "$library_names" && $echo "$modename: warning: \`$file' was not linked with \`-export-dynamic'"
-	  continue
-	fi
-
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$dir" = "X$file" && dir=.
-
-	if test -f "$dir/$objdir/$dlname"; then
-	  dir="$dir/$objdir"
-	else
-	  $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
-	  exit $EXIT_FAILURE
-	fi
-	;;
-
-      *.lo)
-	# Just add the directory containing the .lo file.
-	dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-	test "X$dir" = "X$file" && dir=.
-	;;
-
-      *)
-	$echo "$modename: warning \`-dlopen' is ignored for non-libtool libraries and objects" 1>&2
-	continue
-	;;
-      esac
-
-      # Get the absolute pathname.
-      absdir=`cd "$dir" && pwd`
-      test -n "$absdir" && dir="$absdir"
-
-      # Now add the directory to shlibpath_var.
-      if eval "test -z \"\$$shlibpath_var\""; then
-	eval "$shlibpath_var=\"\$dir\""
-      else
-	eval "$shlibpath_var=\"\$dir:\$$shlibpath_var\""
-      fi
-    done
-
-    # This variable tells wrapper scripts just to set shlibpath_var
-    # rather than running their programs.
-    libtool_execute_magic="$magic"
-
-    # Check if any of the arguments is a wrapper script.
-    args=
-    for file
-    do
-      case $file in
-      -*) ;;
-      *)
-	# Do a test to see if this is really a libtool program.
-	if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  # If there is no directory component, then add one.
-	  case $file in
-	  */* | *\\*) . $file ;;
-	  *) . ./$file ;;
-	  esac
-
-	  # Transform arg to wrapped name.
-	  file="$progdir/$program"
-	fi
-	;;
-      esac
-      # Quote arguments (to preserve shell metacharacters).
-      file=`$echo "X$file" | $Xsed -e "$sed_quote_subst"`
-      args="$args \"$file\""
-    done
-
-    if test -z "$run"; then
-      if test -n "$shlibpath_var"; then
-	# Export the shlibpath_var.
-	eval "export $shlibpath_var"
-      fi
-
-      # Restore saved environment variables
-      if test "${save_LC_ALL+set}" = set; then
-	LC_ALL="$save_LC_ALL"; export LC_ALL
-      fi
-      if test "${save_LANG+set}" = set; then
-	LANG="$save_LANG"; export LANG
-      fi
-
-      # Now prepare to actually exec the command.
-      exec_cmd="\$cmd$args"
-    else
-      # Display what would be done.
-      if test -n "$shlibpath_var"; then
-	eval "\$echo \"\$shlibpath_var=\$$shlibpath_var\""
-	$echo "export $shlibpath_var"
-      fi
-      $echo "$cmd$args"
-      exit $EXIT_SUCCESS
-    fi
-    ;;
-
-  # libtool clean and uninstall mode
-  clean | uninstall)
-    modename="$modename: $mode"
-    rm="$nonopt"
-    files=
-    rmforce=
-    exit_status=0
-
-    # This variable tells wrapper scripts just to set variables rather
-    # than running their programs.
-    libtool_install_magic="$magic"
-
-    for arg
-    do
-      case $arg in
-      -f) rm="$rm $arg"; rmforce=yes ;;
-      -*) rm="$rm $arg" ;;
-      *) files="$files $arg" ;;
-      esac
-    done
-
-    if test -z "$rm"; then
-      $echo "$modename: you must specify an RM program" 1>&2
-      $echo "$help" 1>&2
-      exit $EXIT_FAILURE
-    fi
-
-    rmdirs=
-
-    origobjdir="$objdir"
-    for file in $files; do
-      dir=`$echo "X$file" | $Xsed -e 's%/[^/]*$%%'`
-      if test "X$dir" = "X$file"; then
-	dir=.
-	objdir="$origobjdir"
-      else
-	objdir="$dir/$origobjdir"
-      fi
-      name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
-      test "$mode" = uninstall && objdir="$dir"
-
-      # Remember objdir for removal later, being careful to avoid duplicates
-      if test "$mode" = clean; then
-	case " $rmdirs " in
-	  *" $objdir "*) ;;
-	  *) rmdirs="$rmdirs $objdir" ;;
-	esac
-      fi
-
-      # Don't error if the file doesn't exist and rm -f was used.
-      if (test -L "$file") >/dev/null 2>&1 \
-	|| (test -h "$file") >/dev/null 2>&1 \
-	|| test -f "$file"; then
-	:
-      elif test -d "$file"; then
-	exit_status=1
-	continue
-      elif test "$rmforce" = yes; then
-	continue
-      fi
-
-      rmfiles="$file"
-
-      case $name in
-      *.la)
-	# Possibly a libtool archive, so verify it.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	  . $dir/$name
-
-	  # Delete the libtool libraries and symlinks.
-	  for n in $library_names; do
-	    rmfiles="$rmfiles $objdir/$n"
-	  done
-	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
-	  test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
-
-	  if test "$mode" = uninstall; then
-	    if test -n "$library_names"; then
-	      # Do each command in the postuninstall commands.
-	      cmds=$postuninstall_cmds
-	      save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd"
-		if test "$?" -ne 0 && test "$rmforce" != yes; then
-		  exit_status=1
-		fi
-	      done
-	      IFS="$save_ifs"
-	    fi
-
-	    if test -n "$old_library"; then
-	      # Do each command in the old_postuninstall commands.
-	      cmds=$old_postuninstall_cmds
-	      save_ifs="$IFS"; IFS='~'
-	      for cmd in $cmds; do
-		IFS="$save_ifs"
-		eval cmd=\"$cmd\"
-		$show "$cmd"
-		$run eval "$cmd"
-		if test "$?" -ne 0 && test "$rmforce" != yes; then
-		  exit_status=1
-		fi
-	      done
-	      IFS="$save_ifs"
-	    fi
-	    # FIXME: should reinstall the best remaining shared library.
-	  fi
-	fi
-	;;
-
-      *.lo)
-	# Possibly a libtool object, so verify it.
-	if (${SED} -e '2q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-
-	  # Read the .lo file
-	  . $dir/$name
-
-	  # Add PIC object to the list of files to remove.
-	  if test -n "$pic_object" \
-	     && test "$pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$pic_object"
-	  fi
-
-	  # Add non-PIC object to the list of files to remove.
-	  if test -n "$non_pic_object" \
-	     && test "$non_pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$non_pic_object"
-	  fi
-	fi
-	;;
-
-      *)
-	if test "$mode" = clean ; then
-	  noexename=$name
-	  case $file in
-	  *.exe)
-	    file=`$echo $file|${SED} 's,.exe$,,'`
-	    noexename=`$echo $name|${SED} 's,.exe$,,'`
-	    # $file with .exe has already been added to rmfiles,
-	    # add $file without .exe
-	    rmfiles="$rmfiles $file"
-	    ;;
-	  esac
-	  # Do a test to see if this is a libtool program.
-	  if (${SED} -e '4q' $file | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then
-	    relink_command=
-	    . $dir/$noexename
-
-	    # note $name still contains .exe if it was in $file originally
-	    # as does the version of $file that was added into $rmfiles
-	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
-	    if test "$fast_install" = yes && test -n "$relink_command"; then
-	      rmfiles="$rmfiles $objdir/lt-$name"
-	    fi
-	    if test "X$noexename" != "X$name" ; then
-	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
-	    fi
-	  fi
-	fi
-	;;
-      esac
-      $show "$rm $rmfiles"
-      $run $rm $rmfiles || exit_status=1
-    done
-    objdir="$origobjdir"
-
-    # Try to remove the ${objdir}s in the directories where we deleted files
-    for dir in $rmdirs; do
-      if test -d "$dir"; then
-	$show "rmdir $dir"
-	$run rmdir $dir >/dev/null 2>&1
-      fi
-    done
-
-    exit $exit_status
-    ;;
-
-  "")
-    $echo "$modename: you must specify a MODE" 1>&2
-    $echo "$generic_help" 1>&2
-    exit $EXIT_FAILURE
-    ;;
-  esac
-
-  if test -z "$exec_cmd"; then
-    $echo "$modename: invalid operation mode \`$mode'" 1>&2
-    $echo "$generic_help" 1>&2
-    exit $EXIT_FAILURE
-  fi
-fi # test -z "$show_help"
-
-if test -n "$exec_cmd"; then
-  eval exec $exec_cmd
-  exit $EXIT_FAILURE
-fi
-
-# We need to display help for each of the modes.
-case $mode in
-"") $echo \
-"Usage: $modename [OPTION]... [MODE-ARG]...
-
-Provide generalized library-building support services.
-
-    --config          show all configuration variables
-    --debug           enable verbose shell tracing
--n, --dry-run         display commands without modifying any files
-    --features        display basic configuration information and exit
-    --finish          same as \`--mode=finish'
-    --help            display this help message and exit
-    --mode=MODE       use operation mode MODE [default=inferred from MODE-ARGS]
-    --quiet           same as \`--silent'
-    --silent          don't print informational messages
-    --tag=TAG         use configuration variables from tag TAG
-    --version         print version information
-
-MODE must be one of the following:
-
-      clean           remove files from the build directory
-      compile         compile a source file into a libtool object
-      execute         automatically set library path, then run a program
-      finish          complete the installation of libtool libraries
-      install         install libraries or executables
-      link            create a library or an executable
-      uninstall       remove libraries from an installed directory
-
-MODE-ARGS vary depending on the MODE.  Try \`$modename --help --mode=MODE' for
-a more detailed description of MODE.
-
-Report bugs to <bug-libtool@gnu.org>."
-  exit $EXIT_SUCCESS
-  ;;
-
-clean)
-  $echo \
-"Usage: $modename [OPTION]... --mode=clean RM [RM-OPTION]... FILE...
-
-Remove files from the build directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, object or program, all the files associated
-with it are deleted. Otherwise, only FILE itself is deleted using RM."
-  ;;
-
-compile)
-  $echo \
-"Usage: $modename [OPTION]... --mode=compile COMPILE-COMMAND... SOURCEFILE
-
-Compile a source file into a libtool library object.
-
-This mode accepts the following additional options:
-
-  -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
-  -prefer-pic       try to building PIC objects only
-  -prefer-non-pic   try to building non-PIC objects only
-  -static           always build a \`.o' file suitable for static linking
-
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
-from the given SOURCEFILE.
-
-The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
-  ;;
-
-execute)
-  $echo \
-"Usage: $modename [OPTION]... --mode=execute COMMAND [ARGS]...
-
-Automatically set library path, then run a program.
-
-This mode accepts the following additional options:
-
-  -dlopen FILE      add the directory containing FILE to the library path
-
-This mode sets the library path environment variable according to \`-dlopen'
-flags.
-
-If any of the ARGS are libtool executable wrappers, then they are translated
-into their corresponding uninstalled binary, and any of their required library
-directories are added to the library path.
-
-Then, COMMAND is executed, with ARGS as arguments."
-  ;;
-
-finish)
-  $echo \
-"Usage: $modename [OPTION]... --mode=finish [LIBDIR]...
-
-Complete the installation of libtool libraries.
-
-Each LIBDIR is a directory that contains libtool libraries.
-
-The commands that this mode executes may require superuser privileges.  Use
-the \`--dry-run' option if you just want to see what would be executed."
-  ;;
-
-install)
-  $echo \
-"Usage: $modename [OPTION]... --mode=install INSTALL-COMMAND...
-
-Install executables or libraries.
-
-INSTALL-COMMAND is the installation command.  The first component should be
-either the \`install' or \`cp' program.
-
-The rest of the components are interpreted as arguments to that command (only
-BSD-compatible install options are recognized)."
-  ;;
-
-link)
-  $echo \
-"Usage: $modename [OPTION]... --mode=link LINK-COMMAND...
-
-Link object files or libraries together to form another library, or to
-create an executable program.
-
-LINK-COMMAND is a command using the C compiler that you would use to create
-a program from several object files.
-
-The following components of LINK-COMMAND are treated specially:
-
-  -all-static       do not do any dynamic linking at all
-  -avoid-version    do not add a version suffix if possible
-  -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
-  -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
-  -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-  -export-symbols SYMFILE
-		    try to export only the symbols listed in SYMFILE
-  -export-symbols-regex REGEX
-		    try to export only the symbols matching REGEX
-  -LLIBDIR          search LIBDIR for required installed libraries
-  -lNAME            OUTPUT-FILE requires the installed library libNAME
-  -module           build a library that can dlopened
-  -no-fast-install  disable the fast-install mode
-  -no-install       link a not-installable executable
-  -no-undefined     declare that a library does not refer to external symbols
-  -o OUTPUT-FILE    create OUTPUT-FILE from the specified objects
-  -objectlist FILE  Use a list of object files found in FILE to specify objects
-  -precious-files-regex REGEX
-                    don't remove output files matching REGEX
-  -release RELEASE  specify package release information
-  -rpath LIBDIR     the created library will eventually be installed in LIBDIR
-  -R[ ]LIBDIR       add LIBDIR to the runtime path of programs and libraries
-  -static           do not do any dynamic linking of libtool libraries
-  -version-info CURRENT[:REVISION[:AGE]]
-		    specify library version info [each variable defaults to 0]
-
-All other options (arguments beginning with \`-') are ignored.
-
-Every other argument is treated as a filename.  Files ending in \`.la' are
-treated as uninstalled libtool libraries, other files are standard or library
-object files.
-
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
-required, except when creating a convenience library.
-
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
-
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
-is created, otherwise an executable program is created."
-  ;;
-
-uninstall)
-  $echo \
-"Usage: $modename [OPTION]... --mode=uninstall RM [RM-OPTION]... FILE...
-
-Remove libraries from an installation directory.
-
-RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm').  RM-OPTIONS are options (such as \`-f') to be passed
-to RM.
-
-If FILE is a libtool library, all the files associated with it are deleted.
-Otherwise, only FILE itself is deleted using RM."
-  ;;
-
-*)
-  $echo "$modename: invalid operation mode \`$mode'" 1>&2
-  $echo "$help" 1>&2
-  exit $EXIT_FAILURE
-  ;;
-esac
-
-$echo
-$echo "Try \`$modename --help' for more information about other modes."
-
-exit $EXIT_SUCCESS
-
-# The TAGs below are defined such that we never get into a situation
-# in which we disable both kinds of libraries.  Given conflicting
-# choices, we go for a static library, that is the most portable,
-# since we can't tell whether shared libraries were disabled because
-# the user asked for that or because the platform doesn't support
-# them.  This is particularly important on AIX, because we don't
-# support having both static and shared libraries enabled at the same
-# time on that platform, so we default to a shared-only configuration.
-# If a disable-shared tag is given, we'll fallback to a static-only
-# configuration.  But we'll never go from static-only to shared-only.
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-shared
-build_libtool_libs=no
-build_old_libs=yes
-# ### END LIBTOOL TAG CONFIG: disable-shared
-
-# ### BEGIN LIBTOOL TAG CONFIG: disable-static
-build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
-# ### END LIBTOOL TAG CONFIG: disable-static
-
-# Local Variables:
-# mode:shell-script
-# sh-indentation:2
-# End:
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/missing b/abs/mv-core/ghosd/ghosd-0.0.1/missing
deleted file mode 100755
index 09edd88..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/missing
+++ /dev/null
@@ -1,357 +0,0 @@
-#! /bin/sh
-# Common stub for a few missing GNU programs while installing.
-
-scriptversion=2005-02-08.22
-
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
-#   Free Software Foundation, Inc.
-# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-# 02111-1307, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-if test $# -eq 0; then
-  echo 1>&2 "Try \`$0 --help' for more information"
-  exit 1
-fi
-
-run=:
-
-# In the cases where this matters, `missing' is being run in the
-# srcdir already.
-if test -f configure.ac; then
-  configure_ac=configure.ac
-else
-  configure_ac=configure.in
-fi
-
-msg="missing on your system"
-
-case "$1" in
---run)
-  # Try to run requested program, and just exit if it succeeds.
-  run=
-  shift
-  "$@" && exit 0
-  # Exit code 63 means version mismatch.  This often happens
-  # when the user try to use an ancient version of a tool on
-  # a file that requires a minimum version.  In this case we
-  # we should proceed has if the program had been absent, or
-  # if --run hadn't been passed.
-  if test $? = 63; then
-    run=:
-    msg="probably too old"
-  fi
-  ;;
-
-  -h|--h|--he|--hel|--help)
-    echo "\
-$0 [OPTION]... PROGRAM [ARGUMENT]...
-
-Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
-error status if there is no known handling for PROGRAM.
-
-Options:
-  -h, --help      display this help and exit
-  -v, --version   output version information and exit
-  --run           try to run the given command, and emulate it if it fails
-
-Supported PROGRAM values:
-  aclocal      touch file \`aclocal.m4'
-  autoconf     touch file \`configure'
-  autoheader   touch file \`config.h.in'
-  automake     touch all \`Makefile.in' files
-  bison        create \`y.tab.[ch]', if possible, from existing .[ch]
-  flex         create \`lex.yy.c', if possible, from existing .c
-  help2man     touch the output file
-  lex          create \`lex.yy.c', if possible, from existing .c
-  makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
-  yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
-
-Send bug reports to <bug-automake@gnu.org>."
-    exit $?
-    ;;
-
-  -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing $scriptversion (GNU Automake)"
-    exit $?
-    ;;
-
-  -*)
-    echo 1>&2 "$0: Unknown \`$1' option"
-    echo 1>&2 "Try \`$0 --help' for more information"
-    exit 1
-    ;;
-
-esac
-
-# Now exit if we have it, but it failed.  Also exit now if we
-# don't have it and --version was passed (most likely to detect
-# the program).
-case "$1" in
-  lex|yacc)
-    # Not GNU programs, they don't have --version.
-    ;;
-
-  tar)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
-  *)
-    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
-       # We have it, but it failed.
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       # Could not run --version or --help.  This is probably someone
-       # running `$TOOL --version' or `$TOOL --help' to check whether
-       # $TOOL exists and not knowing $TOOL uses missing.
-       exit 1
-    fi
-    ;;
-esac
-
-# If it does not exist, or fails to run (possibly an outdated version),
-# try to emulate it.
-case "$1" in
-  aclocal*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
-         to install the \`Automake' and \`Perl' packages.  Grab them from
-         any GNU archive site."
-    touch aclocal.m4
-    ;;
-
-  autoconf)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`${configure_ac}'.  You might want to install the
-         \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
-         archive site."
-    touch configure
-    ;;
-
-  autoheader)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
-         to install the \`Autoconf' and \`GNU m4' packages.  Grab them
-         from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
-    test -z "$files" && files="config.h"
-    touch_files=
-    for f in $files; do
-      case "$f" in
-      *:*) touch_files="$touch_files "`echo "$f" |
-				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
-      *) touch_files="$touch_files $f.in";;
-      esac
-    done
-    touch $touch_files
-    ;;
-
-  automake*)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
-         You might want to install the \`Automake' and \`Perl' packages.
-         Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print |
-	   sed 's/\.am$/.in/' |
-	   while read f; do touch "$f"; done
-    ;;
-
-  autom4te)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, but is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.
-         You can get \`$1' as part of \`Autoconf' from any GNU
-         archive site."
-
-    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
-    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
-    if test -f "$file"; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo "#! /bin/sh"
-	echo "# Created by GNU Automake missing as a replacement of"
-	echo "#  $ $@"
-	echo "exit 0"
-	chmod +x $file
-	exit 1
-    fi
-    ;;
-
-  bison|yacc)
-    echo 1>&2 "\
-WARNING: \`$1' $msg.  You should only need it if
-         you modified a \`.y' file.  You may need the \`Bison' package
-         in order for those modifications to take effect.  You can get
-         \`Bison' from any GNU archive site."
-    rm -f y.tab.c y.tab.h
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.y)
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.c
-	    fi
-	    SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" y.tab.h
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f y.tab.h ]; then
-	echo >y.tab.h
-    fi
-    if [ ! -f y.tab.c ]; then
-	echo 'main() { return 0; }' >y.tab.c
-    fi
-    ;;
-
-  lex|flex)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.l' file.  You may need the \`Flex' package
-         in order for those modifications to take effect.  You can get
-         \`Flex' from any GNU archive site."
-    rm -f lex.yy.c
-    if [ $# -ne 1 ]; then
-        eval LASTARG="\${$#}"
-	case "$LASTARG" in
-	*.l)
-	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
-	    if [ -f "$SRCFILE" ]; then
-	         cp "$SRCFILE" lex.yy.c
-	    fi
-	  ;;
-	esac
-    fi
-    if [ ! -f lex.yy.c ]; then
-	echo 'main() { return 0; }' >lex.yy.c
-    fi
-    ;;
-
-  help2man)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-	 you modified a dependency of a manual page.  You may need the
-	 \`Help2man' package in order for those modifications to take
-	 effect.  You can get \`Help2man' from any GNU archive site."
-
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
-    fi
-    if [ -f "$file" ]; then
-	touch $file
-    else
-	test -z "$file" || exec >$file
-	echo ".ab help2man is required to generate this page"
-	exit 1
-    fi
-    ;;
-
-  makeinfo)
-    echo 1>&2 "\
-WARNING: \`$1' is $msg.  You should only need it if
-         you modified a \`.texi' or \`.texinfo' file, or any other file
-         indirectly affecting the aspect of the manual.  The spurious
-         call might also be the consequence of using a buggy \`make' (AIX,
-         DU, IRIX).  You might want to install the \`Texinfo' package or
-         the \`GNU make' package.  Grab either from any GNU archive site."
-    # The file to touch is that specified with -o ...
-    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
-    if test -z "$file"; then
-      # ... or it is the one specified with @setfilename ...
-      infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
-      file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
-      # ... or it is derived from the source name (dir/f.texi becomes f.info)
-      test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
-    fi
-    touch $file
-    ;;
-
-  tar)
-    shift
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case "$firstarg" in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case "$firstarg" in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
-  *)
-    echo 1>&2 "\
-WARNING: \`$1' is needed, and is $msg.
-         You might have modified some files without having the
-         proper tools for further handling them.  Check the \`README' file,
-         it often tells you about the needed prerequisites for installing
-         this package.  You may also peek at any GNU archive site, in case
-         some other package would contain this missing \`$1' program."
-    exit 1
-    ;;
-esac
-
-exit 0
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff --git a/abs/mv-core/ghosd/ghosd-0.0.1/stamp-h1 b/abs/mv-core/ghosd/ghosd-0.0.1/stamp-h1
deleted file mode 100644
index 4547fe1..0000000
--- a/abs/mv-core/ghosd/ghosd-0.0.1/stamp-h1
+++ /dev/null
@@ -1 +0,0 @@
-timestamp for config.h
diff --git a/abs/mv-core/ghosd/green-800.png b/abs/mv-core/ghosd/green-800.png
deleted file mode 100644
index b1cd057..0000000
--- a/abs/mv-core/ghosd/green-800.png
+++ /dev/null
diff --git a/abs/mv-core/ghosd/green800.png b/abs/mv-core/ghosd/green800.png
deleted file mode 100644
index b0750d0..0000000
--- a/abs/mv-core/ghosd/green800.png
+++ /dev/null
diff --git a/abs/mv-core/ghosd/grey800.png b/abs/mv-core/ghosd/grey800.png
deleted file mode 100644
index 141c203..0000000
--- a/abs/mv-core/ghosd/grey800.png
+++ /dev/null
diff --git a/abs/mv-core/ghosd/image.c b/abs/mv-core/ghosd/image.c
deleted file mode 100644
index cd5dadd..0000000
--- a/abs/mv-core/ghosd/image.c
+++ /dev/null
@@ -1,97 +0,0 @@
-/* ghosd -- OSD with fake transparency, cairo, and pango.
- * Copyright (C) 2006 Evan Martin <martine@danga.com>
- */
-
-#include <stdio.h>
-#include <math.h>   
-#include <cairo/cairo.h>
-#include <unistd.h>
-#include <ghosd/ghosd.h>
-
-#include "example-shared.h"
-
-#define MARGIN 10
-#define RADIUS 20
-#define WIDTH 185
-#define HEIGHT 220
-char displayText[200] = "default message";
-
-static void
-render(Ghosd *ghosd, cairo_t *cr, void* data) {
-  cairo_surface_t* image = data;
-  const int width  = cairo_image_surface_get_width(image);
-  const int height = cairo_image_surface_get_height(image);
-
-  cairo_set_source_rgba(cr, 0, 0, 0, 0.5);
-  cairo_new_path(cr);
-  example_round_rect(cr, 0, 0, width+(2*MARGIN), height+(2*MARGIN), RADIUS);
-  cairo_fill(cr);
-
-  cairo_save(cr);
-  cairo_set_source_surface(cr, image, MARGIN, MARGIN);
-
-
-
-
-  cairo_paint_with_alpha(cr, 0.9);
-  cairo_restore(cr);
-cairo_select_font_face (cr, "Sans", CAIRO_FONT_SLANT_NORMAL,
-                               CAIRO_FONT_WEIGHT_BOLD);
-cairo_set_font_size (cr, 90.0);
-
-// cairo_move_to (cr, 10.0, 135.0);
-// cairo_show_text (cr, "Hello");
-
-cairo_move_to (cr, 70.0, 165.0);
-cairo_text_path (cr, displayText);
-cairo_set_source_rgb (cr, 1.5, 1.5, 1);
-cairo_fill_preserve (cr);
-cairo_set_source_rgb (cr, 0, 0, 0);
-cairo_set_line_width (cr, 2.56);
-cairo_stroke (cr);
-}
-
-int main(int argc, char* argv[]) {
-  //g_type_init();
-
-  char *filename = NULL;
-  GOptionEntry options[] = {
-    { "image", 'i', G_OPTION_FLAG_IN_MAIN, G_OPTION_ARG_STRING,
-      (gpointer)&filename, "image to display", "PATH" },
-    { NULL }
-  };
-  GOptionGroup *group = g_option_group_new("image", "Image Options", "image help",
-                                           NULL, NULL);
-  g_option_group_add_entries(group, options);
-  example_options_parse(&argc, &argv, group, NULL);
-
-  if (filename == NULL) {
-    printf("must specify image with -i flag.\n"
-           "try e.g. /usr/share/pixmaps/gnome-logo-large.png\n");
-    return 1;
-  }
-
- if( argc == 2 )
-  {
-    sprintf(displayText,	argv[1]);
-
-      }
- 
-
-  Ghosd *ghosd;
-  cairo_surface_t* image = cairo_image_surface_create_from_png(filename);
-  const int width  = cairo_image_surface_get_width(image);
-  const int height = cairo_image_surface_get_height(image);
-
-  ghosd = ghosd_new();
-  ghosd_set_transparent(ghosd, opts.transparent);
-  ghosd_set_position(ghosd, opts.x, opts.y,
-                     width+(2*MARGIN), height+(2*MARGIN));
-  ghosd_set_render(ghosd, render, image);
-
-  ghosd_flash(ghosd, 1300, 6500);
-
-  return 0;
-}
-
-/* vim: set ts=2 sw=2 et cino=(0 : */
diff --git a/abs/mv-core/ghosd/osdClient.pl b/abs/mv-core/ghosd/osdClient.pl
deleted file mode 100755
index 06fc381..0000000
--- a/abs/mv-core/ghosd/osdClient.pl
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/perl -w
-# osdClient.pl - send simple client text to server
-
-use strict;
-use IO::Socket::INET;
-use POSIX qw(F_GETFL F_SETFL O_NONBLOCK);
-my $sock = "";
-
-if( $#ARGV != 2 ){ die "specify a ip, port, text string" }
-
-eval
-{
-  $sock = IO::Socket::INET->new( 
-    PeerAddr => $ARGV[0],
-    PeerPort => $ARGV[1]) || die "can't set it up $!";
-
-  $sock->blocking(0)
-};
-
-if( $@ =~ /socket/i )
-{
-  print "die in record retrieval socket setup with $@";
-}
-
-print $sock "$ARGV[2] \n";
diff --git a/abs/mv-core/ghosd/osdServer.config b/abs/mv-core/ghosd/osdServer.config
deleted file mode 100644
index 915cef9..0000000
--- a/abs/mv-core/ghosd/osdServer.config
+++ /dev/null
@@ -1,6 +0,0 @@
-image _#_ ALT _#_ /usr/share/red800.png -x -0 -y -450 75 90 1 1 1 50 900 6000
-image _#_ SYS _#_ /usr/share/blue800.png -x -0 -y -450 75 90 1 1 1 50 900 6000
-image _#_ PHN _#_ /usr/share/yellow800.png -x -0 -y -450 75 90 1 1 1 50 900 6000
-image _#_ PH2 _#_ /usr/share/yellow800.png -x -0 -y 450 75 90 1 1 1 50 900 6000
-image _#_ OTH _#_ /usr/share/grey800.png -x -0 -y -450 75 90 1 1 1 50 900 6000
-image _#_ NFO _#_ /usr/share/green800.png -x -0 -y -450 75 90 1 1 1 50 900 6000
diff --git a/abs/mv-core/ghosd/osdServer.pl b/abs/mv-core/ghosd/osdServer.pl
deleted file mode 100755
index 8cd62b7..0000000
--- a/abs/mv-core/ghosd/osdServer.pl
+++ /dev/null
@@ -1,189 +0,0 @@
-#!/usr/bin/perl -w
-# osdServer.pl - process incoming text events based on keyword matching and
-#                display using Ghosd
-use strict;
-use FileHandle;
-use Socket;
-use Thread;
-use Config;
-use Thread qw(async);
-
-if( @ARGV != 1 ){ die "specify a port to listen on " }
-my %osdHash = ();
-my $proto    = "";
-my $port     = "";
-my $port1    = "";
-my $sockAddr = "";
-my $sockAddr1= "";
-my $fullCmd  = "";
-my $fullCmd1 = "";
-
-# readKeyWordFile reads type, keywords, (text/image) parameters
-# text parameters:
-# X coordinate, Y coordinate, red, green, blue, font size, fade In, fade Out
-# image parameters:
-# image filename, X coordinate, Y coordinate
-# osdServer.confg format is:  type _#_ keywords _#_ osd parameters
-sub readOsdFile  
-{
-  open(OSDFILE,"/etc/osdServer.config") or die "no osdServer.config file: $!";
-
-    while(<OSDFILE>){
-
-      # ignore comment lines
-      if( !/^#/ ){
-        chomp($_);
-        my @arrLine = split "_#_";
-        $arrLine[0] =~ s/ //g;
-        $osdHash{ lc($arrLine[0]) }{ $arrLine[1] } = $arrLine[2];
-      }#if not a comment line
-
-    }#for each line in file
-
-  close(OSDFILE);
-
-}#readOsdFile
-
-sub matchWords
-{
-  my $msgString = $_[0];
-  my $type      = $_[1];
-#  print "msgstring  $msgString \n";
-  
- # print "type  $type\n " ;
-  # for the type specified
-  for my $kwList ( keys %{ $osdHash{$type} } )
-  {
-    # for each word
-    for my $checkWord ( split " ", $kwList )
-    {
-      $checkWord =~ s/ //g;
-      if( $msgString =~ /$checkWord/i )
-      { 
-        if( $type eq "text" )
-        {   
-          $fullCmd .= qq{./text '$msgString' $osdHash{text}{$kwList} &};
-
-           #print "$fullCmd\n";
-        }else
-        {  
-	my @realstring = split(/:::/, $msgString);	  
-          print "$realstring[0] \n";
-	  $fullCmd .= qq{/usr/bin/imageGhosd  -i $osdHash{image}{$kwList} '$realstring[0]'  &};
-#           print "full $fullCmd\n";
-	  #print "msgstring-  $msgString \n";
-        }
-      }#if matching word
-    }#for each check word
-  }#for each key word list
-
-}#checkText
-
-sub matchWords1
-{
-  my $msgString = $_[0];
-  my $type      = $_[1];
-#  print "msgstring  $msgString \n";
-  print "Here ia m"  ;
- # print "type  $type\n " ;
-  # for the type specified
-  for my $kwList ( keys %{ $osdHash{$type} } )
-  {
-    # for each word
-    for my $checkWord ( split " ", $kwList )
-    {
-      $checkWord =~ s/ //g;
-      if( $msgString =~ /$checkWord/i )
-      { 
-        if( $type eq "text" )
-        {   
-          $fullCmd1 .= qq{./text '$msgString' $osdHash{text}{$kwList} &};
-
-           #print "$fullCmd\n";
-        }else
-        {  
-	my @realstring = split(/:::/, $msgString);	  
-          print "$realstring[0] \n";
-	  $fullCmd1 .= qq{/usr/bin/imageGhosd  -i $osdHash{image}{$kwList} '$realstring[0]'  &};
-           print "full $fullCmd1\n";
-	  #print "msgstring-  $msgString \n";
-        }
-      }#if matching word
-    }#for each check word
-  }#for each key word list
-}
-
-sub sub1 { 
-	while( 1 )
-	{
-	  my $acceptSock1 = accept(HANDLER, SERVER1) or die "accept: $!\n";
-	  my($acceptPort1, $acceptIpAddr) = sockaddr_in($acceptSock1);
-	
-	  autoflush HANDLER 1;
-	  while(my $msgString1 = <HANDLER>)
-	  {
-	    chomp($msgString1);
-	    matchWords1($msgString1,"text");
-	    matchWords1($msgString1,"image");
-	
-	    $fullCmd1 = `$fullCmd1` unless $fullCmd1 eq ""; 
-	    $fullCmd1 = "";
-	  }#while handler
-
-	  close HANDLER or die "close HANDLER: $!\n";
-	}#while forever
-}
-
-# begin main program
-
-readOsdFile();
-
-$proto = getprotobyname('tcp');
-socket(SERVER, PF_INET, SOCK_STREAM, $proto) or die "socket: $!\n";
-socket(SERVER1, PF_INET, SOCK_STREAM, $proto) or die "socket: $!\n";
-
-$port     = $ARGV[0];
-$port1     = $port + 1;
-$port1     = 5001; 
-
-$sockAddr = sockaddr_in($port, INADDR_ANY);
-$sockAddr1 = sockaddr_in($port1,  INADDR_ANY);
-
-bind(SERVER, $sockAddr) or die "bind: $!\n";
-bind(SERVER1, $sockAddr1) or die "bind: $!\n";
-
-listen(SERVER, SOMAXCONN) or die "listen: $!\n";
-listen(SERVER1, SOMAXCONN) or die "listen: $!\n";
-
-
-
-$Config{usethreads} or die "Recompile Perl with threads to run this program.";
-
-my  $thr = threads->new(\&sub1);
-
-
-
-
-#listen foreve 
-
-while( 1 )
-{
-  my $acceptSock = accept(HANDLER, SERVER) or die "accept: $!\n";
-  my($acceptPort, $acceptIpAddr) = sockaddr_in($acceptSock);
-
-  autoflush HANDLER 1;
-  while(my $msgString = <HANDLER>)
-  {
-    chomp($msgString);
-
-    matchWords($msgString,"text");
-    matchWords($msgString,"image");
-
-    $fullCmd = `$fullCmd` unless $fullCmd eq ""; 
-    $fullCmd = "";
-  }#while handler
-
-  close HANDLER or die "close HANDLER: $!\n";
-
-}#while forever
-
diff --git a/abs/mv-core/ghosd/red800.png b/abs/mv-core/ghosd/red800.png
deleted file mode 100644
index 7c7ae5c..0000000
--- a/abs/mv-core/ghosd/red800.png
+++ /dev/null
diff --git a/abs/mv-core/ghosd/yellow800.png b/abs/mv-core/ghosd/yellow800.png
deleted file mode 100644
index f6bfae1..0000000
--- a/abs/mv-core/ghosd/yellow800.png
+++ /dev/null
diff --git a/abs/mv-core/graphviz/PKGBUILD b/abs/mv-core/graphviz/PKGBUILD
deleted file mode 100644
index 8f127b7..0000000
--- a/abs/mv-core/graphviz/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-pkgname=graphviz
-pkgver=2.20.2
-pkgrel=2
-pkgdesc="Graph Visualization Software"
-arch=(i686)
-url="http://www.graphviz.org/About.php"
-license=('CPL')
-install=(graphviz.install)
-depends=(cairo expat fontconfig gettext glib2 libpng pango zlib)
-makedepends=(ghostscript swig )
-source=(http://www.graphviz.org/pub/graphviz/ARCHIVE/$pkgname-$pkgver.tar.gz)
-
-build() {
-		cd $startdir/src/$pkgname-$pkgver
-		make clean
-		./configure --prefix=/usr --disable-perl
-		make || return 1
-		make DESTDIR=$startdir/pkg install
-				}
-
-#disabled perl
diff --git a/abs/mv-core/graphviz/graphviz.install b/abs/mv-core/graphviz/graphviz.install
deleted file mode 100755
index aba02b8..0000000
--- a/abs/mv-core/graphviz/graphviz.install
+++ /dev/null
@@ -1,39 +0,0 @@
-# This is a default template for a post-install scriptlet.  You can
-# remove any functions you don't need (and this header).
-
-# arg 1:  the new package version
-pre_install() {
-  /bin/true
-}
-
-# arg 1:  the new package version
-post_install() {
-/usr/bin/dot -cv  
-/usr/bin/dot -c  
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-pre_upgrade() {
-  /bin/true
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  /bin/true
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  /bin/true
-}
-
-# arg 1:  the old package version
-post_remove() {
-  /bin/true
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/mv-core/hobbit-client/PKGBUILD b/abs/mv-core/hobbit-client/PKGBUILD
deleted file mode 100755
index 25ad6ce..0000000
--- a/abs/mv-core/hobbit-client/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-pkgname=hobbit-client
-pkgver=4.2.0
-pkgrel=74
-pkgdesc="Hobbit is a system for monitoring servers and networks. "
-license="GPL"
-arch=('i686')
-
-url="http://hobbitmon.sourceforge.net/"
-source=( )
-depends="pcre "
-install=hobbit-client.install
-
-build() {
-
-#create client package as well
-mkdir -p $startdir/pkg/data/srv/hobbit/
-cp -rp $startdir/client  $startdir/pkg/data/srv/hobbit/client
-
-}
-
diff --git a/abs/mv-core/hobbit-client/client/bin/bb b/abs/mv-core/hobbit-client/client/bin/bb
deleted file mode 100755
index 0fa4434..0000000
--- a/abs/mv-core/hobbit-client/client/bin/bb
+++ /dev/null
diff --git a/abs/mv-core/hobbit-client/client/bin/bbcmd b/abs/mv-core/hobbit-client/client/bin/bbcmd
deleted file mode 100755
index a18e54c..0000000
--- a/abs/mv-core/hobbit-client/client/bin/bbcmd
+++ /dev/null
diff --git a/abs/mv-core/hobbit-client/client/bin/bbdigest b/abs/mv-core/hobbit-client/client/bin/bbdigest
deleted file mode 100755
index c073c01..0000000
--- a/abs/mv-core/hobbit-client/client/bin/bbdigest
+++ /dev/null
diff --git a/abs/mv-core/hobbit-client/client/bin/bbhostgrep b/abs/mv-core/hobbit-client/client/bin/bbhostgrep
deleted file mode 100755
index d46fd7b..0000000
--- a/abs/mv-core/hobbit-client/client/bin/bbhostgrep
+++ /dev/null
diff --git a/abs/mv-core/hobbit-client/client/bin/bbhostshow b/abs/mv-core/hobbit-client/client/bin/bbhostshow
deleted file mode 100755
index ea5633a..0000000
--- a/abs/mv-core/hobbit-client/client/bin/bbhostshow
+++ /dev/null
diff --git a/abs/mv-core/hobbit-client/client/bin/clientupdate b/abs/mv-core/hobbit-client/client/bin/clientupdate
deleted file mode 100755
index 761feae..0000000
--- a/abs/mv-core/hobbit-client/client/bin/clientupdate
+++ /dev/null
diff --git a/abs/mv-core/hobbit-client/client/bin/hobbitclient-aix.sh b/abs/mv-core/hobbit-client/client/bin/hobbitclient-aix.sh
deleted file mode 100755
index d1a0dc2..0000000
--- a/abs/mv-core/hobbit-client/client/bin/hobbitclient-aix.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/sh
-#----------------------------------------------------------------------------#
-# AIX client for Hobbit                                                      #
-#                                                                            #
-# Copyright (C) 2005-2006 Henrik Storner <henrik@hswn.dk>                    #
-#                                                                            #
-# This program is released under the GNU General Public License (GPL),       #
-# version 2. See the file "COPYING" for details.                             #
-#                                                                            #
-#----------------------------------------------------------------------------#
-#
-# $Id: hobbitclient-aix.sh,v 1.14 2006/07/05 05:52:22 henrik Rel $
-
-echo "[date]"
-date
-echo "[uname]"
-uname -a
-echo "[uptime]"
-uptime
-echo "[who]"
-who
-echo "[df]"
-# The sed stuff is to make sure lines are not split into two.
-df -Ik | sed -e '/^[^ 	][^ 	]*$/{
-N
-s/[ 	]*\n[ 	]*/ /
-}'
-echo "[mount]"
-mount
-echo "[realmem]"
-lsattr -El sys0 -a realmem
-echo "[freemem]"
-vmstat 1 2 | tail -1
-echo "[swap]"
-lsps -s
-echo "[ifconfig]"
-ifconfig -a
-echo "[route]"
-netstat -r
-echo "[netstat]"
-netstat -s
-echo "[ports]"
-netstat -an | grep "^tcp"
-echo "[ifstat]"
-netstat -v
-echo "[ps]"
-# I think the -f and -l options are ignored with -o, but this works...
-ps -A -k -f -l -o pid,ppid,user,stat,pri,pcpu,time,etime,pmem,vsz,args
-
-# $TOP must be set, the install utility should do that for us if it exists.
-if test "$TOP" != ""
-then
-    if test -x "$TOP"
-    then
-        echo "[top]"
-        $TOP -b 20
-    fi
-fi
-
-# vmstat
-nohup sh -c "vmstat 300 2 1>$BBTMP/hobbit_vmstat.$MACHINEDOTS.$$ 2>&1; mv $BBTMP/hobbit_vmstat.$MACHINEDOTS.$$ $BBTMP/hobbit_vmstat.$MACHINEDOTS" </dev/null >/dev/null 2>&1 &
-sleep 5
-if test -f $BBTMP/hobbit_vmstat.$MACHINEDOTS; then echo "[vmstat]"; cat $BBTMP/hobbit_vmstat.$MACHINEDOTS; rm -f $BBTMP/hobbit_vmstat.$MACHINEDOTS; fi
-
-exit
-
diff --git a/abs/mv-core/hobbit-client/client/bin/hobbitclient-darwin.sh b/abs/mv-core/hobbit-client/client/bin/hobbitclient-darwin.sh
deleted file mode 100755
index 600a31f..0000000
--- a/abs/mv-core/hobbit-client/client/bin/hobbitclient-darwin.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/sh
-#
-#----------------------------------------------------------------------------#
-# Darwin (Mac OS X) client for Hobbit                                        #
-#                                                                            #
-# Copyright (C) 2005-2006 Henrik Storner <henrik@hswn.dk>                    #
-#                                                                            #
-# This program is released under the GNU General Public License (GPL),       #
-# version 2. See the file "COPYING" for details.                             #
-#                                                                            #
-#----------------------------------------------------------------------------#
-#
-# $Id: hobbitclient-darwin.sh,v 1.17 2006/07/05 05:52:22 henrik Rel $
-
-echo "[date]"
-date
-echo "[uname]"
-uname -a
-echo "[uptime]"
-uptime
-echo "[who]"
-who
-echo "[df]"
-# The sed stuff is to make sure lines are not split into two.
-df -H -t nonfs,nullfs,cd9660,procfs,volfs,devfs,fdesc | sed -e '/^[^ 	][^ 	]*$/{
-N
-s/[ 	]*\n[ 	]*/ /
-}'
-echo "[mount]"
-mount
-echo "[meminfo]"
-vm_stat
-echo "[ifconfig]"
-ifconfig -a
-echo "[route]"
-netstat -r
-echo "[netstat]"
-netstat -s
-echo "[ifstat]"
-netstat -ibn | egrep -v "^lo|<Link"
-echo "[ports]"
-netstat -an|grep "^tcp"
-echo "[ps]"
-ps -ax -ww -o pid,ppid,user,start,state,pri,pcpu,time,pmem,rss,vsz,command
-
-# $TOP must be set, the install utility should do that for us if it exists.
-if test "$TOP" != ""
-then
-    if test -x "$TOP"
-    then
-        echo "[top]"
-	$TOP -l 1 -n 20
-    fi
-fi
-
-exit
-
diff --git a/abs/mv-core/hobbit-client/client/bin/hobbitclient-freebsd.sh b/abs/mv-core/hobbit-client/client/bin/hobbitclient-freebsd.sh
deleted file mode 100755
index bc30c5a..0000000
--- a/abs/mv-core/hobbit-client/client/bin/hobbitclient-freebsd.sh
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh
-#
-#----------------------------------------------------------------------------#
-# FreeBSD client for Hobbit                                                  #
-#                                                                            #
-# Copyright (C) 2005-2006 Henrik Storner <henrik@hswn.dk>                    #
-#                                                                            #
-# This program is released under the GNU General Public License (GPL),       #
-# version 2. See the file "COPYING" for details.                             #
-#                                                                            #
-#----------------------------------------------------------------------------#
-#
-# $Id: hobbitclient-freebsd.sh,v 1.17 2006/07/05 05:52:22 henrik Rel $
-
-echo "[date]"
-date
-echo "[uname]"
-uname -a
-echo "[uptime]"
-uptime
-echo "[who]"
-who
-echo "[df]"
-# The sed stuff is to make sure lines are not split into two.
-df -H -tnonfs,nullfs,cd9660,procfs,devfs,linprocfs | sed -e '/^[^ 	][^ 	]*$/{
-N
-s/[ 	]*\n[ 	]*/ /
-}'
-echo "[mount]"
-mount
-echo "[meminfo]"
-$BBHOME/bin/freebsd-meminfo
-echo "[swapinfo]"
-swapinfo -k
-echo "[ifconfig]"
-ifconfig -a
-echo "[route]"
-netstat -rn
-echo "[ifstat]"
-netstat -i -b -n | egrep -v "^lo|<Link"
-echo "[netstat]"
-netstat -s
-echo "[ports]"
-(netstat -na -f inet; netstat -na -f inet6) | grep "^tcp"
-echo "[ps]"
-# Dont use "args". "command" works also in FreeBSD 4.x.
-ps -ax -ww -o pid,ppid,user,start,state,pri,pcpu,cputime,pmem,rss,vsz,command
-
-# $TOP must be set, the install utility should do that for us if it exists.
-if test "$TOP" != ""
-then
-    if test -x "$TOP"
-    then
-        echo "[top]"
-	$TOP -n 20
-    fi
-fi
-
-# vmstat
-nohup sh -c "vmstat 300 2 1>$BBTMP/hobbit_vmstat.$MACHINEDOTS.$$ 2>&1; mv $BBTMP/hobbit_vmstat.$MACHINEDOTS.$$ $BBTMP/hobbit_vmstat.$MACHINEDOTS" </dev/null >/dev/null 2>&1 &
-sleep 5
-if test -f $BBTMP/hobbit_vmstat.$MACHINEDOTS; then echo "[vmstat]"; cat $BBTMP/hobbit_vmstat.$MACHINEDOTS; rm -f $BBTMP/hobbit_vmstat.$MACHINEDOTS; fi
-
-exit
-
diff --git a/abs/mv-core/hobbit-client/client/bin/hobbitclient-hp-ux.sh b/abs/mv-core/hobbit-client/client/bin/hobbitclient-hp-ux.sh
deleted file mode 100755
index 54302fa..0000000
--- a/abs/mv-core/hobbit-client/client/bin/hobbitclient-hp-ux.sh
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/sh
-#
-#----------------------------------------------------------------------------#
-# HP-UX client for Hobbit                                                    #
-#                                                                            #
-# Copyright (C) 2005-2006 Henrik Storner <henrik@hswn.dk>                    #
-#                                                                            #
-# This program is released under the GNU General Public License (GPL),       #
-# version 2. See the file "COPYING" for details.                             #
-#                                                                            #
-#----------------------------------------------------------------------------#
-#
-# $Id: hobbitclient-hp-ux.sh,v 1.20 2006/07/05 05:52:22 henrik Rel $
-
-echo "[date]"
-date
-echo "[uname]"
-uname -a
-echo "[uptime]"
-uptime
-echo "[who]"
-who
-echo "[df]"
-# The sed stuff is to make sure lines are not split into two.
-df -Pk | sed -e '/^[^ 	][^ 	]*$/{
-N
-s/[ 	]*\n[ 	]*/ /
-}'
-echo "[mount]"
-mount
-echo "[memory]"
-$BBHOME/bin/hpux-meminfo
-echo "[swapinfo]"
-/usr/sbin/swapinfo -tm
-echo "[ifconfig]"
-netstat -in
-echo "[route]"
-netstat -rn
-echo "[netstat]"
-netstat -s
-echo "[ifstat]"
-/usr/sbin/lanscan -p | while read PPA; do /usr/sbin/lanadmin -g mibstats $PPA; done
-echo "[ports]"
-netstat -an | grep "^tcp"
-echo "[ps]"
-UNIX95=1 ps -Ax -o pid,ppid,user,stime,state,pri,pcpu,time,vsz,args
-
-# $TOP must be set, the install utility should do that for us if it exists.
-if test "$TOP" != ""
-then
-    if test -x "$TOP"
-    then
-        echo "[top]"
-	# Cits Bogajewski 03-08-2005: redirect of top fails
-	$TOP -d 1 -f $BBHOME/tmp/top.OUT
-	cat $BBHOME/tmp/top.OUT
-	rm $BBHOME/tmp/top.OUT
-    fi
-fi
-
-# vmstat
-nohup sh -c "vmstat 300 2 1>$BBTMP/hobbit_vmstat.$MACHINEDOTS.$$ 2>&1; mv $BBTMP/hobbit_vmstat.$MACHINEDOTS.$$ $BBTMP/hobbit_vmstat.$MACHINEDOTS" </dev/null >/dev/null 2>&1 &
-sleep 5
-if test -f $BBTMP/hobbit_vmstat.$MACHINEDOTS; then echo "[vmstat]"; cat $BBTMP/hobbit_vmstat.$MACHINEDOTS; rm -f $BBTMP/hobbit_vmstat.$MACHINEDOTS; fi
-
-exit
-
diff --git a/abs/mv-core/hobbit-client/client/bin/hobbitclient-irix.sh b/abs/mv-core/hobbit-client/client/bin/hobbitclient-irix.sh
deleted file mode 100755
index c906840..0000000
--- a/abs/mv-core/hobbit-client/client/bin/hobbitclient-irix.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/sh
-#----------------------------------------------------------------------------#
-# Irix client for Hobbit                                                     #
-#                                                                            #
-# Copyright (C) 2005-2006 Henrik Storner <henrik@hswn.dk>                    #
-#                                                                            #
-# This program is released under the GNU General Public License (GPL),       #
-# version 2. See the file "COPYING" for details.                             #
-#                                                                            #
-#----------------------------------------------------------------------------#
-#
-# $Id: hobbitclient-irix.sh,v 1.5 2006/07/05 05:52:22 henrik Rel $
-
-echo "[date]"
-date
-echo "[uname]"
-uname -a
-echo "[uptime]"
-uptime
-echo "[who]"
-who
-echo "[df]"
-df -Plk
-echo "[mount]"
-mount
-echo "[swap]"
-swap -ln
-echo "[ifconfig]"
-ifconfig -a
-echo "[route]"
-netstat -rn
-echo "[netstat]"
-netstat -s
-echo "[ports]"
-netstat -na -f inet -P tcp | tail +3
-netstat -na -f inet6 -P tcp | tail +5
-echo "[ifstat]"
-netstat -i -n | egrep -v  "^lo|<Link"
-echo "[ps]"
-ps -Axo pid,ppid,user,stime,state,nice,pcpu,time,sz,rss,vsz,args
-
-# $TOP must be set, the install utility should do that for us if it exists.
-if test "$TOP" != ""
-then
-    if test -x "$TOP"
-    then
-        echo "[top]"
-	$TOP -d2 -b 20 | tail +9
-    fi
-fi
-
-# vmstat and iostat do not exist on irix. SAR is your only option at this time. 
-nohup sh -c "sar 300 2 1>$BBTMP/hobbit_sar.$MACHINEDOTS.$$ 2>&1; mv $BBTMP/hobbit_sar.$MACHINEDOTS.$$ $BBTMP/hobbit_sar.$MACHINEDOTS" </dev/null >/dev/null 2>&1 &
-sleep 5
-if test -f $BBTMP/hobbit_sar.$MACHINEDOTS; then echo "[sar]"; cat $BBTMP/hobbit_sar.$MACHINEDOTS; rm -f $BBTMP/hobbit_sar.$MACHINEDOTS; fi
-
-exit
-
diff --git a/abs/mv-core/hobbit-client/client/bin/hobbitclient-linux.sh b/abs/mv-core/hobbit-client/client/bin/hobbitclient-linux.sh
deleted file mode 100755
index a9ee6ae..0000000
--- a/abs/mv-core/hobbit-client/client/bin/hobbitclient-linux.sh
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/sh
-#----------------------------------------------------------------------------#
-# Linux client for Hobbit                                                    #
-#                                                                            #
-# Copyright (C) 2005-2006 Henrik Storner <henrik@hswn.dk>                    #
-#                                                                            #
-# This program is released under the GNU General Public License (GPL),       #
-# version 2. See the file "COPYING" for details.                             #
-#                                                                            #
-#----------------------------------------------------------------------------#
-#
-# $Id: hobbitclient-linux.sh,v 1.20 2006/07/09 19:25:19 henrik Rel $
-
-echo "[date]"
-date
-echo "[uname]"
-uname -rsmn
-echo "[osversion]"
-if [ -x /bin/lsb_release ]; then
-	/bin/lsb_release -r -i -s | xargs echo
-	/bin/lsb_release -a
-elif [ -f /etc/redhat-release ]; then
-	cat /etc/redhat-release
-elif [ -f /etc/gentoo-release ]; then
-	cat /etc/gentoo-release
-elif [ -f /etc/debian_version ]; then
-	echo -en "Debian "
-	cat /etc/debian_version
-elif [ -f /etc/SuSE-release ]; then
-	grep ^SuSE /etc/SuSE-release
-elif [ -f /etc/slackware-version ]; then
-	cat /etc/slackware-version
-elif [ -f /etc/mandrake-release ]; then
-	cat /etc/mandrake-release
-elif [ -f /etc/fedora-release ]; then
-	cat /etc/fedora-release
-elif [ -f /etc/arch-release ]; then
-	cat /etc/arch-release
-fi
-echo "[uptime]"
-uptime
-echo "[who]"
-who
-echo "[df]"
-df -Pl -x none -x tmpfs -x shmfs -x unknown -x iso9660 | sed -e '/^[^ 	][^ 	]*$/{
-N
-s/[ 	]*\n[ 	]*/ /
-}'
-echo "[mount]"
-mount
-echo "[free]"
-free
-echo "[ifconfig]"
-/sbin/ifconfig
-echo "[route]"
-netstat -rn
-echo "[netstat]"
-netstat -s
-echo "[ports]"
-# Bug in RedHat's netstat spews annoying error messages. 
-netstat -ant 2>/dev/null
-echo "[ifstat]"
-/sbin/ifconfig
-echo "[ps]"
-ps -Aw -o pid,ppid,user,start,state,pri,pcpu,time,pmem,rsz,vsz,cmd
-
-# $TOP must be set, the install utility should do that for us if it exists.
-if test "$TOP" != ""
-then
-    if test -x "$TOP"
-    then
-        echo "[top]"
-	$TOP -b -n 1 
-    fi
-fi
-
-# vmstat
-nohup sh -c "vmstat 300 2 1>$BBTMP/hobbit_vmstat.$MACHINEDOTS.$$ 2>&1; mv $BBTMP/hobbit_vmstat.$MACHINEDOTS.$$ $BBTMP/hobbit_vmstat.$MACHINEDOTS" </dev/null >/dev/null 2>&1 &
-sleep 5
-if test -f $BBTMP/hobbit_vmstat.$MACHINEDOTS; then echo "[vmstat]"; cat $BBTMP/hobbit_vmstat.$MACHINEDOTS; rm -f $BBTMP/hobbit_vmstat.$MACHINEDOTS; fi
-
-exit
-
diff --git a/abs/mv-core/hobbit-client/client/bin/hobbitclient-netbsd.sh b/abs/mv-core/hobbit-client/client/bin/hobbitclient-netbsd.sh
deleted file mode 100755
index 49533da..0000000
--- a/abs/mv-core/hobbit-client/client/bin/hobbitclient-netbsd.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-#----------------------------------------------------------------------------#
-# NetBSD client for Hobbit                                                   #
-#                                                                            #
-# Copyright (C) 2005-2006 Henrik Storner <henrik@hswn.dk>                    #
-#                                                                            #
-# This program is released under the GNU General Public License (GPL),       #
-# version 2. See the file "COPYING" for details.                             #
-#                                                                            #
-#----------------------------------------------------------------------------#
-#
-# $Id: hobbitclient-netbsd.sh,v 1.15 2006/07/05 05:52:22 henrik Rel $
-
-echo "[date]"
-date
-echo "[uname]"
-uname -a
-echo "[uptime]"
-uptime
-echo "[who]"
-who
-echo "[df]"
-df -P -tnonfs,kernfs,procfs,cd9660,null | sed -e '/^[^ 	][^ 	]*$/{
-N
-s/[ 	]*\n[ 	]*/ /
-}'
-echo "[mount]"
-mount
-echo "[meminfo]"
-$BBHOME/bin/netbsd-meminfo
-echo "[swapctl]"
-/sbin/swapctl -s
-echo "[ifconfig]"
-ifconfig -a
-echo "[route]"
-netstat -rn
-echo "[netstat]"
-netstat -s
-echo "[ifstat]"
-netstat -i -b -n | egrep -v "^lo|<Link"
-echo "[ports]"
-(netstat -na -f inet; netstat -na -f inet6) | grep "^tcp"
-echo "[ps]"
-ps -ax -ww -o pid,ppid,user,start,state,pri,pcpu,cputime,pmem,rss,vsz,args
-
-# $TOP must be set, the install utility should do that for us if it exists.
-if test "$TOP" != ""
-then
-    if test -x "$TOP"
-    then
-        echo "[top]"
-	$TOP -n 20
-    fi
-fi
-
-# vmstat
-nohup sh -c "vmstat 300 2 1>$BBTMP/hobbit_vmstat.$MACHINEDOTS.$$ 2>&1; mv $BBTMP/hobbit_vmstat.$MACHINEDOTS.$$ $BBTMP/hobbit_vmstat.$MACHINEDOTS" </dev/null >/dev/null 2>&1 &
-sleep 5
-if test -f $BBTMP/hobbit_vmstat.$MACHINEDOTS; then echo "[vmstat]"; cat $BBTMP/hobbit_vmstat.$MACHINEDOTS; rm -f $BBTMP/hobbit_vmstat.$MACHINEDOTS; fi
-
-exit
-
diff --git a/abs/mv-core/hobbit-client/client/bin/hobbitclient-openbsd.sh b/abs/mv-core/hobbit-client/client/bin/hobbitclient-openbsd.sh
deleted file mode 100755
index 88a98f1..0000000
--- a/abs/mv-core/hobbit-client/client/bin/hobbitclient-openbsd.sh
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/bin/sh
-#----------------------------------------------------------------------------#
-# OpenBSD client for Hobbit                                                  #
-#                                                                            #
-# Copyright (C) 2005-2006 Henrik Storner <henrik@hswn.dk>                    #
-#                                                                            #
-# This program is released under the GNU General Public License (GPL),       #
-# version 2. See the file "COPYING" for details.                             #
-#                                                                            #
-#----------------------------------------------------------------------------#
-#
-# $Id: hobbitclient-openbsd.sh,v 1.14 2006/07/05 05:52:22 henrik Rel $
-
-echo "[date]"
-date
-echo "[uname]"
-uname -a
-echo "[uptime]"
-uptime
-echo "[who]"
-who
-echo "[df]"
-df -P -tnonfs,kernfs,procfs,cd9660 | sed -e '/^[^ 	][^ 	]*$/{
-N
-s/[ 	]*\n[ 	]*/ /
-}'
-echo "[mount]"
-mount
-echo "[meminfo]"
-$BBHOME/bin/openbsd-meminfo
-echo "[swapctl]"
-/sbin/swapctl -s
-echo "[ifconfig]"
-ifconfig -A
-echo "[route]"
-netstat -rn
-echo "[netstat]"
-netstat -s
-echo "[ifstat]"
-netstat -i -b -n | egrep -v "^lo|<Link"
-echo "[ports]"
-(netstat -na -f inet; netstat -na -f inet6) | grep "^tcp"
-echo "[ps]"
-ps -ax -ww -o pid,ppid,user,start,state,pri,pcpu,cputime,pmem,rss,vsz,args
-
-# $TOP must be set, the install utility should do that for us if it exists.
-if test "$TOP" != ""
-then
-    if test -x "$TOP"
-    then
-        echo "[top]"
-	$TOP -n 20
-    fi
-fi
-
-# vmstat
-nohup sh -c "vmstat 300 2 1>$BBTMP/hobbit_vmstat.$MACHINEDOTS.$$ 2>&1; mv $BBTMP/hobbit_vmstat.$MACHINEDOTS.$$ $BBTMP/hobbit_vmstat.$MACHINEDOTS" </dev/null >/dev/null 2>&1 &
-sleep 5
-if test -f $BBTMP/hobbit_vmstat.$MACHINEDOTS; then echo "[vmstat]"; cat $BBTMP/hobbit_vmstat.$MACHINEDOTS; rm -f $BBTMP/hobbit_vmstat.$MACHINEDOTS; fi
-
-exit
-
diff --git a/abs/mv-core/hobbit-client/client/bin/hobbitclient-osf1.sh b/abs/mv-core/hobbit-client/client/bin/hobbitclient-osf1.sh
deleted file mode 100755
index 6750152..0000000
--- a/abs/mv-core/hobbit-client/client/bin/hobbitclient-osf1.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-#----------------------------------------------------------------------------#
-# OSF1 client for Hobbit                                                     #
-#                                                                            #
-# Copyright (C) 2005-2006 Henrik Storner <henrik@hswn.dk>                    #
-#                                                                            #
-# This program is released under the GNU General Public License (GPL),       #
-# version 2. See the file "COPYING" for details.                             #
-#                                                                            #
-#----------------------------------------------------------------------------#
-#
-# $Id: hobbitclient-osf1.sh,v 1.13 2006/07/05 05:52:22 henrik Rel $
-
-echo "[date]"
-date
-echo "[uname]"
-uname -a
-echo "[uptime]"
-uptime
-echo "[who]"
-who
-echo "[memory]"
-vmstat -P
-echo "[swap]"
-swapon -s
-echo "[df]"
-df -t noprocfs | sed -e '/^[^ 	][^ 	]*$/{
-N
-s/[ 	]*\n[ 	]*/ /
-}'
-echo "[mount]"
-mount
-echo "[ifconfig]"
-ifconfig -a
-echo "[route]"
-cat /etc/routes
-echo "[netstat]"
-netstat -s
-echo "[ports]"
-netstat -an|grep "^tcp"
-echo "[ps]"
-ps -ef
-
-# $TOP must be set, the install utility should do that for us if it exists.
-if test "$TOP" != ""
-then
-    if test -x "$TOP"
-    then
-        echo "[top]"
-	$TOP -b -n 1 
-    fi
-fi
-
-# vmstat
-nohup sh -c "vmstat 300 2 1>$BBTMP/hobbit_vmstat.$MACHINEDOTS.$$ 2>&1; mv $BBTMP/hobbit_vmstat.$MACHINEDOTS.$$ $BBTMP/hobbit_vmstat.$MACHINEDOTS" </dev/null >/dev/null 2>&1 &
-sleep 5
-if test -f $BBTMP/hobbit_vmstat.$MACHINEDOTS; then echo "[vmstat]"; cat $BBTMP/hobbit_vmstat.$MACHINEDOTS; rm -f $BBTMP/hobbit_vmstat.$MACHINEDOTS; fi
-
-exit
-
diff --git a/abs/mv-core/hobbit-client/client/bin/hobbitclient-sco_sv.sh b/abs/mv-core/hobbit-client/client/bin/hobbitclient-sco_sv.sh
deleted file mode 100755
index 512598c..0000000
--- a/abs/mv-core/hobbit-client/client/bin/hobbitclient-sco_sv.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/bin/sh
-#----------------------------------------------------------------------------#
-# SCO_SV client for Hobbit                                                   #
-#                                                                            #
-# Copyright (C) 2005-2006 Henrik Storner <henrik@hswn.dk>                    #
-# Copyright (C) 2006 Charles Goyard <cg@fsck.fr>                             #
-#                                                                            #
-# This program is released under the GNU General Public License (GPL),       #
-# version 2. See the file "COPYING" for details.                             #
-#                                                                            #
-#----------------------------------------------------------------------------#
-#
-# $Id: hobbitclient-sco_sv.sh,v 1.2 2006/08/02 13:35:46 henrik Rel $
-
-echo "[date]"
-date
-echo "[uname]"
-uname -a
-echo "[uptime]"
-uptime
-echo "[who]"
-who -x
-echo "[df]"
-df -Bk
-echo "[mount]"
-mount -v
-echo "[memsize]"
-/etc/memsize
-echo "[freemem]"
-sar -r 1 2 | tail -1
-echo "[swap]"
-swap -l
-echo "[ifconfig]"
-ifconfig -a
-echo "[ifstat]"
-ifconfig -in
-echo "[route]"
-netstat -rn
-echo "[netstat]"
-netstat -s
-echo "[ports]"
-netstat -an | grep "^tcp"
-echo "[ps]"
-ps -A -o pid,ppid,user,stime,s,pri,pcpu,time,vsz,args
-# $TOP must be set, the install utility should do that for us if it exists.
-if test "$TOP" != ""
-then
-    if test -x "$TOP"
-    then
-        echo "[top]"
-	$TOP -b -n 1 
-    fi
-fi
-# vmstat
-nohup sh -c "vmstat 300 2 1>$BBTMP/hobbit_vmstat.$MACHINEDOTS.$$ 2>&1; mv $BBTMP/hobbit_vmstat.$MACHINEDOTS.$$ $BBTMP/hobbit_vmstat.$MACHINEDOTS" </dev/null >/dev/null 2>&1 &
-sleep 5
-if test -f $BBTMP/hobbit_vmstat.$MACHINEDOTS; then echo "[vmstat]"; cat $BBTMP/hobbit_vmstat.$MACHINEDOTS; rm -f $BBTMP/hobbit_vmstat.$MACHINEDOTS; fi
-
-exit
-
diff --git a/abs/mv-core/hobbit-client/client/bin/hobbitclient-sunos.sh b/abs/mv-core/hobbit-client/client/bin/hobbitclient-sunos.sh
deleted file mode 100755
index d0ae1b9..0000000
--- a/abs/mv-core/hobbit-client/client/bin/hobbitclient-sunos.sh
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/bin/sh
-#----------------------------------------------------------------------------#
-# Solaris client for Hobbit                                                  #
-#                                                                            #
-# Copyright (C) 2005-2006 Henrik Storner <henrik@hswn.dk>                    #
-#                                                                            #
-# This program is released under the GNU General Public License (GPL),       #
-# version 2. See the file "COPYING" for details.                             #
-#                                                                            #
-#----------------------------------------------------------------------------#
-#
-# $Id: hobbitclient-sunos.sh,v 1.18 2006/07/05 05:52:22 henrik Rel $
-
-echo "[date]"
-date
-echo "[uname]"
-uname -a
-echo "[uptime]"
-uptime
-echo "[who]"
-who
-
-echo "[df]"
-# All of this because Solaris df cannot show multiple fs-types, or exclude certain fs types.
-FSTYPES=`/bin/df -n -l|awk '{print $3}'|egrep -v "^proc|^fd|^mntfs|^ctfs|^devfs|^objfs|^nfs"|sort|uniq`
-if test "$FSTYPES" = ""; then FSTYPES="ufs"; fi
-set $FSTYPES
-/bin/df -F $1 -k | grep -v " /var/run"
-shift
-while test "$1" != ""; do
-  /bin/df -F $1 -k | grep -v " /var/run" | tail +2
-  shift
-done
-
-echo "[mount]"
-mount
-echo "[prtconf]"
-/usr/sbin/prtconf
-echo "[memory]"
-vmstat 1 2 | tail -1
-echo "[swap]"
-/usr/sbin/swap -s
-echo "[ifconfig]"
-ifconfig -a
-echo "[route]"
-netstat -rn
-echo "[netstat]"
-netstat -s
-echo "[ports]"
-netstat -na -f inet -P tcp | tail +3
-netstat -na -f inet6 -P tcp | tail +5
-echo "[ifstat]"
-/usr/bin/kstat -p -s '[or]bytes64' | sort
-echo "[ps]"
-ps -A -o pid,ppid,user,stime,s,pri,pcpu,time,pmem,rss,vsz,args
-
-# $TOP must be set, the install utility should do that for us if it exists.
-if test "$TOP" != ""
-then
-    if test -x "$TOP"
-    then
-        echo "[top]"
-        $TOP -b 20
-    fi
-fi
-
-# vmstat and iostat (iostat -d provides a cpu utilisation with I/O wait number)
-nohup sh -c "vmstat 300 2 1>$BBTMP/hobbit_vmstat.$MACHINEDOTS.$$ 2>&1; mv $BBTMP/hobbit_vmstat.$MACHINEDOTS.$$ $BBTMP/hobbit_vmstat.$MACHINEDOTS" </dev/null >/dev/null 2>&1 &
-nohup sh -c "iostat -c 300 2 1>$BBTMP/hobbit_iostatcpu.$MACHINEDOTS.$$ 2>&1; mv $BBTMP/hobbit_iostatcpu.$MACHINEDOTS.$$ $BBTMP/hobbit_iostatcpu.$MACHINEDOTS" </dev/null >/dev/null 2>&1 &
-nohup sh -c "iostat -dxsrP 300 2 1>$BBTMP/hobbit_iostatdisk.$MACHINEDOTS.$$ 2>&1; mv $BBTMP/hobbit_iostatdisk.$MACHINEDOTS.$$ $BBTMP/hobbit_iostatdisk.$MACHINEDOTS" </dev/null >/dev/null 2>&1 &
-sleep 5
-if test -f $BBTMP/hobbit_vmstat.$MACHINEDOTS; then echo "[vmstat]"; cat $BBTMP/hobbit_vmstat.$MACHINEDOTS; rm -f $BBTMP/hobbit_vmstat.$MACHINEDOTS; fi
-if test -f $BBTMP/hobbit_iostatcpu.$MACHINEDOTS; then echo "[iostatcpu]"; cat $BBTMP/hobbit_iostatcpu.$MACHINEDOTS; rm -f $BBTMP/hobbit_iostatcpu.$MACHINEDOTS; fi
-if test -f $BBTMP/hobbit_iostatdisk.$MACHINEDOTS; then echo "[iostatdisk]"; cat $BBTMP/hobbit_iostatdisk.$MACHINEDOTS; rm -f $BBTMP/hobbit_iostatdisk.$MACHINEDOTS; fi
-
-exit
-
diff --git a/abs/mv-core/hobbit-client/client/bin/hobbitclient.sh b/abs/mv-core/hobbit-client/client/bin/hobbitclient.sh
deleted file mode 100755
index 8d66734..0000000
--- a/abs/mv-core/hobbit-client/client/bin/hobbitclient.sh
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/bin/sh
-#----------------------------------------------------------------------------#
-# Hobbit client main script.                                                 #
-#                                                                            #
-# This invokes the OS-specific script to build a client message, and sends   #
-# if off to the Hobbit server.                                               #
-#                                                                            #
-# Copyright (C) 2005-2006 Henrik Storner <henrik@hswn.dk>                    #
-#                                                                            #
-# This program is released under the GNU General Public License (GPL),       #
-# version 2. See the file "COPYING" for details.                             #
-#                                                                            #
-#----------------------------------------------------------------------------#
-#
-# $Id: hobbitclient.sh,v 1.17 2006/07/06 09:07:53 henrik Rel $
-
-# Must make sure the commands return standard (english) texts.
-LANG=C
-LC_ALL=C
-LC_MESSAGES=C
-export LANG LC_ALL LC_MESSAGES
-
-LOCALMODE="no"
-if test $# -ge 1; then
-	if test "$1" = "--local"; then
-		LOCALMODE="yes"
-	fi
-	shift
-fi
-
-if test "$BBOSSCRIPT" = ""; then
-	BBOSSCRIPT="hobbitclient-`uname -s | tr '[A-Z]' '[a-z]'`.sh"
-fi
-
-MSGFILE="$BBTMP/msg.$MACHINEDOTS.txt"
-MSGTMPFILE="$MSGFILE.$$"
-LOGFETCHCFG=$BBTMP/logfetch.$MACHINEDOTS.cfg
-LOGFETCHSTATUS=$BBTMP/logfetch.$MACHINEDOTS.status
-export LOGFETCHCFG LOGFETCHSTATUS
-
-rm -f $MSGTMPFILE
-touch $MSGTMPFILE
-
-
-CLIENTVERSION="`$BBHOME/bin/clientupdate --level`"
-
-if test "$LOCALMODE" = "yes"; then
-	echo "@@client#1|0|127.0.0.1|$MACHINEDOTS|$BBOSTYPE" >> $MSGTMPFILE
-fi
-
-echo "client $MACHINE.$BBOSTYPE $CONFIGCLASS"  >>  $MSGTMPFILE
-$BBHOME/bin/$BBOSSCRIPT >> $MSGTMPFILE
-# logfiles
-if test -f $LOGFETCHCFG
-then
-    $BBHOME/bin/logfetch $LOGFETCHCFG $LOGFETCHSTATUS >>$MSGTMPFILE
-fi
-# Client version
-echo "[clientversion]"  >>$MSGTMPFILE
-echo "$CLIENTVERSION"   >> $MSGTMPFILE
-# System clock
-echo "[clock]"          >> $MSGTMPFILE
-$BBHOME/bin/logfetch --clock >> $MSGTMPFILE
-
-if test "$LOCALMODE" = "yes"; then
-	echo "@@" >> $MSGTMPFILE
-	$BBHOME/bin/hobbitd_client --local --config=$BBHOME/etc/localclient.cfg <$MSGTMPFILE
-else
-	$BB $BBDISP "@" < $MSGTMPFILE >$LOGFETCHCFG.tmp
-	if test -f $LOGFETCHCFG.tmp
-	then
-		if test -s $LOGFETCHCFG.tmp
-		then
-			mv $LOGFETCHCFG.tmp $LOGFETCHCFG
-		else
-			rm -f $LOGFETCHCFG.tmp
-		fi
-	fi
-fi
-
-# Save the latest file for debugging.
-rm -f $MSGFILE
-mv $MSGTMPFILE $MSGFILE
-
-if test "$LOCALMODE" != "yes" -a -f $LOGFETCHCFG; then
-	# Check for client updates
-	SERVERVERSION=`grep "^clientversion:" $LOGFETCHCFG | cut -d: -f2`
-	if test "$SERVERVERSION" != "" -a "$SERVERVERSION" != "$CLIENTVERSION"; then
-		exec $BBHOME/bin/clientupdate --update=$SERVERVERSION --reexec
-	fi
-fi
-
-exit 0
-
diff --git a/abs/mv-core/hobbit-client/client/bin/hobbitlaunch b/abs/mv-core/hobbit-client/client/bin/hobbitlaunch
deleted file mode 100755
index ab2185c..0000000
--- a/abs/mv-core/hobbit-client/client/bin/hobbitlaunch
+++ /dev/null
diff --git a/abs/mv-core/hobbit-client/client/bin/logfetch b/abs/mv-core/hobbit-client/client/bin/logfetch
deleted file mode 100755
index 40e36a0..0000000
--- a/abs/mv-core/hobbit-client/client/bin/logfetch
+++ /dev/null
diff --git a/abs/mv-core/hobbit-client/client/bin/msgcache b/abs/mv-core/hobbit-client/client/bin/msgcache
deleted file mode 100755
index 3f8c57d..0000000
--- a/abs/mv-core/hobbit-client/client/bin/msgcache
+++ /dev/null
diff --git a/abs/mv-core/hobbit-client/client/bin/orcahobbit b/abs/mv-core/hobbit-client/client/bin/orcahobbit
deleted file mode 100755
index 05a359e..0000000
--- a/abs/mv-core/hobbit-client/client/bin/orcahobbit
+++ /dev/null
diff --git a/abs/mv-core/hobbit-client/client/etc/clientlaunch.cfg b/abs/mv-core/hobbit-client/client/etc/clientlaunch.cfg
deleted file mode 100644
index 8457a8f..0000000
--- a/abs/mv-core/hobbit-client/client/etc/clientlaunch.cfg
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# The clientlaunch.cfg file is loaded by "hobbitlaunch".
-# It controls which of the Hobbit client-side modules to run, 
-# (both the main client "hobbitclient.sh" and any client-side
-# extensions); how often, and with which parameters, options 
-# and environment variables.
-#
-# Note: On the Hobbit *server* itself, this file is normally 
-#       NOT used. Instead, both the client- and server-tasks
-#       are controlled by the hobbitlaunch.cfg file.
-#
-
-# msgcache is used for passive clients, that cannot connect
-# directly to the Hobbit server. This is not the default
-# setup, so this task is normally disabled.
-[msgcache]
-	DISABLED
-	ENVFILE $HOBBITCLIENTHOME/etc/hobbitclient.cfg
-	CMD $HOBBITCLIENTHOME/bin/msgcache --no-daemon --pidfile=$HOBBITCLIENTHOME/logs/msgcache.pid
-	LOGFILE $HOBBITCLIENTHOME/logs/msgcache.log
-
-# The main client task
-[client]
-	ENVFILE $HOBBITCLIENTHOME/etc/hobbitclient.cfg
-	CMD $HOBBITCLIENTHOME/bin/hobbitclient.sh 
-	LOGFILE $HOBBITCLIENTHOME/logs/hobbitclient.log
-	INTERVAL 5m
-
-# ORCA data collector. This is an experimental add-on module,
-# the data sent by this module are not processed by Hobbit 4.2.
-[orcadata]
-	DISABLED
-	ENVFILE $HOBBITCLIENTHOME/etc/hobbitclient.cfg
-	CMD $HOBBITCLIENTHOME/bin/orcahobbit --orca=/usr/local/orca/orcallator
-	LOGFILE $HOBBITCLIENTHOME/logs/hobbitclient.log
-	INTERVAL 5m
-
-[memmyth]
-	ENVFILE $HOBBITCLIENTHOME/etc/hobbitclient.cfg
-       CMD  /data/srv/hobbit/client/ext/hobbit-mem-myth.sh
-       LOGFILE /data/srv/hobbit/client/mythmem.log
-       INTERVAL 5m
-
diff --git a/abs/mv-core/hobbit-client/client/etc/hobbitclient.cfg b/abs/mv-core/hobbit-client/client/etc/hobbitclient.cfg
deleted file mode 100644
index 9fff158..0000000
--- a/abs/mv-core/hobbit-client/client/etc/hobbitclient.cfg
+++ /dev/null
@@ -1,52 +0,0 @@
-# Environment settings for the Hobbit client.
-
-BBDISP="127.0.0.1"             # IP address of the Hobbit server
-BBDISPLAYS=""                   # IP of multiple Hobbit servers. BBDISP must be "0.0.0.0".
-CONFIGCLASS="$BBOSTYPE"         # Default configuration class for logfiles
-
-PATH="/bin:/usr/bin:/sbin:/usr/sbin:/etc"  # PATH setting for the client scripts.
-
-# You normally dont need to modify anything below here
-BBPORT="1984"                   # Portnumber where hobbitd listens
-BBHOME="$HOBBITCLIENTHOME"      # Directory for the Hobbit client files
-BB="$BBHOME/bin/bb"             # The Hobbit client "bb" utility
-BBTMP="$BBHOME/tmp"             # Where we may store temporary files.
-BBCLIENTLOGS="$BBHOME/logs"     # Where we store the client logfiles
-
-
-# The following defines a bunch of commands that BB extensions expect to be present.
-# Hobbit does not use them, but they are provided here so if you use BB extension
-# scripts, then they will hopefully run without having to do a lot of tweaking.
-
-UPTIME="/usr/bin/uptime"
-AWK="/bin/awk"
-CAT="/bin/cat"
-CP="/bin/cp"
-CUT="/bin/cut"
-DATE="/bin/date"
-EGREP="/bin/egrep"
-EXPR="/usr/bin/expr"
-FIND="/usr/bin/find"
-GREP="/bin/grep"
-HEAD="/usr/bin/head"
-ID="/usr/bin/id"
-LN="/bin/ln"
-LS="/bin/ls"
-MV="/bin/mv"
-RM="/bin/rm"
-SED="/bin/sed"
-SORT="/usr/bin/sort"
-TAIL="/usr/bin/tail"
-TOUCH="/bin/touch"
-TR="/bin/tr"
-UNIQ="/usr/bin/uniq"
-WHO="/usr/bin/who"
-TOP="/usr/bin/top"
-WC="/usr/bin/wc -l"
-WCC="/usr/bin/wc"
-# DF,DFCMD and PS are for compatibility only, NOT USED by the Hobbit client
-DF="/bin/df -Pk"
-DFCMD="/bin/df -Pk"
-PS="ps ax"
-
-MAXLINE="32768"
diff --git a/abs/mv-core/hobbit-client/client/etc/localclient.cfg b/abs/mv-core/hobbit-client/client/etc/localclient.cfg
deleted file mode 100644
index ae35418..0000000
--- a/abs/mv-core/hobbit-client/client/etc/localclient.cfg
+++ /dev/null
@@ -1,359 +0,0 @@
-# localclient.cfg - configuration file for a LOCAL Hobbit client.
-#
-# By default, Hobbit clients send raw data to the Hobbit server,
-# which in turn converts the data into status messages.
-# In that case, THIS FILE IS NOT USED and you should IGNORE it.
-#
-# If you want to configure clients locally (on the server that the
-# client runs one), you do it here. You MUST also change the
-# clientlaunch.cfg file and add the "--local" option to the
-# command launching hobbitclient.sh
-#
-# The file defines a series of rules:
-#    UP     : Changes the "cpu" status when the system has rebooted recently,
-#             or when it has been running for too long.
-#    LOAD   : Changes the "cpu" status according to the system load.
-#    CLOCK  : Changes the "cpu" status if the client system clock is
-#             not synchronized with the clock of the Hobbit server.
-#    DISK   : Changes the "disk" status, depending on the amount of space
-#             used of filesystems.
-#    MEMPHYS: Changes the "memory" status, based on the percentage of real
-#             memory used.
-#    MEMACT : Changes the "memory" status, based on the percentage of "actual"
-#             memory used. Note: Not all systems report an "actual" value.
-#    MEMSWAP: Changes the "memory" status, based on the percentage of swap
-#             space used.
-#    PROC   : Changes the "procs" status according to which processes were found
-#             in the "ps" listing from the client.
-#    LOG    : Changes the "msgs" status according to entries in text-based logfiles.
-#             Note: The "client-local.cfg" file controls which logfiles the client will report.
-#    FILE   : Changes the "files" status according to meta-data for files.
-#             Note: The "client-local.cfg" file controls which files the client will report.
-#    DIR    : Changes the "files" status according to the size of a directory.
-#             Note: The "client-local.cfg" file controls which directories the client will report.
-#    PORT   : Changes the "ports" status according to which tcp ports were found
-#             in the "netstat" listing from the client.
-#    DEFAULT: Set the default values that apply if no other rules match.
-#
-# All rules can be qualified so they apply only to certain hosts, or on certain
-# times of the day (see below).
-#
-# Each type of rule takes a number of parameters:
-#    UP bootlimit toolonglimit
-#             The cpu status goes yellow if the system has been up for less than
-#             "bootlimit" time, or longer than "toolonglimit". The time is in
-#             minutes, or you can add h/d/w for hours/days/weeks - eg. "2h" for
-#             two hours, or "4w" for 4 weeks.
-#             Defaults: bootlimit=1h, toolonglimit=-1 (infinite).
-#
-#    LOAD warnlevel paniclevel
-#             If the system load exceeds "warnlevel" or "paniclevel", the "cpu"
-#             status will go yellow or red, respectively. These are decimal
-#             numbers.
-#             Defaults: warnlevel=5.0, paniclevel=10.0
-#
-#    CLOCK maximum-offset
-#             If the system clock of the client differs from that of the Hobbit
-#             server by more than "maximum-offset" seconds, then the CPU status
-#             column will go yellow. Note that the accuracy of this test is limited,
-#             since it is affected by the time it takes a client status report to
-#             go from the client to the Hobbit server and be processed. You should
-#             therefore allow for a few seconds (5-10) of slack when you define
-#             your max. offset.
-#             It is not wise to use this test, unless your servers are synchronized
-#             to a common clock, e.g. through NTP.
-#
-#    DISK filesystem warnlevel paniclevel
-#    DISK filesystem IGNORE
-#             If the utilization of "filesystem" is reported to exceed "warnlevel"
-#             or "paniclevel", the "disk" status will go yellow or red, respectively.
-#             "warnlevel" and "paniclevel" are either the percentage used, or the
-#             space available as reported by the local "df" command on the host.
-#             For the latter type of check, the "warnlevel" must be followed by the
-#             letter "U", e.g. "1024U".
-#             The special keyword "IGNORE" causes this filesystem to be ignored
-#             completely, i.e. it will not appear in the "disk" status column and
-#             it will not be tracked in a graph. This is useful for e.g. removable
-#             devices, backup-disks and similar hardware.
-#             "filesystem" is the mount-point where the filesystem is mounted, e.g.
-#             "/usr" or "/home". A filesystem-name that begins with "%" is interpreted
-#             as a Perl-compatible regular expression; e.g. "%^/oracle.*/" will match
-#             any filesystem whose mountpoint begins with "/oracle".
-#             Defaults: warnlevel=90%, paniclevel=95%
-#
-#    MEMPHYS warnlevel paniclevel
-#    MEMACT warnlevel paniclevel
-#    MEMSWAP warnlevel paniclevel
-#             If the memory utilization exceeds the "warnlevel" or "paniclevel", the
-#             "memory" status will change to yellow or red, respectively.
-#             Note: The words "PHYS", "ACT" and "SWAP" are also recognized.
-#             Defaults: MEMPHYS warnlevel=100 paniclevel=101 (i.e. it will never go red)
-#                       MEMSWAP warnlevel=50 paniclevel=80
-#                       MEMACT  warnlevel=90 paniclevel=97
-#
-#    PROC processname minimumcount maximumcount color [TRACK=id] [TEXT=displaytext]
-#             The "ps" listing sent by the client will be scanned for how many
-#             processes containing "processname" are running, and this is then
-#             matched against the min/max settings defined here. If the running
-#             count is outside the thresholds, the color of the "procs" status
-#             changes to "color".
-#             To check for a process that must NOT be running: Set minimum and 
-#             maximum to 0.
-#
-#             "processname" can be a simple string, in which case this string must
-#             show up in the "ps" listing as a command. The scanner will find
-#             a ps-listing of e.g. "/usr/sbin/cron" if you only specify "processname"
-#             as "cron".
-#             "processname" can also be a Perl-compatiable regular expression, e.g.
-#             "%java.*inst[0123]" can be used to find entries in the ps-listing for
-#             "java -Xmx512m inst2" and "java -Xmx256 inst3". In that case, 
-#             "processname" must begin with "%" followed by the reg.expression.
-#             If "processname" contains whitespace (blanks or TAB), you must enclose
-#             the full string in double quotes - including the "%" if you use regular
-#             expression matching. E.g.
-#                 PROC "%hobbitd_channel --channel=data.*hobbitd_rrd" 1 1 yellow
-#             or
-#                 PROC "java -DCLASSPATH=/opt/java/lib" 2 5
-#
-#             You can have multiple "PROC" entries for the same host, all of the
-#             checks are merged into the "procs" status and the most severe
-#             check defines the color of the status.
-#
-#             The TRACK=id option causes the number of processes found to be recorded
-#             in an RRD file, with "id" as part of the filename. This graph will then
-#             appear on the "procs" page as well as on the "trends" page. Note that
-#             "id" must be unique among the processes tracked for each host.
-#
-#             The TEXT=displaytext option affects how the process appears on the
-#             "procs" status page. By default, the process is listed with the
-#             "processname" as identification, but if this is a regular expression
-#             it may be a bit difficult to understand. You can then use e.g.
-#             "TEXT=Apache" to make these processes appear with the name "Apache"
-#             instead.
-#
-#             Defaults: mincount=1, maxcount=-1 (unlimited), color="red".
-#                       Note: No processes are checked by default.
-#
-#             Example: Check that "cron" is running:
-#                 PROC cron
-#             Example: Check that at least 5 "httpd" processes are running, but
-#             not more than 20:
-#                 PROC httpd 5 20
-#
-#    LOG filename match-pattern [COLOR=color] [IGNORE=ignore-pattern] [TEXT=displaytext]
-#             In the "client-local.cfg" file, you can list any number of files
-#             that the client will collect log data from. These are sent to the
-#             Hobbit server together with the other client data, and you can then
-#             choose how to analyze the log data with LOG entries.
-#
-#                             ************ IMPORTANT ***************
-#             To monitor a logfile, you *MUST* configure both client-local.cfg
-#             and hobbit-clients.cfg. If you configure only the client-local.cfg
-#             file, the client will collect the log data and you can view it in 
-#             the "client data" display, but it will not affect the color of the
-#             "msgs" status. On the other hand, if you configure only the
-#             hobbit-clients.cfg file, then there will be no log data to inspect,
-#             and you will not see any updates of the "msgs" status either.
-#
-#             "filename" is a filename or pattern. The set of files reported by
-#             the client is matched against "filename", and if they match then
-#             this LOG entry is processed against the data from a file.
-#
-#             "match-pattern": The log data is matched against this pattern. If
-#             there is a match, this log file causes a status change to "color".
-#
-#             "ignore-pattern": The log data that matched "match-pattern" is also
-#             matched against "ignore-pattern". If the data matches the "ignore-pattern",
-#             this line of data does not affect the status color. In other words,
-#             the "ignore-pattern" can be used to refine the strings which cause
-#             a match.
-#             Note: The "ignore-pattern" is optional.
-#
-#             "color": The color which this match will trigger.
-#             Note: "color" is optional, if omitted then "red" will be used.
-#
-#             Example: Go yellow if the text "WARNING" shows up in any logfile.
-#                 LOG %.* WARNING COLOR=yellow
-#
-#             Example: Go red if the text "I/O error" or "read error" appears.
-#                 LOG %/var/(adm|log)/messages %(I/O|read).error COLOR=red
-#
-#    FILE filename [color] [things to check] [TRACK]
-#             NB: The files you wish to monitor must be listed in a "file:..."
-#             entry in the client-local.cfg file, in order for the client to 
-#             report any data about them.
-#
-#             "filename" is a filename or pattern. The set of files reported by
-#             the client is matched against "filename", and if they match then
-#             this FILE entry is processed against the data from that file.
-#
-#             [things to check] can be one or more of the following:
-#             - "NOEXIST" triggers a warning if the file exists. By default,
-#               a warning is triggered for files that have a FILE entry, but
-#               which do not exist.
-#             - "TYPE=type" where "type" is one of "file", "dir", "char", "block", 
-#               "fifo", or "socket". Triggers warning if the file is not of the
-#               specified type.
-#             - "OWNERID=owner" and "GROUPID=group" triggers a warning if the owner
-#               or group does not match what is listed here. "owner" and "group" is
-#               specified either with the numeric uid/gid, or the user/group name.
-#             - "MODE=mode" triggers a warning if the file permissions are not
-#               as listed. "mode" is written in the standard octal notation, e.g.
-#               "644" for the rw-r--r-- permissions.
-#             - "SIZE<max.size" and "SIZE>min.size" triggers a warning it the file
-#               size is greater than "max.size" or less than "min.size", respectively.
-#               You can append "K" (KB), "M" (MB), "G" (GB) or "T" (TB) to the size.
-#               If there is no such modifier, KB is assumed.
-#               E.g. to warn if a file grows larger than 1MB (1024 KB): "SIZE<1M".
-#             - "SIZE=size" triggers a warning it the file size is not what is listed.
-#             - "MTIME>min.mtime" and "MTIME<max.mtime" checks how long ago the file
-#               was last modified (in seconds). E.g. to check if a file was updated
-#               within the past 10 minutes (600 seconds): "MTIME<600". Or to check 
-#               that a file has NOT been updated in the past 24 hours: "MTIME>86400".
-#             - "MTIME=timestamp" checks if a file was last modified at "timestamp".
-#               "timestamp" is a unix epoch time (seconds since midnight Jan 1 1970 UTC).
-#             - "CTIME>min.ctime", "CTIME<max.ctime", "CTIME=timestamp" acts as the
-#               mtime checks, but for the ctime timestamp (when the files' directory
-#               entry was last changed, eg. by chown, chgrp or chmod).
-#             - "MD5=md5sum", "SHA1=sha1sum", "RMD160=rmd160sum" trigger a warning 
-#               if the file checksum using the MD5, SHA1 or RMD160 message digest
-#               algorithms do not match the one configured here. Note: The "file"
-#               entry in the client-local.cfg file must specify which algorithm to use.
-#
-#             "TRACK" causes the size of this file to be tracked in an RRD file, and
-#             shown on the graph on the "files" display.
-#
-#             Example: Check that the /var/log/messages file is not empty and was updated
-#                      within the past 10 minutes, and go yellow if either fails:
-#                 FILE /var/log/messages SIZE>0 MTIME<600 yellow
-#
-#             Example: Check the timestamp, size and SHA-1 hash of the /bin/sh program:
-#                 FILE /bin/sh MTIME=1128514608 SIZE=645140 SHA1=5bd81afecf0eb93849a2fd9df54e8bcbe3fefd72
-#
-#    DIR directory [color] [SIZE<maxsize] [SIZE>minsize] [TRACK]
-#             NB: The directories you wish to monitor must be listed in a "dir:..."
-#             entry in the client-local.cfg file, in order for the client to 
-#             report any data about them.
-#
-#             "directory" is a filename or pattern. The set of directories reported by
-#             the client is matched against "directory", and if they match then
-#             this DIR entry is processed against the data for that directory.
-#
-#             "SIZE<maxsize" and "SIZE>minsize" defines the size limits that the
-#             directory must stay within. If it goes outside these limits, a warning
-#             will trigger. Note the Hobbit uses the raw number reported by the
-#             local "du" command on the client. This is commonly KB, but it may be
-#             disk blocks which are often 512 bytes.
-#
-#             "TRACK" causes the size of this directory to be tracked in an RRD file, 
-#             and shown on the graph on the "files" display.
-#
-#    PORT [LOCAL=addr] [EXLOCAL=addr] [REMOTE=addr] [EXREMOTE=addr] [STATE=state] [EXSTATE=state] [min=mincount] [max=maxcount] [col=color] [TRACK=id] [TEXT=displaytext]
-#             The "netstat" listing sent by the client will be scanned for how many
-#             sockets match the criteria listed.
-#             "addr" is a (partial) address specification in the format used on 
-#             the output from netstat. This is typically "10.0.0.1:80" for the IP 
-#             10.0.0.1, port 80. Or "*:80" for any local address, port 80.
-#             NB: The Hobbit clients normally report only the numeric data for
-#                 IP-adresses and port-numbers, so you must specify the port
-#                 number (e.g. "80") instead of the service name ("www").
-#             "state" causes only the sockets in the specified state to be included;
-#             it is usually LISTEN or ESTABLISHED.
-#             The socket count is then matched against the min/max settings defined 
-#             here. If the count is outside the thresholds, the color of the "ports" 
-#             status changes to "color".
-#             To check for a socket that must NOT exist: Set minimum and
-#             maximum to 0.
-#
-#             "addr" and "state" can be a simple strings, in which case these string must 
-#             show up in the "netstat" at the appropriate column.
-#             "addr" and "state" can also be a Perl-compatiable regular expression, e.g.
-#             "LOCAL=%(:80|:443)" can be used to find entries in the netstat local port for
-#             both http (port 80) and https (port 443). In that case, portname or state must 
-#             begin with "%" followed by the reg.expression.
-#
-#             The TRACK=id option causes the number of sockets found to be recorded
-#             in an RRD file, with "id" as part of the filename. This graph will then
-#             appear on the "ports" page as well as on the "trends" page. Note that
-#             "id" must be unique among the ports tracked for each host.
-#
-#             The TEXT=displaytext option affects how the port appears on the
-#             "ports" status page. By default, the port is listed with the
-#             local/remote/state rules as identification, but this may be somewhat
-#             difficult to understand. You can then use e.g. "TEXT=Secure Shell" to make 
-#             these ports appear with the name "Secure Shell" instead.
-#
-#             Defaults: state="LISTEN", mincount=1, maxcount=-1 (unlimited), color="red".
-#                       Note: No ports are checked by default.
-#
-#             Example: Check that there is someone listening on the https port:
-#                 PORT "LOCAL=%([.:]443)$" state=LISTEN TEXT=https
-#
-#             Example: Check that at least 5 "ssh" connections are established, but
-#             not more than 10; warn but do not error; graph the connection count:
-#                 PORT "LOCAL=%([.:]22)$" state=ESTABLISHED min=5 max=20 color=yellow TRACK=ssh "TEXT=SSH logins"
-#
-#             Example: Check that ONLY ports 22, 80 and 443 are open for incoming connections:
-#                 PORT STATE=LISTEN LOCAL=%0.0.0.0[.:].* EXLOCAL=%[.:](22|80|443)$ MAX=0 "TEXT=Bad listeners"
-#
-#
-# To apply rules to specific hosts, you can use the "HOST=", "EXHOST=", "PAGE=" 
-# "EXPAGE=", "CLASS=" or "EXCLASS=" qualifiers.  (These act just as in the 
-# hobbit-alerts.cfg file).
-#
-# Hostnames are either a comma-separated list of hostnames (from the bb-hosts file), 
-# "*" to indicate "all hosts", or a Perl-compatible regular expression.
-# E.g. "HOST=dns.foo.com,www.foo.com" identifies two specific hosts; 
-# "HOST=%www.*.foo.com EXHOST=www-test.foo.com" matches all hosts with a name
-# beginning with "www", except the "www-test" host.
-# "PAGE" and "EXPAGE" match the hostnames against the page on where they are
-# located in the bb-hosts file, via the bb-hosts' page/subpage/subparent
-# directives. This can be convenient to pick out all hosts on a specific page.
-#
-# Rules can be dependant on time-of-day, using the standard Hobbit syntax 
-# (the bb-hosts(5) about the NKTIME parameter). E.g. "TIME=W:0800:2200"
-# applied to a rule will make this rule active only on week-days between
-# 8AM and 10PM.
-#
-# You can also associate a GROUP id with a rule. The group-id is passed to
-# the alert module, which can then use it to control who gets an alert when
-# a failure occurs. E.g. the following associates the "httpd" process check 
-# with the "web" group, and the "sshd" check with the "admins" group:
-#    PROC httpd 5 GROUP=web
-#    PROC sshd 1 GROUP=admins
-# In the hobbit-alerts.cfg file, you could then have rules like
-#    GROUP=web
-#       MAIL webmaster@foo.com
-#    GROUP=admins
-#       MAIL root@foo.com
-#
-# Qualifiers must be placed after each rule, e.g.
-#    LOAD 8.0 12.0  HOST=db.foo.com TIME=*:0800:1600
-#
-# If you have multiple rules that you want to apply the same qualifiers to,
-# you can write the qualifiers *only* on one line, followed by the rules. E.g.
-#    HOST=%db.*.foo.com TIME=W:0800:1600
-#       LOAD 8.0 12.0
-#       DISK /db  98 100
-#       PROC mysqld 1
-# will apply the three rules to all of the "db" hosts on week-days between 8AM
-# and 4PM. This can be combined with per-rule qualifiers, in which case the
-# per-rule qualifier overrides the general qualifier; e.g.
-#    HOST=%.*.foo.com
-#       LOAD 7.0 12.0 HOST=bax.foo.com
-#       LOAD 3.0 8.0
-# will result in the load-limits being 7.0/12.0 for the "bax.foo.com" host,
-# and 3.0/8.0 for all other foo.com hosts.
-#
-# The special DEFAULT section can modify the built-in defaults - this must
-# be placed at the end of the file.
-
-DEFAULT
-	# These are the built-in defaults.
-	UP      1h
-	LOAD    5.0 10.0
-	DISK    * 90 95
-	MEMPHYS 100 101
-	MEMSWAP 50 80
-	MEMACT  90 97
-
diff --git a/abs/mv-core/hobbit-client/client/ext/hobbit-mem-myth.sh b/abs/mv-core/hobbit-client/client/ext/hobbit-mem-myth.sh
deleted file mode 100755
index 642672f..0000000
--- a/abs/mv-core/hobbit-client/client/ext/hobbit-mem-myth.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-MBEPID=`ps -ef|grep mythbackend |grep -v runsv|grep -v grep|grep -v logger|awk '{print $2 }'`
-MFEPID=`ps -ef|grep mythfrontend |grep -v runsv|grep -v grep|grep -v logger|awk '{print $2 }'`
-
-
-
-COLOR=green      # By default, everything is OK
-
-   # Do whatever you need to test for something
-if [ ! x$MBEPID = x ]
-then
-VmSize=`cat /proc/$MBEPID/status|grep -i vmsize|awk '{print $2 }'`
-VmPeak=`cat /proc/$MBEPID/status|grep -i vmpeak|awk '{print $2 }'`
-VmRSS=`cat /proc/$MBEPID/status|grep -i vmrss |awk '{print $2 }'`
-MSGMBE="
-	VmSize:$VmSize
-	VmPeak:$VmPeak
-	VmRSS:$VmRSS
-	"
-#	echo $MSGMBE
- # Tell Hobbit about it
-   $BB $BBDISP "data $MACHINE.memmbe $COLOR `date`
-
-   ${MSGMBE}
-
-   " 
-fi
-   
-
-
-if [ ! x$MFEPID = x ]
-then
-VmSize=`cat /proc/$MFEPID/status|grep -i vmsize|awk '{print $2 }'`
-VmPeak=`cat /proc/$MFEPID/status|grep -i vmpeak|awk '{print $2 }'`
-VmRSS=`cat /proc/$MFEPID/status|grep -i vmrss |awk '{print $2 }'`
-MSGMBE="
-	VmSize:$VmSize
-	VmPeak:$VmPeak
-	VmRSS:$VmRSS
-	"
-#	echo $MSGMBE
- # Tell Hobbit about it
-   $BB $BBDISP "data $MACHINE.memmfe $COLOR `date`
-
-   ${MSGMBE}
-
-   " 
-fi
-   
-
-
-
diff --git a/abs/mv-core/hobbit-client/client/runclient.sh b/abs/mv-core/hobbit-client/client/runclient.sh
deleted file mode 100755
index f9d3a6f..0000000
--- a/abs/mv-core/hobbit-client/client/runclient.sh
+++ /dev/null
@@ -1,133 +0,0 @@
-#!/bin/sh
-#----------------------------------------------------------------------------#
-# Hobbit client bootup script.                                               #
-#                                                                            #
-# This invokes hobbitlaunch, which in turn runs the Hobbit client and any    #
-# extensions configured.                                                     #
-#                                                                            #
-# Copyright (C) 2005-2006 Henrik Storner <henrik@hswn.dk>                    #
-# "status" section (C) Scott Smith 2006                                      #
-#                                                                            #
-# This program is released under the GNU General Public License (GPL),       #
-# version 2. See the file "COPYING" for details.                             #
-#                                                                            #
-#----------------------------------------------------------------------------#
-#
-# $Id: runclient.sh,v 1.13 2006/07/14 21:25:19 henrik Rel $
-
-# Default settings for this client
-MACHINEDOTS="`uname -n`"			# This systems hostname
-BBOSTYPE="`uname -s | tr '[A-Z]' '[a-z]'`"	# This systems operating system in lowercase
-BBOSSCRIPT="hobbitclient-$BBOSTYPE.sh"
-
-# Commandline mods for the defaults
-while test "$1" != ""
-do
-	case "$1" in
-	  --hostname=*)
-	  	MACHINEDOTS="`echo $1 | sed -e 's/--hostname=//'`"
-		;;
-	  --os=*)
-	  	BBOSTYPE="`echo $1 | sed -e 's/--os=//' | tr '[A-Z]' '[a-z]'`"
-		;;
-	  --class=*)
-	        CONFIGCLASS="`echo $1 | sed -e 's/--class=//' | tr '[A-Z]' '[a-z]'`"
-		;;
-	  --help)
-	  	echo "Usage: $0 [--hostname=CLIENTNAME] [--os=rhel3|linux22] [--class=CLASSNAME] start|stop"
-		exit 0
-		;;
-	  start)
-	  	CMD=$1
-		;;
-	  stop)
-	  	CMD=$1
-		;;
-	  restart)
-	  	CMD=$1
-		;;
-	  status)
-	  	CMD=$1
-		;;
-	esac
-
-	shift
-done
-
-OLDDIR="`pwd`"
-cd "`dirname $0`"
-HOBBITCLIENTHOME="`pwd`"
-cd "$OLDDIR"
-
-MACHINE="`echo $MACHINEDOTS | sed -e 's/\./,/g'`"
-
-export MACHINE MACHINEDOTS BBOSTYPE BBOSSCRIPT HOBBITCLIENTHOME CONFIGCLASS
-
-case "$CMD" in
-  "start")
-  	if test ! -w $HOBBITCLIENTHOME/logs; then
-		echo "Cannot write to the $HOBBITCLIENTHOME/logs directory"
-		exit 1
-	fi
-  	if test ! -w $HOBBITCLIENTHOME/tmp; then
-		echo "Cannot write to the $HOBBITCLIENTHOME/tmp directory"
-		exit 1
-	fi
-
-  	if test -s $HOBBITCLIENTHOME/logs/clientlaunch.$MACHINEDOTS.pid; then
-		echo "Hobbit client already running, re-starting it"
-		$0 stop
-		rm -f $HOBBITCLIENTHOME/logs/clientlaunch.$MACHINEDOTS.pid
-	fi
-
-	$HOBBITCLIENTHOME/bin/hobbitlaunch --config=$HOBBITCLIENTHOME/etc/clientlaunch.cfg --log=$HOBBITCLIENTHOME/logs/clientlaunch.log --pidfile=$HOBBITCLIENTHOME/logs/clientlaunch.$MACHINEDOTS.pid
-	if test $? -eq 0; then
-		echo "Hobbit client for $BBOSTYPE started on $MACHINEDOTS"
-	else
-		echo "Hobbit client startup failed"
-	fi
-	;;
-
-  "stop")
-  	if test -s $HOBBITCLIENTHOME/logs/clientlaunch.$MACHINEDOTS.pid; then
-		kill `cat $HOBBITCLIENTHOME/logs/clientlaunch.$MACHINEDOTS.pid`
-		echo "Hobbit client stopped"
-	else
-		echo "Hobbit client not running"
-	fi
-	;;
-
-  "restart")
-  	if test -s $HOBBITCLIENTHOME/logs/clientlaunch.$MACHINEDOTS.pid; then
-		$0 stop
-	else
-		echo "Hobbit client not running, continuing to start it"
-	fi
-
-	$0 start
-	;;
-
-  "status")
-	if test -s $HOBBITCLIENTHOME/logs/clientlaunch.$MACHINEDOTS.pid
-	then
-		kill -0 `cat $HOBBITCLIENTHOME/logs/clientlaunch.$MACHINEDOTS.pid`
-		if test $? -eq 0
-		then
-			echo "Hobbit client (clientlaunch) running with PID `cat $HOBBITCLIENTHOME/logs/clientlaunch.$MACHINEDOTS.pid`"
-		else
-			echo "Hobbit client not running, removing stale PID file"
-			rm -f $HOBBITCLIENTHOME/logs/clientlaunch.$MACHINEDOTS.pid
-		fi
-	else
-		echo "Hobbit client (clientlaunch) does not appear to be running"
-	fi
-	;;
-
-  *)
-	echo "Usage: $0 start|stop|restart|status"
-	break;
-
-esac
-
-exit 0
-
diff --git a/abs/mv-core/hobbit-client/hobbit-client.install b/abs/mv-core/hobbit-client/hobbit-client.install
deleted file mode 100755
index 61f6378..0000000
--- a/abs/mv-core/hobbit-client/hobbit-client.install
+++ /dev/null
@@ -1,17 +0,0 @@
-post_install() {
-	mkdir -p /data/srv/hobbit/client/logs
-	mkdir -p /data/srv/hobbit/client/tmp
-	chown -R nobody /data/srv/hobbit
-
-#	chown -R nobody /data/srv/httpd/htdocs/hobbit
-#	chown -R nobody /var/log/hobbit
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-op=$1
-shift
-$op $*
-# vim: ft=sh ts=2
diff --git a/abs/mv-core/hobbitmon/PKGBUILD b/abs/mv-core/hobbitmon/PKGBUILD
deleted file mode 100755
index cb71a60..0000000
--- a/abs/mv-core/hobbitmon/PKGBUILD
+++ /dev/null
@@ -1,84 +0,0 @@
-pkgname=hobbitserver
-provides=hobbit
-pkgver=4.2.0
-pkgrel=103
-pkgdesc="Hobbit is a system for monitoring servers and networks. "
-license="GPL"
-arch=('i686')
-
-url="http://hobbitmon.sourceforge.net/"
-source=(http://voxel.dl.sourceforge.net/sourceforge/hobbitmon/hobbit-4.2.0.tar.gz  hobbitadd.py hobbitcheck.sh hobbitgraph.cfg.diff hobbitserver.cfg.diff hobbitlaunch.cfg.diff clientlaunch.cfg.diff hobbitstorage.py  hbnotes.py hobbit-myth-orphan.sh hobbit-clients.cfg hbfunc.py be.png tuner.png tv.png  hobbit-mem-myth.sh hobbit_notify.sh hobbit-alerts.cfg hobbit_myth_data.py)
-depends=(rrdtool fping pcre python graphviz)
-install=hobbit.install
-
-build() {
-cd $startdir/src/hobbit-$pkgver
-ENABLESSL=n \
-ENABLELDAP=n \
-ENABLELDAPSSL=n \
-BBUSER=nobody \
-BBTOPDIR=/data/srv/hobbit \
-BBVAR=/data/srv/hobbit/var \
-BBHOSTURL=/hobbit \
-CGIDIR=/data/srv/httpd/htdocs/hobbit/hobbit-cgi \
-BBCGIURL=/hobbit/hobbit-cgi \
-SECURECGIDIR=/data/srv/httpd/htdocs/hobbit/hobbit-seccgi \
-SECUREBBCGIURL=/hobbit/hobbit-seccgi \
-HTTPDGID=nobody \
-BBLOGDIR=/var/log/hobbit \
-BBHOSTNAME=localhost \
-BBHOSTIP=127.0.0.1 \
-MANROOT=/usr/share/man \
-BARS=all \
-USENEWHIST=y \
-PIXELCOUNT=960 \
-INSTALLBINDIR=/data/srv/hobbit/server/bin \
-INSTALLETCDIR=/data/srv/hobbit/etc \
-INSTALLWEBDIR=/data/srv/hobbit/web \
-INSTALLEXTDIR=/data/srv/hobbit/server/ext \
-INSTALLTMPDIR=/data/srv/hobbit/tmp \
-INSTALLWWWDIR=/data/srv/httpd/htdocs/hobbit/ \
-USERFPING=/usr/sbin/fping \
-./configure
-	make PKGBUILD=1|| return 1
-	make PKGBUILD=1 INSTALLROOT=$startdir/pkg install
-
-cd $startdir/src
-cp $startdir/src/hobbitadd.py  $startdir/pkg/data/srv/hobbit/server/bin/
-install -D -m755 $startdir/src/hobbitstorage.py  $startdir/pkg/data/srv/hobbit/server/ext/hobbitstorage.py
-install -D -m755 $startdir/src/hobbit-myth-orphan.sh $startdir/pkg/data/srv/hobbit/server/ext/hobbit-myth-orphan.sh
-install -D -m755 $startdir/src/hbfunc.py $startdir/pkg/data/srv/hobbit/server/ext/hbfunc.py
-install -D -m755 $startdir/src/hbnotes.py $startdir/pkg/data/srv/hobbit/server/ext/hbnotes.py
-    install -D -m755 $startdir/src/hobbit_myth_data.py $startdir/pkg/data/srv/hobbit/server/ext/hobbit_myth_data.py
-install -D -m755 $startdir/src/hobbit-mem-myth.sh $startdir/pkg/data/srv/hobbit/server/ext/hobbit-mem-myth.sh
-install -D -m755  hobbitcheck.sh $startdir/pkg/etc/cron.tenminutes/hobbitcheck.sh
-install  -m755 hobbit-clients.cfg $startdir/pkg/data/srv/hobbit/etc/hobbit-clients.cfg
-install  -m755 hobbit-alerts.cfg $startdir/pkg/data/srv/hobbit/etc/hobbit-alerts.cfg
-install  -m755 hobbit_notify.sh $startdir/pkg/data/srv/hobbit/server/bin/hobbit_notify.sh
-
-install  -m755 $startdir/src/tv.png  $startdir/pkg/data/srv/httpd/htdocs/hobbit/gifs/tv.png
-install  -m755 $startdir/src/tuner.png  $startdir/pkg/data/srv/httpd/htdocs/hobbit/gifs/tuner.png
-install  -m755 $startdir/src/be.png  $startdir/pkg/data/srv/httpd/htdocs/hobbit/gifs/be.png
-
-
-#apply patches to conf file
-
-cd $startdir/pkg/data/srv/hobbit/etc
-patch -p0 <  $startdir/src/hobbitgraph.cfg.diff
-patch -p0 <  $startdir/src/hobbitserver.cfg.diff
-patch -p0 <  $startdir/src/hobbitlaunch.cfg.diff
-
-
-cd -
-cd $startdir/pkg/data/srv/hobbit/client/etc
-patch -p0 <  $startdir/src/clientlaunch.cfg.diff
-cd -
-
-
-
-#create client package as well
-install -D -m755 $startdir/src/hobbit-mem-myth.sh $startdir/pkg/data/srv/hobbit/client/ext/hobbit-mem-myth.sh
-cp -rp /$startdir/pkg/data/srv/hobbit/client $startdir/../hobbit-client
-
-}
-
diff --git a/abs/mv-core/hobbitmon/be.png b/abs/mv-core/hobbitmon/be.png
deleted file mode 100644
index 2267cab..0000000
--- a/abs/mv-core/hobbitmon/be.png
+++ /dev/null
diff --git a/abs/mv-core/hobbitmon/clientlaunch.cfg.diff b/abs/mv-core/hobbitmon/clientlaunch.cfg.diff
deleted file mode 100644
index 76bb678..0000000
--- a/abs/mv-core/hobbitmon/clientlaunch.cfg.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- clientlaunch.cfg.orig	2008-01-08 09:24:06.000000000 -0600
-+++ clientlaunch.cfg	2008-01-08 10:17:26.000000000 -0600
-@@ -35,3 +35,9 @@
- 	LOGFILE $HOBBITCLIENTHOME/logs/hobbitclient.log
- 	INTERVAL 5m
- 
-+[memmyth]
-+	ENVFILE $HOBBITCLIENTHOME/etc/hobbitclient.cfg
-+       CMD  /data/srv/hobbit/client/ext/hobbit-mem-myth.sh
-+       LOGFILE /data/srv/hobbit/client/mythmem.log
-+       INTERVAL 5m
-+
diff --git a/abs/mv-core/hobbitmon/diffs/clientlaunch.cfg b/abs/mv-core/hobbitmon/diffs/clientlaunch.cfg
deleted file mode 100644
index 8457a8f..0000000
--- a/abs/mv-core/hobbitmon/diffs/clientlaunch.cfg
+++ /dev/null
@@ -1,43 +0,0 @@
-#
-# The clientlaunch.cfg file is loaded by "hobbitlaunch".
-# It controls which of the Hobbit client-side modules to run, 
-# (both the main client "hobbitclient.sh" and any client-side
-# extensions); how often, and with which parameters, options 
-# and environment variables.
-#
-# Note: On the Hobbit *server* itself, this file is normally 
-#       NOT used. Instead, both the client- and server-tasks
-#       are controlled by the hobbitlaunch.cfg file.
-#
-
-# msgcache is used for passive clients, that cannot connect
-# directly to the Hobbit server. This is not the default
-# setup, so this task is normally disabled.
-[msgcache]
-	DISABLED
-	ENVFILE $HOBBITCLIENTHOME/etc/hobbitclient.cfg
-	CMD $HOBBITCLIENTHOME/bin/msgcache --no-daemon --pidfile=$HOBBITCLIENTHOME/logs/msgcache.pid
-	LOGFILE $HOBBITCLIENTHOME/logs/msgcache.log
-
-# The main client task
-[client]
-	ENVFILE $HOBBITCLIENTHOME/etc/hobbitclient.cfg
-	CMD $HOBBITCLIENTHOME/bin/hobbitclient.sh 
-	LOGFILE $HOBBITCLIENTHOME/logs/hobbitclient.log
-	INTERVAL 5m
-
-# ORCA data collector. This is an experimental add-on module,
-# the data sent by this module are not processed by Hobbit 4.2.
-[orcadata]
-	DISABLED
-	ENVFILE $HOBBITCLIENTHOME/etc/hobbitclient.cfg
-	CMD $HOBBITCLIENTHOME/bin/orcahobbit --orca=/usr/local/orca/orcallator
-	LOGFILE $HOBBITCLIENTHOME/logs/hobbitclient.log
-	INTERVAL 5m
-
-[memmyth]
-	ENVFILE $HOBBITCLIENTHOME/etc/hobbitclient.cfg
-       CMD  /data/srv/hobbit/client/ext/hobbit-mem-myth.sh
-       LOGFILE /data/srv/hobbit/client/mythmem.log
-       INTERVAL 5m
-
diff --git a/abs/mv-core/hobbitmon/diffs/clientlaunch.cfg.diff b/abs/mv-core/hobbitmon/diffs/clientlaunch.cfg.diff
deleted file mode 100644
index 76bb678..0000000
--- a/abs/mv-core/hobbitmon/diffs/clientlaunch.cfg.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- clientlaunch.cfg.orig	2008-01-08 09:24:06.000000000 -0600
-+++ clientlaunch.cfg	2008-01-08 10:17:26.000000000 -0600
-@@ -35,3 +35,9 @@
- 	LOGFILE $HOBBITCLIENTHOME/logs/hobbitclient.log
- 	INTERVAL 5m
- 
-+[memmyth]
-+	ENVFILE $HOBBITCLIENTHOME/etc/hobbitclient.cfg
-+       CMD  /data/srv/hobbit/client/ext/hobbit-mem-myth.sh
-+       LOGFILE /data/srv/hobbit/client/mythmem.log
-+       INTERVAL 5m
-+
diff --git a/abs/mv-core/hobbitmon/diffs/clientlaunch.cfg.orig b/abs/mv-core/hobbitmon/diffs/clientlaunch.cfg.orig
deleted file mode 100644
index cfda695..0000000
--- a/abs/mv-core/hobbitmon/diffs/clientlaunch.cfg.orig
+++ /dev/null
@@ -1,37 +0,0 @@
-#
-# The clientlaunch.cfg file is loaded by "hobbitlaunch".
-# It controls which of the Hobbit client-side modules to run, 
-# (both the main client "hobbitclient.sh" and any client-side
-# extensions); how often, and with which parameters, options 
-# and environment variables.
-#
-# Note: On the Hobbit *server* itself, this file is normally 
-#       NOT used. Instead, both the client- and server-tasks
-#       are controlled by the hobbitlaunch.cfg file.
-#
-
-# msgcache is used for passive clients, that cannot connect
-# directly to the Hobbit server. This is not the default
-# setup, so this task is normally disabled.
-[msgcache]
-	DISABLED
-	ENVFILE $HOBBITCLIENTHOME/etc/hobbitclient.cfg
-	CMD $HOBBITCLIENTHOME/bin/msgcache --no-daemon --pidfile=$HOBBITCLIENTHOME/logs/msgcache.pid
-	LOGFILE $HOBBITCLIENTHOME/logs/msgcache.log
-
-# The main client task
-[client]
-	ENVFILE $HOBBITCLIENTHOME/etc/hobbitclient.cfg
-	CMD $HOBBITCLIENTHOME/bin/hobbitclient.sh 
-	LOGFILE $HOBBITCLIENTHOME/logs/hobbitclient.log
-	INTERVAL 5m
-
-# ORCA data collector. This is an experimental add-on module,
-# the data sent by this module are not processed by Hobbit 4.2.
-[orcadata]
-	DISABLED
-	ENVFILE $HOBBITCLIENTHOME/etc/hobbitclient.cfg
-	CMD $HOBBITCLIENTHOME/bin/orcahobbit --orca=/usr/local/orca/orcallator
-	LOGFILE $HOBBITCLIENTHOME/logs/hobbitclient.log
-	INTERVAL 5m
-
diff --git a/abs/mv-core/hobbitmon/diffs/hobbitgraph.cfg b/abs/mv-core/hobbitmon/diffs/hobbitgraph.cfg
deleted file mode 100644
index c11ee6c..0000000
--- a/abs/mv-core/hobbitmon/diffs/hobbitgraph.cfg
+++ /dev/null
@@ -1,1173 +0,0 @@
-# This file defines how RRD graphs are generated by the hobbitgraph CGI.
-#
-# Each section begins with a "[SERVICE]" indicator - this is the name passed
-# to hobbitgraph.cgi?host=foo&service=SERVICE
-#
-# A graph has a TITLE and a YAXIS setting - these are texts shown as the
-# title of the graph, and the YAXIS heading respectively. (The X-axis is
-# always time-based).
-#
-# If a fixed set of RRD files are used for the graph, you just write those
-# in the RRDtool definitions. 
-#
-# For graphs that use multiple RRD files as input, you specify a filename
-# pattern in the FNPATTERN statement, and optionally a pattern of files
-# to exclude from the graph with EXFNPATTERN (see "[tcp]" for an example).
-# When FNPATTERN is used, you can use "@RRDFN@" in the RRDtool definitions
-# to pick up each filename. "@RRDIDX@" is an index (starting at 0) for each
-# file in the set. "@RRDPARAM@" contains the first word extracted from the
-# pattern of files (see e.g. "[memory]" how this is used). "@COLOR@" picks
-# a new color for each graph automatically.
-#
-# The remainder of the lines in each definition are passed directly to the
-# RRDtool rrd_graph() routine.
-#
-# Most of these RRD definitions are from the larrd-grapher.cgi from LARRD 0.43c.
-
-[la]
-	TITLE CPU Load
-	YAXIS Load
-	DEF:avg=la.rrd:la:AVERAGE
-	CDEF:la=avg,100,/
-	AREA:la#00CC00:CPU Load Average
-	-u 1.0
-	GPRINT:la:LAST: \: %5.1lf (cur)
-	GPRINT:la:MAX: \: %5.1lf (max)
-	GPRINT:la:MIN: \: %5.1lf (min)
-	GPRINT:la:AVERAGE: \: %5.1lf (avg)\n
-
-[la-multi]
-	TITLE Multi-host CPU Load
-	YAXIS Load
-	FNPATTERN la.rrd
-	DEF:avg@RRDIDX@=@RRDFN@:la:AVERAGE
-	CDEF:la@RRDIDX@=avg@RRDIDX@,100,/
-	LINE2:la@RRDIDX@#@COLOR@:@RRDPARAM@
-	-u 1.0
-	GPRINT:la@RRDIDX@:LAST: \: %5.1lf (cur)
-	GPRINT:la@RRDIDX@:MAX: \: %5.1lf (max)
-	GPRINT:la@RRDIDX@:MIN: \: %5.1lf (min)
-	GPRINT:la@RRDIDX@:AVERAGE: \: %5.1lf (avg)\n
-
-[la1]
-	TITLE CPU Utilitization
-	YAXIS % Used
-	-u 100
-	-r
-	DEF:cpu_idl=vmstat.rrd:cpu_idl:AVERAGE
-	CDEF:pbusy=100,cpu_idl,-
-	LINE2:pbusy#00CC00:% CPU busy
-	GPRINT:pbusy:LAST: \: %5.1lf (cur)
-	GPRINT:pbusy:MAX: \: %5.1lf (max)
-	GPRINT:pbusy:MIN: \: %5.1lf (min)
-	GPRINT:pbusy:AVERAGE: \: %5.1lf (avg)\n
-
-[la1-multi]
-	TITLE Multi-host CPU Utilitization
-	YAXIS % Used
-	FNPATTERN vmstat.rrd
-	-u 100
-	-r
-	DEF:cpu_idl@RRDIDX@=@RRDFN@:cpu_idl:AVERAGE
-	CDEF:pbusy@RRDIDX@=100,cpu_idl@RRDIDX@,-
-	LINE2:pbusy@RRDIDX@#@COLOR@:@RRDPARAM@
-	GPRINT:pbusy@RRDIDX@:LAST: \: %5.1lf (cur)
-	GPRINT:pbusy@RRDIDX@:MAX: \: %5.1lf (max)
-	GPRINT:pbusy@RRDIDX@:MIN: \: %5.1lf (min)
-	GPRINT:pbusy@RRDIDX@:AVERAGE: \: %5.1lf (avg)\n
-
-[clock]
-	TITLE Clock offset
-	YAXIS Seconds
-	DEF:offset=clock.rrd:la:AVERAGE
-	LINE2:offset#00CC00:Seconds
-	GPRINT:offset:LAST: \: %5.1lf (cur)
-	GPRINT:offset:MAX: \: %5.1lf (max)
-	GPRINT:offset:MIN: \: %5.1lf (min)
-	GPRINT:offset:AVERAGE: \: %5.1lf (avg)\n
-
-[disk]
-	FNPATTERN disk(.*).rrd
-	TITLE Disk Utilization
-	YAXIS % Full
-	DEF:p@RRDIDX@=@RRDFN@:pct:AVERAGE
-	LINE2:p@RRDIDX@#@COLOR@:@RRDPARAM@
-	-u 100
-	-l 0
-	GPRINT:p@RRDIDX@:LAST: \: %5.1lf (cur)
-	GPRINT:p@RRDIDX@:MAX: \: %5.1lf (max)
-	GPRINT:p@RRDIDX@:MIN: \: %5.1lf (min)
-	GPRINT:p@RRDIDX@:AVERAGE: \: %5.1lf (avg)\n
-
-[disk1]
-	FNPATTERN disk(.*).rrd
-	TITLE Disk Utilization
-	YAXIS Used
-	DEF:p@RRDIDX@=@RRDFN@:used:AVERAGE
-	CDEF:p@RRDIDX@t=p@RRDIDX@,1024,*
-	LINE2:p@RRDIDX@t#@COLOR@:@RRDPARAM@
-	-l 0
-	GPRINT:p@RRDIDX@:LAST: \: %5.1lf KB (cur)
-	GPRINT:p@RRDIDX@:MAX: \: %5.1lf KB (max)
-	GPRINT:p@RRDIDX@:MIN: \: %5.1lf KB (min)
-	GPRINT:p@RRDIDX@:AVERAGE: \: %5.1lf KB (avg)\n
-
-# The qtree graphs are based on the qtree report from filerstats2bb.pl
-# These handle NetApp storage devices.
-[qtree]
-	FNPATTERN qtree(.+).rrd
-	TITLE Qtree Utilization
-	YAXIS % Full
-	DEF:p@RRDIDX@=@RRDFN@:pct:AVERAGE
-	LINE2:p@RRDIDX@#@COLOR@:@RRDPARAM@
-	-u 100
-	-l 0
-	GPRINT:p@RRDIDX@:LAST: \: %5.1lf (cur)
-	GPRINT:p@RRDIDX@:MAX: \: %5.1lf (max)
-	GPRINT:p@RRDIDX@:MIN: \: %5.1lf (min)
-	GPRINT:p@RRDIDX@:AVERAGE: \: %5.1lf (avg)\n
-
-# The qtree graphs are based on the inode report from filerstats2bb.pl
-# These handle NetApp storage devices
-# An enhanced disk script that just runs "df -i" could probably get the
-# same data.
-[inode]
-	FNPATTERN inode(.+).rrd
-	TITLE inode Utilization
-	YAXIS % Full
-	DEF:p@RRDIDX@=@RRDFN@:pct:AVERAGE
-	LINE2:p@RRDIDX@#@COLOR@:@RRDPARAM@
-	-u 100
-	-l 0
-	GPRINT:p@RRDIDX@:LAST: \: %5.1lf (cur)
-	GPRINT:p@RRDIDX@:MAX: \: %5.1lf (max)
-	GPRINT:p@RRDIDX@:MIN: \: %5.1lf (min)
-	GPRINT:p@RRDIDX@:AVERAGE: \: %5.1lf (avg)\n
-
-[memory]
-	FNPATTERN memory.(.+).rrd
-	TITLE Memory Utilization
-	YAXIS % Used
-	DEF:p@RRDIDX@=@RRDFN@:realmempct:AVERAGE
-	LINE2:p@RRDIDX@#@COLOR@:@RRDPARAM@
-	-u 100
-	-b 1024
-	GPRINT:p@RRDIDX@:LAST: \: %5.1lf (cur)
-	GPRINT:p@RRDIDX@:MAX: \: %5.1lf (max)
-	GPRINT:p@RRDIDX@:MIN: \: %5.1lf (min)
-	GPRINT:p@RRDIDX@:AVERAGE: \: %5.1lf (avg)\n
-
-[ram]
-	TITLE RAM Utilization
-	YAXIS % Used
-	DEF:p=memory.real.rrd:realmempct:AVERAGE
-	LINE2:p#0000FF:% RAM used
-	-u 100
-	-b 1024
-	GPRINT:p:LAST: \: %5.1lf (cur)
-	GPRINT:p:MAX: \: %5.1lf (max)
-	GPRINT:p:MIN: \: %5.1lf (min)
-	GPRINT:p:AVERAGE: \: %5.1lf (avg)\n
-
-[ram-multi]
-	TITLE Multi-host RAM Utilization
-	FNPATTERN memory.real.rrd
-	YAXIS % Used
-	DEF:p@RRDIDX@=@RRDFN@:realmempct:AVERAGE
-	LINE2:p@RRDIDX@#@COLOR@:@RRDPARAM@
-	-u 100
-	-b 1024
-	GPRINT:p@RRDIDX@:LAST: \: %5.1lf (cur)
-	GPRINT:p@RRDIDX@:MAX: \: %5.1lf (max)
-	GPRINT:p@RRDIDX@:MIN: \: %5.1lf (min)
-	GPRINT:p@RRDIDX@:AVERAGE: \: %5.1lf (avg)\n
-
-[swap]
-	TITLE Swap Utilization
-	YAXIS % Used
-	DEF:p=memory.swap.rrd:realmempct:AVERAGE
-	LINE2:p#0000FF:% Swap used
-	-u 100
-	-b 1024
-	GPRINT:p:LAST: \: %5.1lf (cur)
-	GPRINT:p:MAX: \: %5.1lf (max)
-	GPRINT:p:MIN: \: %5.1lf (min)
-	GPRINT:p:AVERAGE: \: %5.1lf (avg)\n
-
-[swap-multi]
-	TITLE Multi-host Swap Utilization
-	FNPATTERN memory.swap.rrd
-	YAXIS % Used
-	DEF:p@RRDIDX@=@RRDFN@:realmempct:AVERAGE
-	LINE2:p@RRDIDX@#@COLOR@:@RRDPARAM@
-	-u 100
-	-b 1024
-	GPRINT:p@RRDIDX@:LAST: \: %5.1lf (cur)
-	GPRINT:p@RRDIDX@:MAX: \: %5.1lf (max)
-	GPRINT:p@RRDIDX@:MIN: \: %5.1lf (min)
-	GPRINT:p@RRDIDX@:AVERAGE: \: %5.1lf (avg)\n
-
-[mem]
-	TITLE Actual Memory Utilization
-	YAXIS % Used
-	DEF:p=memory.actual.rrd:realmempct:AVERAGE
-	LINE2:p#0000FF:% Actual memory used
-	-u 100
-	-b 1024
-	GPRINT:p:LAST: \: %5.1lf (cur)
-	GPRINT:p:MAX: \: %5.1lf (max)
-	GPRINT:p:MIN: \: %5.1lf (min)
-	GPRINT:p:AVERAGE: \: %5.1lf (avg)\n
-
-[mem-multi]
-	TITLE Multi-host Actual Memory Utilization
-	FNPATTERN memory.actual.rrd
-	YAXIS % Used
-	DEF:p@RRDIDX@=@RRDFN@:realmempct:AVERAGE
-	LINE2:p@RRDIDX@#@COLOR@:@RRDPARAM@
-	-u 100
-	-b 1024
-	GPRINT:p@RRDIDX@:LAST: \: %5.1lf (cur)
-	GPRINT:p@RRDIDX@:MAX: \: %5.1lf (max)
-	GPRINT:p@RRDIDX@:MIN: \: %5.1lf (min)
-	GPRINT:p@RRDIDX@:AVERAGE: \: %5.1lf (avg)\n
-
-[users]
-	TITLE Users and Processes
-	YAXIS #
-	DEF:p=procs.rrd:la:AVERAGE
-	DEF:u=users.rrd:la:AVERAGE
-	AREA:p#00CC00:Processes
-	LINE1:u#000099:Users
-	COMMENT:\n
-	GPRINT:p:LAST:Processes   \: %5.1lf%s (cur)
-	GPRINT:p:MAX: \: %5.1lf%s (max)
-	GPRINT:p:MIN: \: %5.1lf%s (min)
-	GPRINT:p:AVERAGE: \: %5.1lf%s (avg)\n
-	GPRINT:u:LAST:Users       \: %5.1lf%s (cur)
-	GPRINT:u:MAX: \: %5.1lf%s (max)
-	GPRINT:u:MIN: \: %5.1lf%s (min)
-	GPRINT:u:AVERAGE: \: %5.1lf%s (avg)\n
-
-[users-multi]
-	TITLE Multi-host users
-	FNPATTERN users.rrd
-	YAXIS #
-	DEF:u@RRDIDX@=@RRDFN@:la:AVERAGE
-	LINE2:u@RRDIDX@#@COLOR@:@RRDPARAM@
-	COMMENT:\n
-	GPRINT:u@RRDIDX@:LAST:Users       \: %5.1lf%s (cur)
-	GPRINT:u@RRDIDX@:MAX: \: %5.1lf%s (max)
-	GPRINT:u@RRDIDX@:MIN: \: %5.1lf%s (min)
-	GPRINT:u@RRDIDX@:AVERAGE: \: %5.1lf%s (avg)\n
-
-[tcp]
-	# TCP tests - include all, except the HTTP tests as they tend to have
-	# much longer response times than the normal tcp tests.
-	FNPATTERN tcp.(.+).rrd
-	EXFNPATTERN tcp.http.(.+).rrd
-	TITLE TCP Connection Times
-	YAXIS Seconds
-	DEF:p@RRDIDX@=@RRDFN@:sec:AVERAGE
-	LINE2:p@RRDIDX@#@COLOR@:@RRDPARAM@
-	GPRINT:p@RRDIDX@:LAST: \: %5.1lf%s (cur)
-	GPRINT:p@RRDIDX@:MAX: \: %5.1lf%s (max)
-	GPRINT:p@RRDIDX@:MIN: \: %5.1lf%s (min)
-	GPRINT:p@RRDIDX@:AVERAGE: \: %5.1lf%s (avg)\n
-
-[http]
-	FNPATTERN tcp.http.(.+).rrd
-	TITLE HTTP Response Times
-	YAXIS Seconds
-	DEF:p@RRDIDX@=@RRDFN@:sec:AVERAGE
-	LINE2:p@RRDIDX@#@COLOR@:@RRDPARAM@
-	GPRINT:p@RRDIDX@:LAST: \: %5.1lf%s (cur)
-	GPRINT:p@RRDIDX@:MAX: \: %5.1lf%s (max)
-	GPRINT:p@RRDIDX@:MIN: \: %5.1lf%s (min)
-	GPRINT:p@RRDIDX@:AVERAGE: \: %5.1lf%s (avg)\n
-
-[conn-multi]
-	FNPATTERN tcp.conn.rrd
-	TITLE PING Round-trip time
-	YAXIS Seconds
-	DEF:p@RRDIDX@=@RRDFN@:sec:AVERAGE
-	LINE2:p@RRDIDX@#@COLOR@:@RRDPARAM@
-	GPRINT:p@RRDIDX@:LAST: \: %5.1lf%s (cur)
-	GPRINT:p@RRDIDX@:MAX: \: %5.1lf%s (max)
-	GPRINT:p@RRDIDX@:MIN: \: %5.1lf%s (min)
-	GPRINT:p@RRDIDX@:AVERAGE: \: %5.1lf%s (avg)\n
-
-[ntpstat]
-	TITLE NTP accuracy
-	YAXIS Offset (ms)
-	DEF:u=ntpstat.rrd:offsetms:AVERAGE
-	LINE2:u#FF0000:Offset (ms)
-	COMMENT:\n
-	GPRINT:u:LAST: \: %5.2lf ms (cur)\n
-	GPRINT:u:MAX: \: %5.2lf ms (max)\n
-	GPRINT:u:MIN: \: %5.2lf ms (min)\n
-	GPRINT:u:AVERAGE: \: %5.2lf ms (avg)\n
-
-[vmstat]
-	TITLE CPU Utilization
-	YAXIS % Load
-	-u 100
-	-r
-	DEF:cpu_idl=vmstat.rrd:cpu_idl:AVERAGE
-	DEF:cpu_usr=vmstat.rrd:cpu_usr:AVERAGE
-	DEF:cpu_sys=vmstat.rrd:cpu_sys:AVERAGE
-	AREA:cpu_sys#FF0000:System
-	STACK:cpu_usr#FFFF00:User
-	STACK:cpu_idl#00FF00:Idle
-	COMMENT:\n
-	GPRINT:cpu_sys:LAST:System  \: %5.1lf (cur)
-	GPRINT:cpu_sys:MAX: \: %5.1lf (max)
-	GPRINT:cpu_sys:MIN: \: %5.1lf (min)
-	GPRINT:cpu_sys:AVERAGE: \: %5.1lf (avg)\n
-	GPRINT:cpu_usr:LAST:User    \: %5.1lf (cur)
-	GPRINT:cpu_usr:MAX: \: %5.1lf (max)
-	GPRINT:cpu_usr:MIN: \: %5.1lf (min)
-	GPRINT:cpu_usr:AVERAGE: \: %5.1lf (avg)\n
-	GPRINT:cpu_idl:LAST:Idle    \: %5.1lf (cur)
-	GPRINT:cpu_idl:MAX: \: %5.1lf (max)
-	GPRINT:cpu_idl:MIN: \: %5.1lf (min)
-	GPRINT:cpu_idl:AVERAGE: \: %5.1lf (avg)\n
-
-[vmstat1]
-	TITLE CPU Utilization
-	YAXIS % Load
-	-u 100
-	-r
-	DEF:cpu_idl=vmstat.rrd:cpu_idl:AVERAGE
-	DEF:cpu_usr=vmstat.rrd:cpu_usr:AVERAGE
-	DEF:cpu_sys=vmstat.rrd:cpu_sys:AVERAGE
-	DEF:cpu_wait=vmstat.rrd:cpu_wait:AVERAGE
-	AREA:cpu_sys#FF0000:System
-	STACK:cpu_wait#774400:I/O wait
-	STACK:cpu_usr#FFFF00:User
-	STACK:cpu_idl#00FF00:Idle
-	COMMENT:\n
-	GPRINT:cpu_sys:LAST:System  \: %5.1lf (cur)
-	GPRINT:cpu_sys:MAX: \: %5.1lf (max)
-	GPRINT:cpu_sys:MIN: \: %5.1lf (min)
-	GPRINT:cpu_sys:AVERAGE: \: %5.1lf (avg)\n
-	GPRINT:cpu_wait:LAST:I/O Wait\: %5.1lf (cur)
-	GPRINT:cpu_wait:MAX: \: %5.1lf (max)
-	GPRINT:cpu_wait:MIN: \: %5.1lf (min)
-	GPRINT:cpu_wait:AVERAGE: \: %5.1lf (avg)\n
-	GPRINT:cpu_usr:LAST:User    \: %5.1lf (cur)
-	GPRINT:cpu_usr:MAX: \: %5.1lf (max)
-	GPRINT:cpu_usr:MIN: \: %5.1lf (min)
-	GPRINT:cpu_usr:AVERAGE: \: %5.1lf (avg)\n
-	GPRINT:cpu_idl:LAST:Idle    \: %5.1lf (cur)
-	GPRINT:cpu_idl:MAX: \: %5.1lf (max)
-	GPRINT:cpu_idl:MIN: \: %5.1lf (min)
-	GPRINT:cpu_idl:AVERAGE: \: %5.1lf (avg)\n
-
-[vmstat2]
-	TITLE CPU Utilization
-	YAXIS % Load
-	-u 1.0
-	DEF:avg=la.rrd:la:AVERAGE
-	CDEF:la=avg,100,/
-	DEF:cpu_idl=vmstat.rrd:cpu_idl:AVERAGE
-	CDEF:cpu_idl2=cpu_idl,100,/
-	DEF:cpu_usr=vmstat.rrd:cpu_usr:AVERAGE
-	CDEF:cpu_usr2=cpu_usr,100,/
-	DEF:cpu_sys=vmstat.rrd:cpu_sys:AVERAGE
-	CDEF:cpu_sys2=cpu_sys,100,/
-	AREA:cpu_sys2#FF0000:System
-	STACK:cpu_usr2#FFFF00:User
-	STACK:cpu_idl2#00FF00:Idle
-	LINE1:la#000099:CPU Load Average
-	COMMENT:\n
-	GPRINT:cpu_sys2:LAST:System           \: %5.1lf (cur)
-	GPRINT:cpu_sys2:MAX: \: %5.1lf (max)
-	GPRINT:cpu_sys2:MIN: \: %5.1lf (min)
-	GPRINT:cpu_sys2:AVERAGE: \: %5.1lf (avg)\n
-	GPRINT:cpu_usr2:LAST:User             \: %5.1lf (cur)
-	GPRINT:cpu_usr2:MAX: \: %5.1lf (max)
-	GPRINT:cpu_usr2:MIN: \: %5.1lf (min)
-	GPRINT:cpu_usr2:AVERAGE: \: %5.1lf (avg)\n
-	GPRINT:cpu_idl2:LAST:Idle             \: %5.1lf (cur)
-	GPRINT:cpu_idl2:MAX: \: %5.1lf (max)
-	GPRINT:cpu_idl2:MIN: \: %5.1lf (min)
-	GPRINT:cpu_idl2:AVERAGE: \: %5.1lf (avg)\n
-	GPRINT:la:LAST:CPU Load Average \: %5.1lf (cur)
-	GPRINT:la:MAX: \: %5.1lf (max)
-	GPRINT:la:MIN: \: %5.1lf (min)
-	GPRINT:la:AVERAGE: \: %5.1lf (avg)\n
-
-[vmstat3]
-	TITLE Interrupts and Context Switches
-	YAXIS Average Events/sec
-	DEF:int=vmstat.rrd:cpu_int:AVERAGE
-	DEF:csw=vmstat.rrd:cpu_csw:AVERAGE
-	LINE2:int#0000ff:Interrupts
-	LINE2:csw#00FF00:Context Switches
-	COMMENT:\n
-	GPRINT:int:LAST:Interrupts        \: %5.1lf%s (cur)
-	GPRINT:int:MAX: \: %5.1lf%s (max)
-	GPRINT:int:MIN: \: %5.1lf%s (min)
-	GPRINT:int:AVERAGE: \: %5.1lf%s (avg)\n
-	GPRINT:csw:LAST:Context Switches  \: %5.1lf%s (cur)
-	GPRINT:csw:MAX: \: %5.1lf%s (max)
-	GPRINT:csw:MIN: \: %5.1lf%s (min)
-	GPRINT:csw:AVERAGE: \: %5.1lf%s (avg)\n
-
-[vmstat4]
-	TITLE Swap Activity
-	YAXIS Average kB/s
-	-b 1024
-	DEF:si=vmstat.rrd:mem_si:AVERAGE
-	DEF:so=vmstat.rrd:mem_so:AVERAGE
-	LINE2:si#0000ff:Memory Swapped from Disk
-	LINE2:so#00FF00:Memory Swapped to Disk
-	COMMENT:\n
-	GPRINT:si:LAST:Memory Swapped from Disk  \: %5.1lf (cur)
-	GPRINT:si:MAX: \: %5.1lf (max)
-	GPRINT:si:MIN: \: %5.1lf (min)
-	GPRINT:si:AVERAGE: \: %5.1lf%s (avg)\n
-	GPRINT:si:LAST:Memory Swapped to Disk    \: %5.1lf (cur)
-	GPRINT:si:MAX: \: %5.1lf (max)
-	GPRINT:si:MIN: \: %5.1lf (min)
-	GPRINT:si:AVERAGE: \: %5.1lf%s (avg)\n
-
-[vmstat5]
-	TITLE Block I/O
-	YAXIS Average blocks/s
-	DEF:bi=vmstat.rrd:dsk_bi:AVERAGE
-	DEF:bo=vmstat.rrd:dsk_bo:AVERAGE
-	LINE2:bi#0000FF:Blocks sent to a block device
-	LINE2:bo#00FF00:Blocks received from a block device
-	COMMENT:\n
-	GPRINT:bi:LAST:Blocks sent to a block device        \: %5.1lf (cur)
-	GPRINT:bi:MAX: \: %5.1lf (max)
-	GPRINT:bi:MIN: \: %5.1lf (min)
-	GPRINT:bi:AVERAGE: \: %5.1lf (avg)\n
-	GPRINT:bo:LAST:Blocks received from a block device  \: %5.1lf (cur)
-	GPRINT:bo:MAX: \: %5.1lf (max)
-	GPRINT:bo:MIN: \: %5.1lf (min)
-	GPRINT:bo:AVERAGE: \: %5.1lf (avg)\n
-
-[vmstat6]
-	# This graph only works on some OS'es (Solaris)
-	TITLE Memory Utilization
-	YAXIS Size kB
-	-b 1024
-	DEF:free=vmstat.rrd:mem_free:AVERAGE
-	CDEF:fr=free,1024,*
-	DEF:swap=vmstat.rrd:mem_swap:AVERAGE
-	CDEF:sw=swap,1024,*
-	LINE2:fr#0000ff:Size of the free list
-	LINE2:sw#00FF00:Swap space currently available
-	COMMENT:\n
-	GPRINT:fr:LAST:Size of the free list           \: %5.1lf%s (cur)
-	GPRINT:fr:MAX: \: %5.1lf%s (max)
-	GPRINT:fr:MIN: \: %5.1lf%s (min)
-	GPRINT:fr:AVERAGE: \: %5.1lf%s (avg)\n
-	GPRINT:sw:LAST:Swap space currently available  \: %5.1lf%s (cur)
-	GPRINT:sw:MAX: \: %5.1lf%s (max)
-	GPRINT:sw:MIN: \: %5.1lf%s (min)
-	GPRINT:sw:AVERAGE: \: %5.1lf%s (avg)\n
-
-[vmstat7]
-	# This graph only works on some OS'es (Solaris)
-	TITLE Memory Utilization
-	YAXIS Events/s
-	DEF:re=vmstat.rrd:mem_re:AVERAGE
-	DEF:mf=vmstat.rrd:mem_mf:AVERAGE
-	LINE2:re#0000ff:Page reclaims
-	LINE2:mf#00FF00:Minor faults
-	COMMENT:\n
-	GPRINT:re:LAST:Page reclaims  \: %5.1lf%s (cur)
-	GPRINT:re:MAX: \: %5.1lf%s (max)
-	GPRINT:re:MIN: \: %5.1lf%s (min)
-	GPRINT:re:AVERAGE: \: %5.1lf%s (avg)\n
-	GPRINT:mf:LAST:Minor faults   \: %5.1lf%s (cur)
-	GPRINT:mf:MAX: \: %5.1lf%s (max)
-	GPRINT:mf:MIN: \: %5.1lf%s (min)
-	GPRINT:mf:AVERAGE: \: %5.1lf%s (avg)\n
-
-[vmstat8]
-	# This graph only works on some OS'es (Solaris)
-	TITLE Paging Activity
-	YAXIS kB/s
-	-b 1024
-	DEF:pi=vmstat.rrd:mem_pi:AVERAGE
-	CDEF:rpi=pi,1024,*
-	DEF:po=vmstat.rrd:mem_po:AVERAGE
-	CDEF:rpo=po,1024,*
-	LINE2:rpi#0000ff:Paged in
-	LINE2:rpo#00FF00:Paged out
-	COMMENT:\n
-	GPRINT:pi:LAST:Page Ins   \: %5.1lf%s (cur)
-	GPRINT:pi:MAX: \: %5.1lf%s (max)
-	GPRINT:pi:MIN: \: %5.1lf%s (min)
-	GPRINT:pi:AVERAGE: \: %5.1lf%s (avg)\n
-	GPRINT:po:LAST:Page Outs  \: %5.1lf%s (cur)
-	GPRINT:po:MAX: \: %5.1lf%s (max)
-	GPRINT:po:MIN: \: %5.1lf%s (min)
-	GPRINT:po:AVERAGE: \: %5.1lf%s (avg)\n
-
-[vmstat9]
-	# This graph only works on some OS'es (Solaris)
-	TITLE RAM Scan Rate
-	YAXIS Pages scanned/s
-	DEF:sr=vmstat.rrd:sr:AVERAGE
-	AREA:sr#00CC00:Scan Rate
-	-u 20
-	GPRINT:sr:LAST: \: %5.1lf%s (cur)
-	GPRINT:sr:MAX: \: %5.1lf%s (max)
-	GPRINT:sr:MIN: \: %5.1lf%s (min)
-	GPRINT:sr:AVERAGE: \: %5.1lf%s (avg)\n
-
-[vmstat0]
-	# This graph only works on some OS'es (Solaris)
-	TITLE System Calls
-	YAXIS System Calls/s
-	DEF:cpu_syc=vmstat.rrd:cpu_syc:AVERAGE
-	AREA:cpu_syc#00CC00:System Calls
-	GPRINT:cpu_syc:LAST: \: %5.1lf%s (cur)
-	GPRINT:cpu_syc:MAX: \: %5.1lf%s (max)
-	GPRINT:cpu_syc:MIN: \: %5.1lf%s (min)
-	GPRINT:cpu_syc:AVERAGE: \: %5.1lf%s (avg)\n
-
-[netstat]
-	TITLE TCP/IP statistics
-	YAXIS Packets/second
-	DEF:tcpInInorderPackets=netstat.rrd:tcpInInorderPackets:AVERAGE
-	DEF:tcpOutDataPackets=netstat.rrd:tcpOutDataPackets:AVERAGE
-	DEF:tcpRetransPackets=netstat.rrd:tcpRetransPackets:AVERAGE
-	LINE3:tcpInInorderPackets#00FF00:In 
-	LINE1:tcpOutDataPackets#0000FF:Out 
-	LINE2:tcpRetransPackets#FF0000:Retrans 
-	COMMENT:\n
-	GPRINT:tcpInInorderPackets:LAST:In       \: %5.1lf%s (cur)
-	GPRINT:tcpInInorderPackets:MAX: \: %5.1lf%s (max)
-	GPRINT:tcpInInorderPackets:MIN: \: %5.1lf%s (min)
-	GPRINT:tcpInInorderPackets:AVERAGE: \: %5.1lf%s (avg)\n
-	GPRINT:tcpOutDataPackets:LAST:Out      \: %5.1lf%s (cur)
-	GPRINT:tcpOutDataPackets:MAX: \: %5.1lf%s (max)
-	GPRINT:tcpOutDataPackets:MIN: \: %5.1lf%s (min)
-	GPRINT:tcpOutDataPackets:AVERAGE: \: %5.1lf%s (avg)\n
-	GPRINT:tcpRetransPackets:LAST:Retrans  \: %5.1lf%s (cur)
-	GPRINT:tcpRetransPackets:MAX: \: %5.1lf%s (max)
-	GPRINT:tcpRetransPackets:MIN: \: %5.1lf%s (min)
-	GPRINT:tcpRetransPackets:AVERAGE: \: %5.1lf%s (avg)\n
-
-[netstat0]
-	TITLE TCP/IP statistics
-	YAXIS Bits/second
-	DEF:tcpInInorderBytes=netstat.rrd:tcpInInorderBytes:AVERAGE
-	DEF:tcpOutDataBytes=netstat.rrd:tcpOutDataBytes:AVERAGE
-	DEF:tcpRetransBytes=netstat.rrd:tcpRetransBytes:AVERAGE
-	CDEF:tcpInInorderBits=tcpInInorderBytes,8,*
-	CDEF:tcpOutDataBits=tcpOutDataBytes,8,*
-	CDEF:tcpRetransBits=tcpRetransBytes,8,*
-	LINE3:tcpInInorderBits#00FF00:In 
-	LINE1:tcpOutDataBits#0000FF:Out 
-	LINE2:tcpRetransBits#FF0000:Retrans 
-	COMMENT:\n
-	GPRINT:tcpInInorderBits:LAST:In       \: %5.1lf%s (cur)
-	GPRINT:tcpInInorderBits:MAX: \: %5.1lf%s (max)
-	GPRINT:tcpInInorderBits:MIN: \: %5.1lf%s (min)
-	GPRINT:tcpInInorderBits:AVERAGE: \: %5.1lf%s (avg)\n
-	GPRINT:tcpOutDataBits:LAST:Out      \: %5.1lf%s (cur)
-	GPRINT:tcpOutDataBits:MAX: \: %5.1lf%s (max)
-	GPRINT:tcpOutDataBits:MIN: \: %5.1lf%s (min)
-	GPRINT:tcpOutDataBits:AVERAGE: \: %5.1lf%s (avg)\n
-	GPRINT:tcpRetransBits:LAST:Retrans  \: %5.1lf%s (cur)
-	GPRINT:tcpRetransBits:MAX: \: %5.1lf%s (max)
-	GPRINT:tcpRetransBits:MIN: \: %5.1lf%s (min)
-	GPRINT:tcpRetransBits:AVERAGE: \: %5.1lf%s (avg)\n
-
-[netstat1]
-	TITLE UDP Statistics
-	YAXIS # Datagrams
-	DEF:udpInDatagrams=netstat.rrd:udpInDatagrams:AVERAGE
-	DEF:udpOutDatagrams=netstat.rrd:udpOutDatagrams:AVERAGE
-	DEF:udpInErrors=netstat.rrd:udpInErrors:AVERAGE
-	LINE3:udpInDatagrams#00FF00:UDP In Datagrams
-	LINE1:udpOutDatagrams#0000FF:UDP Out Datagrams
-	LINE2:udpInErrors#FF0000:UDP In Errors
-	COMMENT:\n
-	GPRINT:udpInDatagrams:LAST:UDP In Datagrams       \: %5.1lf%s (cur)
-	GPRINT:udpInDatagrams:MAX: \: %5.1lf%s (max)
-	GPRINT:udpInDatagrams:MIN: \: %5.1lf%s (min)
-	GPRINT:udpInDatagrams:AVERAGE: \: %5.1lf%s (avg)\n
-	GPRINT:udpOutDatagrams:LAST:UDP Out Datagrams      \: %5.1lf%s (cur)
-	GPRINT:udpOutDatagrams:MAX: \: %5.1lf%s (max)
-	GPRINT:udpOutDatagrams:MIN: \: %5.1lf%s (min)
-	GPRINT:udpOutDatagrams:AVERAGE: \: %5.1lf%s (avg)\n
-	GPRINT:udpInErrors:LAST:UDP In Errors          \: %5.1lf%s (cur)
-	GPRINT:udpInErrors:MAX: \: %5.1lf%s (max)
-	GPRINT:udpInErrors:MIN: \: %5.1lf%s (min)
-	GPRINT:udpInErrors:AVERAGE: \: %5.1lf%s (avg)\n
-
-[netstat2]
-	TITLE TCP Statistics
-	YAXIS # Events
-	DEF:tcpActiveOpens=netstat.rrd:tcpActiveOpens:AVERAGE
-	DEF:tcpPassiveOpens=netstat.rrd:tcpPassiveOpens:AVERAGE
-	DEF:tcpAttemptFails=netstat.rrd:tcpAttemptFails:AVERAGE
-	DEF:tcpEstabResets=netstat.rrd:tcpEstabResets:AVERAGE
-	LINE2:tcpActiveOpens#0000FF:TCP Active Open
-	LINE2:tcpPassiveOpens#000088:TCP Passive Open
-	LINE2:tcpAttemptFails#FF0000:TCP Attempts Fail
-	LINE2:tcpEstabResets#88FF00:TCP Established Resets
-	COMMENT:\n
-	GPRINT:tcpActiveOpens:LAST:TCP Active Opens            \: %5.1lf%s (cur)
-	GPRINT:tcpActiveOpens:MAX: \: %5.1lf%s (max)
-	GPRINT:tcpActiveOpens:MIN: \: %5.1lf%s (min)
-	GPRINT:tcpActiveOpens:AVERAGE: \: %5.1lf%s (avg)\n
-	GPRINT:tcpPassiveOpens:LAST:TCP Passive Opens           \: %5.1lf%s (cur)
-	GPRINT:tcpPassiveOpens:MAX: \: %5.1lf%s (max)
-	GPRINT:tcpPassiveOpens:MIN: \: %5.1lf%s (min)
-	GPRINT:tcpPassiveOpens:AVERAGE: \: %5.1lf%s (avg)\n
-	GPRINT:tcpAttemptFails:LAST:TCP Failed Attempts         \: %5.1lf%s (cur)
-	GPRINT:tcpAttemptFails:MAX: \: %5.1lf%s (max)
-	GPRINT:tcpAttemptFails:MIN: \: %5.1lf%s (min)
-	GPRINT:tcpAttemptFails:AVERAGE: \: %5.1lf%s (avg)\n
-	GPRINT:tcpEstabResets:LAST:TCP Established Resets      \: %5.1lf%s (cur)
-	GPRINT:tcpEstabResets:MAX: \: %5.1lf%s (max)
-	GPRINT:tcpEstabResets:MIN: \: %5.1lf%s (min)
-	GPRINT:tcpEstabResets:AVERAGE: \: %5.1lf%s (avg)\n
-
-[netstat3]
-	TITLE Established TCP Connections
-	YAXIS # Connections
-	DEF:tcpCurrEstab=netstat.rrd:tcpCurrEstab:AVERAGE
-	LINE2:tcpCurrEstab#0000FF:TCP Established Connections
-	COMMENT:\n
-	GPRINT:tcpCurrEstab:LAST:TCP Established Connections \: %5.1lf%s (cur)
-	GPRINT:tcpCurrEstab:MAX: \: %5.1lf%s (max)
-	GPRINT:tcpCurrEstab:MIN: \: %5.1lf%s (min)
-	GPRINT:tcpCurrEstab:AVERAGE: \: %5.1lf%s (avg)\n
-
-[netstat3-multi]
-	TITLE Multi-host TCP Connections
-	YAXIS # Connections
-	FNPATTERN netstat.rrd
-	DEF:tcpCurrEstab@RRDIDX@=@RRDFN@:tcpCurrEstab:AVERAGE
-	LINE2:tcpCurrEstab@RRDIDX@#@COLOR@:@RRDPARAM@
-	GPRINT:tcpCurrEstab@RRDIDX@:LAST:# Est. \: %5.1lf%s (cur)
-	GPRINT:tcpCurrEstab@RRDIDX@:MAX: \: %5.1lf%s (max)
-	GPRINT:tcpCurrEstab@RRDIDX@:MIN: \: %5.1lf%s (min)
-	GPRINT:tcpCurrEstab@RRDIDX@:AVERAGE: \: %5.1lf%s (avg)\n
-
-[iostat]
-	TITLE I/O Utilization
-	YAXIS Stats
-	FNPATTERN iostat.(.+).rrd
-	DEF:p@RRDIDX@B=@RRDFN@:b:AVERAGE
-	DEF:p@RRDIDX@A=@RRDFN@:asvc_t:AVERAGE
-	DEF:p@RRDIDX@W=@RRDFN@:wsvc_t:AVERAGE
-	CDEF:p@RRDIDX@t=p@RRDIDX@B,5,GT,p@RRDIDX@B,UNKN,IF
-	LINE2:p@RRDIDX@t#@COLOR@:@RRDPARAM@
-	COMMENT:\n
-	GPRINT:p@RRDIDX@B:LAST:B       \: %5.1lf (cur)
-	GPRINT:p@RRDIDX@B:MAX: \: %5.1lf (max)
-	GPRINT:p@RRDIDX@B:MIN: \: %5.1lf (min)
-	GPRINT:p@RRDIDX@B:AVERAGE: \: %5.1lf (avg)\n
-	GPRINT:p@RRDIDX@A:LAST:asvc_t  \: %5.1lf (cur)
-	GPRINT:p@RRDIDX@A:MAX: \: %5.1lf (max)
-	GPRINT:p@RRDIDX@A:MIN: \: %5.1lf (min)
-	GPRINT:p@RRDIDX@A:AVERAGE: \: %5.1lf (avg)\n
-	GPRINT:p@RRDIDX@W:LAST:wsvc_t  \: %5.1lf (cur)
-	GPRINT:p@RRDIDX@W:MAX: \: %5.1lf (max)
-	GPRINT:p@RRDIDX@W:MIN: \: %5.1lf (min)
-	GPRINT:p@RRDIDX@W:AVERAGE: \: %5.1lf (avg)\n
-	COMMENT:\n
-
-[apache]
-	TITLE Apache Utilization
-	YAXIS Activity
-	DEF:TA=apache.rrd:TA:AVERAGE
-	CDEF:TA1=TA,300,*
-	DEF:TKB=apache.rrd:TKB:AVERAGE
-	CDEF:TKB1=TKB,300,*
-	LINE2:TA1#0000FF:TA (# Accesses)
-	LINE2:TKB1#FF0000:TKB (kBytes Transferred)
-	COMMENT:\n
-	GPRINT:TA1:LAST:TA    \: %5.1lf%s (cur)
-	GPRINT:TA1:MAX: \: %5.1lf%s (max)
-	GPRINT:TA1:MIN: \: %5.1lf%s (min)
-	GPRINT:TA1:AVERAGE: \: %5.1lf%s (avg)\n
-	GPRINT:TKB1:LAST:TKB   \: %5.1lf%s (cur)
-	GPRINT:TKB1:MAX: \: %5.1lf%s (max)
-	GPRINT:TKB1:MIN: \: %5.1lf%s (min)
-	GPRINT:TKB1:AVERAGE: \: %5.1lf%s (avg)\n
-
-[apache1]
-	TITLE Apache Workers
-	YAXIS # Worker Threads/Processes
-	#DEF:BS=apache.rrd:BS:AVERAGE
-	#DEF:IS=apache.rrd:IS:AVERAGE
-	DEF:BW=apache.rrd:BW:AVERAGE
-	DEF:IW=apache.rrd:IW:AVERAGE
-	#LINE2:BS#00CC00:BS
-	#LINE2:IS#FF00FF:IS
-	LINE2:BW#555555:BW Busy Workers
-	LINE2:IW#880000:IW Idle Workers
-	COMMENT:\n
-	GPRINT:BW:LAST:BW   \: %5.1lf%s (cur)
-	GPRINT:BW:MAX: \: %5.1lf%s (max)
-	GPRINT:BW:MIN: \: %5.1lf%s (min)
-	GPRINT:BW:AVERAGE: \: %5.1lf%s (avg)\n
-	GPRINT:IW:LAST:IW   \: %5.1lf%s (cur)
-	GPRINT:IW:MAX: \: %5.1lf%s (max)
-	GPRINT:IW:MIN: \: %5.1lf%s (min)
-	GPRINT:IW:AVERAGE: \: %5.1lf%s (avg)\n
-
-[apache2]
-	TITLE Apache CPU Utilization
-	YAXIS CPU Load
-	DEF:CPU=apache.rrd:CPU:AVERAGE
-	LINE2:CPU#000088:CPU
-	COMMENT:\n
-	GPRINT:CPU:LAST:CPU   \: %5.1lf (cur)
-	GPRINT:CPU:MAX: \: %5.1lf (max)
-	GPRINT:CPU:MIN: \: %5.1lf (min)
-	GPRINT:CPU:AVERAGE: \: %5.1lf (avg)\n
-
-[apache3]
-	TITLE Apache Requests/Second
-	YAXIS # Requests
-	DEF:RPS=apache.rrd:REQPERSEC:AVERAGE
-	LINE2:RPS#000088:RPS
-	COMMENT:\n
-	GPRINT:RPS:LAST:Requests per Second   \: %5.1lf (cur)
-	GPRINT:RPS:MAX: \: %5.1lf (max)
-	GPRINT:RPS:MIN: \: %5.1lf (min)
-	GPRINT:RPS:AVERAGE: \: %5.1lf (avg)\n
-
-[apache3-multi]
-	TITLE Multi-Host Apache Requests/Second
-	FNPATTERN apache.rrd
-	YAXIS # Requests / seconds
-	# --slope-mode
-	DEF:RPS@RRDIDX@=@RRDFN@:REQPERSEC:AVERAGE
-	LINE2:RPS@RRDIDX@#@COLOR@:@RRDPARAM@
-	COMMENT:\n
-	GPRINT:RPS@RRDIDX@:LAST:Requests per Second  \: %5.1lf (cur)
-	GPRINT:RPS@RRDIDX@:MAX: \: %5.1lf (max)
-	GPRINT:RPS@RRDIDX@:MIN: \: %5.1lf (min)
-	GPRINT:RPS@RRDIDX@:AVERAGE: \: %5.1lf (avg)\n
-
-[bea]
-	FNPATTERN bea.memory.(.+).rrd
-	TITLE BEA/Weblogic % Heap Free
-	YAXIS % Free
-	DEF:free@RRDIDX@=@RRDFN@:freeheap:AVERAGE
-	DEF:used@RRDIDX@=@RRDFN@:usedheap:AVERAGE
-	DEF:total@RRDIDX@=@RRDFN@:totalheap:AVERAGE
-	CDEF:mbfree@RRDIDX@=free@RRDIDX@,1048576,/
-	CDEF:mbused@RRDIDX@=used@RRDIDX@,1048576,/
-	CDEF:mbtotal@RRDIDX@=total@RRDIDX@,1048576,/
-	CDEF:pctfree@RRDIDX@=mbfree@RRDIDX@,100,*,mbtotal@RRDIDX@,/
-	LINE2:pctfree@RRDIDX@#@COLOR@:@RRDPARAM@
-	COMMENT:\n
-	GPRINT:mbused@RRDIDX@:LAST:Used \: %8.1lf MB (cur)
-	GPRINT:mbused@RRDIDX@:MAX: \: %8.1lf MB (max)
-	GPRINT:mbused@RRDIDX@:MIN: \: %8.1lf MB (min)
-	GPRINT:mbused@RRDIDX@:AVERAGE: \: %8.1lf MB (avg)\n
-	GPRINT:mbfree@RRDIDX@:LAST:Free \: %8.1lf MB (cur)
-	GPRINT:mbfree@RRDIDX@:MAX: \: %8.1lf MB (max)
-	GPRINT:mbfree@RRDIDX@:MIN: \: %8.1lf MB (min)
-	GPRINT:mbfree@RRDIDX@:AVERAGE: \: %8.1lf MB (avg)\n
-
-[bea2]
-	FNPATTERN bea.memory.(.+).rrd
-	TITLE BEA/Weblogic % Physical Memory Free
-	YAXIS % Free
-	DEF:free@RRDIDX@=@RRDFN@:freephysmem:AVERAGE
-	DEF:used@RRDIDX@=@RRDFN@:usedphysmem:AVERAGE
-	DEF:total@RRDIDX@=@RRDFN@:totalphysmem:AVERAGE
-	CDEF:mbfree@RRDIDX@=free@RRDIDX@,1048576,/
-	CDEF:mbused@RRDIDX@=used@RRDIDX@,1048576,/
-	CDEF:mbtotal@RRDIDX@=total@RRDIDX@,1048576,/
-	CDEF:pctfree@RRDIDX@=mbfree@RRDIDX@,100,*,mbtotal@RRDIDX@,/
-	LINE2:pctfree@RRDIDX@#@COLOR@:@RRDPARAM@
-	COMMENT:\n
-	GPRINT:mbused@RRDIDX@:LAST:Used \: %8.1lf MB (cur)
-	GPRINT:mbused@RRDIDX@:MAX: \: %8.1lf MB (max)
-	GPRINT:mbused@RRDIDX@:MIN: \: %8.1lf MB (min)
-	GPRINT:mbused@RRDIDX@:AVERAGE: \: %8.1lf MB (avg)\n
-	GPRINT:mbfree@RRDIDX@:LAST:Free \: %8.1lf MB (cur)
-	GPRINT:mbfree@RRDIDX@:MAX: \: %8.1lf MB (max)
-	GPRINT:mbfree@RRDIDX@:MIN: \: %8.1lf MB (min)
-	GPRINT:mbfree@RRDIDX@:AVERAGE: \: %8.1lf MB (avg)\n
-
-[bea3]
-	FNPATTERN bea.threads.(.+).weblogic.kernel.Default.rrd
-	TITLE BEA/Weblogic kernel.Default Idle Threads
-	YAXIS # Idle Threads
-	DEF:threads@RRDIDX@=@RRDFN@:currentidlecount:AVERAGE
-	LINE2:threads@RRDIDX@#@COLOR@:@RRDPARAM@
-	COMMENT:\n
-	GPRINT:threads@RRDIDX@:LAST:Free \: %4.2lf (cur)
-	GPRINT:threads@RRDIDX@:MAX: \: %4.2lf (max)
-	GPRINT:threads@RRDIDX@:MIN: \: %4.2lf (min)
-	GPRINT:threads@RRDIDX@:AVERAGE: \: %4.2lf (avg)\n
-
-[bea4]
-	FNPATTERN bea.threads.(.+).weblogic.kernel.Default.rrd
-	TITLE BEA/Weblogic kernel.Default Requests
-	YAXIS # Requests
-	DEF:reqs@RRDIDX@=@RRDFN@:totalcount:AVERAGE
-	LINE2:reqs@RRDIDX@#@COLOR@:@RRDPARAM@
-	COMMENT:\n
-	GPRINT:reqs@RRDIDX@:LAST:Free \: %4.2lf (cur)
-	GPRINT:reqs@RRDIDX@:MAX: \: %4.2lf (max)
-	GPRINT:reqs@RRDIDX@:MIN: \: %4.2lf (min)
-	GPRINT:reqs@RRDIDX@:AVERAGE: \: %4.2lf (avg)\n
-
-[bind]
-	TITLE BIND Utilization
-	YAXIS Stats
-	DEF:A=bind.rrd:A:AVERAGE
-	DEF:ANY=bind.rrd:ANY:AVERAGE
-	DEF:AXFR=bind.rrd:AXFR:AVERAGE
-	DEF:MX=bind.rrd:MX:AVERAGE
-	DEF:O=bind.rrd:O:AVERAGE
-	DEF:PTR=bind.rrd:PTR:AVERAGE
-	DEF:SOA=bind.rrd:SOA:AVERAGE
-	CDEF:A1=A,300,*
-	CDEF:ANY1=ANY,300,*
-	CDEF:AXFR1=AXFR,300,*
-	CDEF:MX1=MX,300,*
-	CDEF:O1=O,300,*
-	CDEF:PTR1=PTR,300,*
-	CDEF:SOA1=SOA,300,*
-	LINE2:A1#0000FF:A
-	LINE2:ANY1#FF0000:ANY
-	LINE2:AXFR1#00CC00:AXFR
-	LINE2:MX1#FF00FF:MX
-	LINE2:O1#555555:O
-	LINE2:PTR1#880000:PTR
-	LINE2:SOA1#000088:SOA
-	COMMENT:\n
-	GPRINT:A1:LAST:A     \: %5.1lf (cur) 
-	GPRINT:A1:MAX:A    \: %5.1lf (max) 
-	GPRINT:A1:MIN:A     \: %5.1lf (min) 
-	GPRINT:A1:AVERAGE:A     \: %5.1lf (avg)\n
-	GPRINT:ANY1:LAST:ANY   \: %5.1lf (cur) 
-	GPRINT:ANY1:MAX:ANY  \: %5.1lf (max) 
-	GPRINT:ANY1:MIN:ANY   \: %5.1lf (min) 
-	GPRINT:ANY1:AVERAGE:ANY   \: %5.1lf (avg)\n
-	GPRINT:AXFR1:LAST:AXFR  \: %5.1lf (cur) 
-	GPRINT:AXFR1:MAX:AXFR \: %5.1lf (max) 
-	GPRINT:AXFR1:MIN:AXFR  \: %5.1lf (min) 
-	GPRINT:AXFR1:AVERAGE:AXFR  \: %5.1lf (avg)\n
-	GPRINT:MX1:LAST:MX    \: %5.1lf (cur) 
-	GPRINT:MX1:MAX:MX   \: %5.1lf (max) 
-	GPRINT:MX1:MIN:MX    \: %5.1lf (min) 
-	GPRINT:MX1:AVERAGE:MX    \: %5.1lf (avg)\n
-	GPRINT:O1:LAST:O     \: %5.1lf (cur) 
-	GPRINT:O1:MAX:O    \: %5.1lf (max) 
-	GPRINT:O1:MIN:O     \: %5.1lf (min) 
-	GPRINT:O1:AVERAGE:O     \: %5.1lf (avg)\n
-	GPRINT:PTR1:LAST:PTR   \: %5.1lf (cur) 
-	GPRINT:PTR1:MAX:PTR  \: %5.1lf (max) 
-	GPRINT:PTR1:MIN:PTR   \: %5.1lf (min) 
-	GPRINT:PTR1:AVERAGE:PTR   \: %5.1lf (avg)\n
-	GPRINT:SOA1:LAST:SOA   \: %5.1lf (cur) 
-	GPRINT:SOA1:MAX:SOA  \: %5.1lf (max) 
-	GPRINT:SOA1:MIN:SOA   \: %5.1lf (min) 
-	GPRINT:SOA1:AVERAGE:SOA   \: %5.1lf (avg)\n
-
-[sendmail]
-	FNPATTERN sendmail.(.+).rrd
-	TITLE Sendmail Activity
-	YAXIS Messages
-	DEF:p@RRDIDX@IN=@RRDFN@:msgsfr:AVERAGE
-	DEF:p@RRDIDX@OUT=@RRDFN@:msgsto:AVERAGE
-	CDEF:p@RRDIDX@IN1=p@RRDIDX@IN,300,*
-	CDEF:p@RRDIDX@OUT1=p@RRDIDX@OUT,300,*
-	LINE1:p@RRDIDX@IN1#@COLOR@:@RRDPARAM@ IN
-	LINE2:p@RRDIDX@OUT1#@COLOR@:@RRDPARAM@ OUT
-	COMMENT:\n
-	GPRINT:p@RRDIDX@IN1:LAST:@RRDPARAM@ in   %5.1lf (cur)
-	GPRINT:p@RRDIDX@IN1:MAX: \: %5.1lf (max)
-	GPRINT:p@RRDIDX@IN1:MIN: \: %5.1lf (min)
-	GPRINT:p@RRDIDX@IN1:AVERAGE: \: %5.1lf (avg)
-	COMMENT:\n
-	GPRINT:p@RRDIDX@OUT1:LAST:@RRDPARAM@ out  %5.1lf (cur)
-	GPRINT:p@RRDIDX@OUT1:MAX: \: %5.1lf (max)
-	GPRINT:p@RRDIDX@OUT1:MIN: \: %5.1lf (min)
-	GPRINT:p@RRDIDX@OUT1:AVERAGE: \: %5.1lf (avg)\n
-	COMMENT:\n
-
-[sendmail1]
-        FNPATTERN sendmail.(.+).rrd
-        TITLE Sendmail Reject/Discards
-        YAXIS Messages
-        DEF:p@RRDIDX@IN=@RRDFN@:msgsrej:AVERAGE
-        DEF:p@RRDIDX@OUT=@RRDFN@:msgsdis:AVERAGE
-        CDEF:p@RRDIDX@IN1=p@RRDIDX@IN,300,*
-        CDEF:p@RRDIDX@OUT1=p@RRDIDX@OUT,300,*
-        LINE1:p@RRDIDX@IN1#@COLOR@:@RRDPARAM@ REJ
-        LINE2:p@RRDIDX@OUT1#@COLOR@:@RRDPARAM@ DIS
-        COMMENT:\n
-        GPRINT:p@RRDIDX@IN1:LAST:@RRDPARAM@ rej  %5.1lf (cur)
-        GPRINT:p@RRDIDX@IN1:MAX: \: %5.1lf (max)
-        GPRINT:p@RRDIDX@IN1:MIN: \: %5.1lf (min)
-        GPRINT:p@RRDIDX@IN1:AVERAGE: \: %5.1lf (avg)
-        COMMENT:\n
-        GPRINT:p@RRDIDX@OUT1:LAST:@RRDPARAM@ dis  %5.1lf (cur)
-        GPRINT:p@RRDIDX@OUT1:MAX: \: %5.1lf (max)
-        GPRINT:p@RRDIDX@OUT1:MIN: \: %5.1lf (min)
-        GPRINT:p@RRDIDX@OUT1:AVERAGE: \: %5.1lf (avg)\n
-        COMMENT:\n
-
-[mailq]
-	# This handles "mailq.rrd", "mailqin.rrd" and "mailqout.rrd"
-	FNPATTERN mailq(.+).rrd
-	TITLE Mail Queue Length
-	YAXIS Queue Length
-	DEF:mailq@RRDIDX@=@RRDFN@:mailq:AVERAGE
-	LINE2:mailq@RRDIDX@#@COLOR@:Queue Length @RRDPARAM@
-	COMMENT:\n
-	GPRINT:mailq@RRDIDX@:LAST: \: %5.1lf (cur)
-	GPRINT:mailq@RRDIDX@:MAX: \: %5.1lf (max)
-	GPRINT:mailq@RRDIDX@:MIN: \: %5.1lf (min)
-	GPRINT:mailq@RRDIDX@:AVERAGE: \: %5.1lf (avg)\n
-
-
-[iishealth]
-	# Based on the "IIShealth.zip" tool from deadcat
-	FNPATTERN iishealth.(.+).rrd
-	TITLE IIS Utilization
-	YAXIS #
-	# Yes, they really do call it "realmempct". Cut'n'paste programming.
-	DEF:p@RRDIDX@=@RRDFN@:realmempct:AVERAGE
-	LINE2:p@RRDIDX@#@COLOR@:@RRDPARAM@
-	-u 100
-	GPRINT:p@RRDIDX@:LAST: \: %5.1lf (cur)
-	GPRINT:p@RRDIDX@:MAX: \: %5.1lf (max)
-	GPRINT:p@RRDIDX@:MIN: \: %5.1lf (min)
-	GPRINT:p@RRDIDX@:AVERAGE: \: %5.1lf (avg)\n
-
-[temperature]
-	FNPATTERN temperature.(.+).rrd
-	TITLE Temperature
-	YAXIS Celsius
-	DEF:p@RRDIDX@=@RRDFN@:temperature:AVERAGE
-	LINE2:p@RRDIDX@#@COLOR@:@RRDPARAM@
-	GPRINT:p@RRDIDX@:LAST: \: %5.1lf (cur)
-	GPRINT:p@RRDIDX@:MAX: \: %5.1lf (max)
-	GPRINT:p@RRDIDX@:MIN: \: %5.1lf (min)
-	GPRINT:p@RRDIDX@:AVERAGE: \: %5.1lf (avg)\n
-
-# If you want your temperature graphs in Fahrenheit,
-# comment out the [temperature] section above, and 
-# uncomment this definition.
-#
-#[temperature]
-#	FNPATTERN temperature.(.+).rrd
-#	TITLE Temperature
-#	YAXIS Fahrenheit
-#	DEF:p@RRDIDX@=@RRDFN@:temperature:AVERAGE
-#	CDEF:tempf@RRDIDX@=9,5,/,p@RRDIDX@,*,32,+
-#	LINE2:tempf@RRDIDX@#@COLOR@:@RRDPARAM@
-#	GPRINT:tempf@RRDIDX@:LAST: \: %5.1lf (cur)
-#	GPRINT:tempf@RRDIDX@:MAX: \: %5.1lf (max)
-#	GPRINT:tempf@RRDIDX@:MIN: \: %5.1lf (min)
-#	GPRINT:tempf@RRDIDX@:AVERAGE: \: %5.1lf (avg)\n
-
-[citrix]
-	TITLE Citrix Users
-	YAXIS # Users
-	DEF:u=citrix.rrd:users:AVERAGE
-	LINE2:u#FF0000:Users
-	COMMENT:\n
-	GPRINT:u:LAST: \: %5.1lf (cur)
-	GPRINT:u:MAX: \: %5.1lf (max)
-	GPRINT:u:MIN: \: %5.1lf (min)
-	GPRINT:u:AVERAGE: \: %5.1lf (avg)\n
-
-[bbgen]
-	TITLE bbgen Runtime
-	YAXIS Seconds
-	DEF:rt=bbgen.rrd:runtime:AVERAGE
-	AREA:rt#00CCCC:Run Time
-	COMMENT:\n
-	GPRINT:rt:LAST: \: %5.1lf (cur)
-	GPRINT:rt:MAX: \: %5.1lf (max)
-	GPRINT:rt:MIN: \: %5.1lf (min)
-	GPRINT:rt:AVERAGE: \: %5.1lf (avg)\n
-
-[bbtest]
-	TITLE bbtest Run Time
-	YAXIS Seconds
-	DEF:rt=bbtest.rrd:runtime:AVERAGE
-	AREA:rt#00CCCC:Run Time
-	COMMENT:\n
-	GPRINT:rt:LAST: \: %5.1lf (cur)
-	GPRINT:rt:MAX: \: %5.1lf (max)
-	GPRINT:rt:MIN: \: %5.1lf (min)
-	GPRINT:rt:AVERAGE: \: %5.1lf (avg)\n
-
-[bbproxy]
-	TITLE bbproxy Average Queue Time
-	YAXIS Seconds
-	DEF:rt=bbproxy.rrd:runtime:AVERAGE
-	LINE2:rt#00CCCC:Queue Time
-	COMMENT:\n
-	GPRINT:rt:LAST: \: %5.1lf (cur)
-	GPRINT:rt:MAX: \: %5.1lf (max)
-	GPRINT:rt:MIN: \: %5.1lf (min)
-	GPRINT:rt:AVERAGE: \: %5.1lf (avg)\n
-
-[hobbitd]
-	TITLE hobbitd Incoming Messages
-	YAXIS Messages
-	DEF:in=hobbitd.rrd:inmessages:AVERAGE
-	LINE2:in#00CCCC:Incoming messages
-	COMMENT:\n
-	GPRINT:in:LAST: \: %5.1lf (cur)
-	GPRINT:in:MAX: \: %5.1lf (max)
-	GPRINT:in:MIN: \: %5.1lf (min)
-	GPRINT:in:AVERAGE: \: %5.1lf (avg)\n
-
-[mrtg]
-	FNPATTERN mrtg.*\.(.+).rrd
-	TITLE Network Traffic (MRTG)
-	YAXIS Bits/second
-	DEF:inbytes@RRDIDX@=@RRDFN@:ds0:AVERAGE
-	CDEF:in@RRDIDX@=inbytes@RRDIDX@,8,*
-	DEF:outbytes@RRDIDX@=@RRDFN@:ds1:AVERAGE
-	CDEF:out@RRDIDX@=outbytes@RRDIDX@,8,*
-	LINE2:in@RRDIDX@#@COLOR@:@RRDPARAM@  inbound
-	GPRINT:in@RRDIDX@:LAST: \: %10.1lf (cur)
-	GPRINT:in@RRDIDX@:MAX: \: %10.1lf (max)
-	GPRINT:in@RRDIDX@:MIN: \: %10.1lf (min)
-	GPRINT:in@RRDIDX@:AVERAGE: \: %10.1lf (avg)\n
-	LINE2:out@RRDIDX@#@COLOR@:@RRDPARAM@ outbound
-	GPRINT:out@RRDIDX@:LAST: \: %10.1lf (cur)
-	GPRINT:out@RRDIDX@:MAX: \: %10.1lf (max)
-	GPRINT:out@RRDIDX@:MIN: \: %10.1lf (min)
-	GPRINT:out@RRDIDX@:AVERAGE: \: %10.1lf (avg)\n
-
-[mysqlslow]
-	DEF:slow=mysql.rrd:Slowqueries:AVERAGE
-	TITLE MySQL Slow Queries
-	YAXIS #
-	LINE2:slow#00CCCC:Slow Queries
-	COMMENT:\n
-	GPRINT:slow:LAST: \: %5.1lf (cur)
-	GPRINT:slow:MAX: \: %5.1lf (max)
-	GPRINT:slow:MIN: \: %5.1lf (min)
-	GPRINT:slow:AVERAGE: \: %5.1lf (avg)\n
-
-[mysqlthread]
-	DEF:threads=mysql.rrd:Threads:AVERAGE
-	TITLE MySQL Active Threads
-	YAXIS #
-	AREA:threads#00CCCC:Threads
-	COMMENT:\n
-	GPRINT:threads:LAST: \: %5.1lf (cur)
-	GPRINT:threads:MAX: \: %5.1lf (max)
-	GPRINT:threads:MIN: \: %5.1lf (min)
-	GPRINT:threads:AVERAGE: \: %5.1lf (avg)\n
-
-[ifstat]
-	FNPATTERN ifstat.(.+).rrd
-	TITLE Network Traffic
-	YAXIS Bits/second
-	DEF:inbytes@RRDIDX@=@RRDFN@:bytesReceived:AVERAGE
-	CDEF:in@RRDIDX@=inbytes@RRDIDX@,8,*
-	DEF:outbytes@RRDIDX@=@RRDFN@:bytesSent:AVERAGE
-	CDEF:out@RRDIDX@=outbytes@RRDIDX@,8,*
-	LINE2:in@RRDIDX@#@COLOR@:@RRDPARAM@  inbound
-	GPRINT:in@RRDIDX@:LAST: \: %10.1lf (cur)
-	GPRINT:in@RRDIDX@:MAX: \: %10.1lf (max)
-	GPRINT:in@RRDIDX@:MIN: \: %10.1lf (min)
-	GPRINT:in@RRDIDX@:AVERAGE: \: %10.1lf (avg)\n
-	LINE2:out@RRDIDX@#@COLOR@:@RRDPARAM@ outbound
-	GPRINT:out@RRDIDX@:LAST: \: %10.1lf (cur)
-	GPRINT:out@RRDIDX@:MAX: \: %10.1lf (max)
-	GPRINT:out@RRDIDX@:MIN: \: %10.1lf (min)
-	GPRINT:out@RRDIDX@:AVERAGE: \: %10.1lf (avg)\n
-
-[files]
-	FNPATTERN filesizes.(.+).rrd
-	TITLE File/Directory sizes
-	YAXIS KB
-	DEF:sz@RRDIDX@=@RRDFN@:size:AVERAGE
-	LINE2:sz@RRDIDX@#@COLOR@:@RRDPARAM@
-	GPRINT:sz@RRDIDX@:LAST: \: %10.1lf (cur)
-	GPRINT:sz@RRDIDX@:MAX: \: %10.1lf (max)
-	GPRINT:sz@RRDIDX@:MIN: \: %10.1lf (min)
-	GPRINT:sz@RRDIDX@:AVERAGE: \: %10.1lf (avg)\n
-
-[processes]
-	FNPATTERN processes.(.+).rrd
-	TITLE Process counts
-	YAXIS #
-	DEF:cnt@RRDIDX@=@RRDFN@:count:AVERAGE
-	LINE2:cnt@RRDIDX@#@COLOR@:@RRDPARAM@
-	GPRINT:cnt@RRDIDX@:LAST: \: %10.1lf (cur)
-	GPRINT:cnt@RRDIDX@:MAX: \: %10.1lf (max)
-	GPRINT:cnt@RRDIDX@:MIN: \: %10.1lf (min)
-	GPRINT:cnt@RRDIDX@:AVERAGE: \: %10.1lf (avg)\n
-
-[ports]
-	FNPATTERN ports.(.+).rrd
-	TITLE Network port counts
-	YAXIS #
-	DEF:cnt@RRDIDX@=@RRDFN@:count:AVERAGE
-	LINE2:cnt@RRDIDX@#@COLOR@:@RRDPARAM@
-	GPRINT:cnt@RRDIDX@:LAST: \: %10.1lf (cur)
-	GPRINT:cnt@RRDIDX@:MAX: \: %10.1lf (max)
-	GPRINT:cnt@RRDIDX@:MIN: \: %10.1lf (min)
-	GPRINT:cnt@RRDIDX@:AVERAGE: \: %10.1lf (avg)\n
-
-[lines]
-	FNPATTERN lines.(.+).rrd
-	TITLE Logfile linecounts
-	YAXIS #
-	DEF:cnt@RRDIDX@=@RRDFN@:count:AVERAGE
-	LINE2:cnt@RRDIDX@#@COLOR@:@RRDPARAM@
-	GPRINT:cnt@RRDIDX@:LAST: %6.1lf (cur) \:
-	GPRINT:cnt@RRDIDX@:MAX: %6.1lf (max) \:
-	GPRINT:cnt@RRDIDX@:MIN: %6.1lf (min) \:
-	GPRINT:cnt@RRDIDX@:AVERAGE: %6.1lf (avg)\n
-
-[storage]
-	TITLE Storage Groups 
-	YAXIS  recordings
-	DEF:storage1=storage.rrd:rectvtotal:AVERAGE
-	LINE2:storage1#00CCCC:current recorded
-
-	DEF:rectime=storage.rrd:rectvtime:AVERAGE
-	LINE2:rectime#000000:current recorded time
-
-	DEF:livetime=storage.rrd:livetvtime:AVERAGE
-	LINE2:livetime#00CC11:current live  time
-
-
-[memmbe]
-	TITLE Memory usage for MythBackend
-	YAXIS mythbackend
-	DEF:vmsize=memmbe.rrd:VmSize:AVERAGE
-	LINE2:vmsize#00CCCC:vmsize
-
-	DEF:vmpeak=memmbe.rrd:VmPeak:AVERAGE
-	LINE2:vmpeak#000000:vmpeak
-
-	DEF:vmrss=memmbe.rrd:VmRSS:AVERAGE
-	LINE2:vmrss#00CC11:vmrss
-
-[memmfe]
-	TITLE Memory usage for MythFrontend
-	YAXIS mythfrontend
-	DEF:vmsize=memmfe.rrd:VmSize:AVERAGE
-	LINE2:vmsize#00CCCC:vmsize
-
-	DEF:vmpeak=memmfe.rrd:VmPeak:AVERAGE
-	LINE2:vmpeak#000000:vmpeak
-
-	DEF:vmrss=memmfe.rrd:VmRSS:AVERAGE
-	LINE2:vmrss#00CC11:vmrss
diff --git a/abs/mv-core/hobbitmon/diffs/hobbitgraph.cfg.diff b/abs/mv-core/hobbitmon/diffs/hobbitgraph.cfg.diff
deleted file mode 100644
index 1ca4caf..0000000
--- a/abs/mv-core/hobbitmon/diffs/hobbitgraph.cfg.diff
+++ /dev/null
@@ -1,42 +0,0 @@
---- hobbitgraph.cfg.orig	2008-01-08 09:24:59.000000000 -0600
-+++ hobbitgraph.cfg	2008-01-08 09:12:51.000000000 -0600
-@@ -1135,4 +1135,39 @@
- 	GPRINT:cnt@RRDIDX@:MIN: %6.1lf (min) \:
- 	GPRINT:cnt@RRDIDX@:AVERAGE: %6.1lf (avg)\n
- 
-+[storage]
-+	TITLE Storage Groups 
-+	YAXIS  recordings
-+	DEF:storage1=storage.rrd:rectvtotal:AVERAGE
-+	LINE2:storage1#00CCCC:current recorded
- 
-+	DEF:rectime=storage.rrd:rectvtime:AVERAGE
-+	LINE2:rectime#000000:current recorded time
-+
-+	DEF:livetime=storage.rrd:livetvtime:AVERAGE
-+	LINE2:livetime#00CC11:current live  time
-+
-+
-+[memmbe]
-+	TITLE Memory usage for MythBackend
-+	YAXIS mythbackend
-+	DEF:vmsize=memmbe.rrd:VmSize:AVERAGE
-+	LINE2:vmsize#00CCCC:vmsize
-+
-+	DEF:vmpeak=memmbe.rrd:VmPeak:AVERAGE
-+	LINE2:vmpeak#000000:vmpeak
-+
-+	DEF:vmrss=memmbe.rrd:VmRSS:AVERAGE
-+	LINE2:vmrss#00CC11:vmrss
-+
-+[memmfe]
-+	TITLE Memory usage for MythFrontend
-+	YAXIS mythfrontend
-+	DEF:vmsize=memmfe.rrd:VmSize:AVERAGE
-+	LINE2:vmsize#00CCCC:vmsize
-+
-+	DEF:vmpeak=memmfe.rrd:VmPeak:AVERAGE
-+	LINE2:vmpeak#000000:vmpeak
-+
-+	DEF:vmrss=memmfe.rrd:VmRSS:AVERAGE
-+	LINE2:vmrss#00CC11:vmrss
diff --git a/abs/mv-core/hobbitmon/diffs/hobbitgraph.cfg.orig b/abs/mv-core/hobbitmon/diffs/hobbitgraph.cfg.orig
deleted file mode 100644
index e60a2a5..0000000
--- a/abs/mv-core/hobbitmon/diffs/hobbitgraph.cfg.orig
+++ /dev/null
@@ -1,1138 +0,0 @@
-# This file defines how RRD graphs are generated by the hobbitgraph CGI.
-#
-# Each section begins with a "[SERVICE]" indicator - this is the name passed
-# to hobbitgraph.cgi?host=foo&service=SERVICE
-#
-# A graph has a TITLE and a YAXIS setting - these are texts shown as the
-# title of the graph, and the YAXIS heading respectively. (The X-axis is
-# always time-based).
-#
-# If a fixed set of RRD files are used for the graph, you just write those
-# in the RRDtool definitions. 
-#
-# For graphs that use multiple RRD files as input, you specify a filename
-# pattern in the FNPATTERN statement, and optionally a pattern of files
-# to exclude from the graph with EXFNPATTERN (see "[tcp]" for an example).
-# When FNPATTERN is used, you can use "@RRDFN@" in the RRDtool definitions
-# to pick up each filename. "@RRDIDX@" is an index (starting at 0) for each
-# file in the set. "@RRDPARAM@" contains the first word extracted from the
-# pattern of files (see e.g. "[memory]" how this is used). "@COLOR@" picks
-# a new color for each graph automatically.
-#
-# The remainder of the lines in each definition are passed directly to the
-# RRDtool rrd_graph() routine.
-#
-# Most of these RRD definitions are from the larrd-grapher.cgi from LARRD 0.43c.
-
-[la]
-	TITLE CPU Load
-	YAXIS Load
-	DEF:avg=la.rrd:la:AVERAGE
-	CDEF:la=avg,100,/
-	AREA:la#00CC00:CPU Load Average
-	-u 1.0
-	GPRINT:la:LAST: \: %5.1lf (cur)
-	GPRINT:la:MAX: \: %5.1lf (max)
-	GPRINT:la:MIN: \: %5.1lf (min)
-	GPRINT:la:AVERAGE: \: %5.1lf (avg)\n
-
-[la-multi]
-	TITLE Multi-host CPU Load
-	YAXIS Load
-	FNPATTERN la.rrd
-	DEF:avg@RRDIDX@=@RRDFN@:la:AVERAGE
-	CDEF:la@RRDIDX@=avg@RRDIDX@,100,/
-	LINE2:la@RRDIDX@#@COLOR@:@RRDPARAM@
-	-u 1.0
-	GPRINT:la@RRDIDX@:LAST: \: %5.1lf (cur)
-	GPRINT:la@RRDIDX@:MAX: \: %5.1lf (max)
-	GPRINT:la@RRDIDX@:MIN: \: %5.1lf (min)
-	GPRINT:la@RRDIDX@:AVERAGE: \: %5.1lf (avg)\n
-
-[la1]
-	TITLE CPU Utilitization
-	YAXIS % Used
-	-u 100
-	-r
-	DEF:cpu_idl=vmstat.rrd:cpu_idl:AVERAGE
-	CDEF:pbusy=100,cpu_idl,-
-	LINE2:pbusy#00CC00:% CPU busy
-	GPRINT:pbusy:LAST: \: %5.1lf (cur)
-	GPRINT:pbusy:MAX: \: %5.1lf (max)
-	GPRINT:pbusy:MIN: \: %5.1lf (min)
-	GPRINT:pbusy:AVERAGE: \: %5.1lf (avg)\n
-
-[la1-multi]
-	TITLE Multi-host CPU Utilitization
-	YAXIS % Used
-	FNPATTERN vmstat.rrd
-	-u 100
-	-r
-	DEF:cpu_idl@RRDIDX@=@RRDFN@:cpu_idl:AVERAGE
-	CDEF:pbusy@RRDIDX@=100,cpu_idl@RRDIDX@,-
-	LINE2:pbusy@RRDIDX@#@COLOR@:@RRDPARAM@
-	GPRINT:pbusy@RRDIDX@:LAST: \: %5.1lf (cur)
-	GPRINT:pbusy@RRDIDX@:MAX: \: %5.1lf (max)
-	GPRINT:pbusy@RRDIDX@:MIN: \: %5.1lf (min)
-	GPRINT:pbusy@RRDIDX@:AVERAGE: \: %5.1lf (avg)\n
-
-[clock]
-	TITLE Clock offset
-	YAXIS Seconds
-	DEF:offset=clock.rrd:la:AVERAGE
-	LINE2:offset#00CC00:Seconds
-	GPRINT:offset:LAST: \: %5.1lf (cur)
-	GPRINT:offset:MAX: \: %5.1lf (max)
-	GPRINT:offset:MIN: \: %5.1lf (min)
-	GPRINT:offset:AVERAGE: \: %5.1lf (avg)\n
-
-[disk]
-	FNPATTERN disk(.*).rrd
-	TITLE Disk Utilization
-	YAXIS % Full
-	DEF:p@RRDIDX@=@RRDFN@:pct:AVERAGE
-	LINE2:p@RRDIDX@#@COLOR@:@RRDPARAM@
-	-u 100
-	-l 0
-	GPRINT:p@RRDIDX@:LAST: \: %5.1lf (cur)
-	GPRINT:p@RRDIDX@:MAX: \: %5.1lf (max)
-	GPRINT:p@RRDIDX@:MIN: \: %5.1lf (min)
-	GPRINT:p@RRDIDX@:AVERAGE: \: %5.1lf (avg)\n
-
-[disk1]
-	FNPATTERN disk(.*).rrd
-	TITLE Disk Utilization
-	YAXIS Used
-	DEF:p@RRDIDX@=@RRDFN@:used:AVERAGE
-	CDEF:p@RRDIDX@t=p@RRDIDX@,1024,*
-	LINE2:p@RRDIDX@t#@COLOR@:@RRDPARAM@
-	-l 0
-	GPRINT:p@RRDIDX@:LAST: \: %5.1lf KB (cur)
-	GPRINT:p@RRDIDX@:MAX: \: %5.1lf KB (max)
-	GPRINT:p@RRDIDX@:MIN: \: %5.1lf KB (min)
-	GPRINT:p@RRDIDX@:AVERAGE: \: %5.1lf KB (avg)\n
-
-# The qtree graphs are based on the qtree report from filerstats2bb.pl
-# These handle NetApp storage devices.
-[qtree]
-	FNPATTERN qtree(.+).rrd
-	TITLE Qtree Utilization
-	YAXIS % Full
-	DEF:p@RRDIDX@=@RRDFN@:pct:AVERAGE
-	LINE2:p@RRDIDX@#@COLOR@:@RRDPARAM@
-	-u 100
-	-l 0
-	GPRINT:p@RRDIDX@:LAST: \: %5.1lf (cur)
-	GPRINT:p@RRDIDX@:MAX: \: %5.1lf (max)
-	GPRINT:p@RRDIDX@:MIN: \: %5.1lf (min)
-	GPRINT:p@RRDIDX@:AVERAGE: \: %5.1lf (avg)\n
-
-# The qtree graphs are based on the inode report from filerstats2bb.pl
-# These handle NetApp storage devices
-# An enhanced disk script that just runs "df -i" could probably get the
-# same data.
-[inode]
-	FNPATTERN inode(.+).rrd
-	TITLE inode Utilization
-	YAXIS % Full
-	DEF:p@RRDIDX@=@RRDFN@:pct:AVERAGE
-	LINE2:p@RRDIDX@#@COLOR@:@RRDPARAM@
-	-u 100
-	-l 0
-	GPRINT:p@RRDIDX@:LAST: \: %5.1lf (cur)
-	GPRINT:p@RRDIDX@:MAX: \: %5.1lf (max)
-	GPRINT:p@RRDIDX@:MIN: \: %5.1lf (min)
-	GPRINT:p@RRDIDX@:AVERAGE: \: %5.1lf (avg)\n
-
-[memory]
-	FNPATTERN memory.(.+).rrd
-	TITLE Memory Utilization
-	YAXIS % Used
-	DEF:p@RRDIDX@=@RRDFN@:realmempct:AVERAGE
-	LINE2:p@RRDIDX@#@COLOR@:@RRDPARAM@
-	-u 100
-	-b 1024
-	GPRINT:p@RRDIDX@:LAST: \: %5.1lf (cur)
-	GPRINT:p@RRDIDX@:MAX: \: %5.1lf (max)
-	GPRINT:p@RRDIDX@:MIN: \: %5.1lf (min)
-	GPRINT:p@RRDIDX@:AVERAGE: \: %5.1lf (avg)\n
-
-[ram]
-	TITLE RAM Utilization
-	YAXIS % Used
-	DEF:p=memory.real.rrd:realmempct:AVERAGE
-	LINE2:p#0000FF:% RAM used
-	-u 100
-	-b 1024
-	GPRINT:p:LAST: \: %5.1lf (cur)
-	GPRINT:p:MAX: \: %5.1lf (max)
-	GPRINT:p:MIN: \: %5.1lf (min)
-	GPRINT:p:AVERAGE: \: %5.1lf (avg)\n
-
-[ram-multi]
-	TITLE Multi-host RAM Utilization
-	FNPATTERN memory.real.rrd
-	YAXIS % Used
-	DEF:p@RRDIDX@=@RRDFN@:realmempct:AVERAGE
-	LINE2:p@RRDIDX@#@COLOR@:@RRDPARAM@
-	-u 100
-	-b 1024
-	GPRINT:p@RRDIDX@:LAST: \: %5.1lf (cur)
-	GPRINT:p@RRDIDX@:MAX: \: %5.1lf (max)
-	GPRINT:p@RRDIDX@:MIN: \: %5.1lf (min)
-	GPRINT:p@RRDIDX@:AVERAGE: \: %5.1lf (avg)\n
-
-[swap]
-	TITLE Swap Utilization
-	YAXIS % Used
-	DEF:p=memory.swap.rrd:realmempct:AVERAGE
-	LINE2:p#0000FF:% Swap used
-	-u 100
-	-b 1024
-	GPRINT:p:LAST: \: %5.1lf (cur)
-	GPRINT:p:MAX: \: %5.1lf (max)
-	GPRINT:p:MIN: \: %5.1lf (min)
-	GPRINT:p:AVERAGE: \: %5.1lf (avg)\n
-
-[swap-multi]
-	TITLE Multi-host Swap Utilization
-	FNPATTERN memory.swap.rrd
-	YAXIS % Used
-	DEF:p@RRDIDX@=@RRDFN@:realmempct:AVERAGE
-	LINE2:p@RRDIDX@#@COLOR@:@RRDPARAM@
-	-u 100
-	-b 1024
-	GPRINT:p@RRDIDX@:LAST: \: %5.1lf (cur)
-	GPRINT:p@RRDIDX@:MAX: \: %5.1lf (max)
-	GPRINT:p@RRDIDX@:MIN: \: %5.1lf (min)
-	GPRINT:p@RRDIDX@:AVERAGE: \: %5.1lf (avg)\n
-
-[mem]
-	TITLE Actual Memory Utilization
-	YAXIS % Used
-	DEF:p=memory.actual.rrd:realmempct:AVERAGE
-	LINE2:p#0000FF:% Actual memory used
-	-u 100
-	-b 1024
-	GPRINT:p:LAST: \: %5.1lf (cur)
-	GPRINT:p:MAX: \: %5.1lf (max)
-	GPRINT:p:MIN: \: %5.1lf (min)
-	GPRINT:p:AVERAGE: \: %5.1lf (avg)\n
-
-[mem-multi]
-	TITLE Multi-host Actual Memory Utilization
-	FNPATTERN memory.actual.rrd
-	YAXIS % Used
-	DEF:p@RRDIDX@=@RRDFN@:realmempct:AVERAGE
-	LINE2:p@RRDIDX@#@COLOR@:@RRDPARAM@
-	-u 100
-	-b 1024
-	GPRINT:p@RRDIDX@:LAST: \: %5.1lf (cur)
-	GPRINT:p@RRDIDX@:MAX: \: %5.1lf (max)
-	GPRINT:p@RRDIDX@:MIN: \: %5.1lf (min)
-	GPRINT:p@RRDIDX@:AVERAGE: \: %5.1lf (avg)\n
-
-[users]
-	TITLE Users and Processes
-	YAXIS #
-	DEF:p=procs.rrd:la:AVERAGE
-	DEF:u=users.rrd:la:AVERAGE
-	AREA:p#00CC00:Processes
-	LINE1:u#000099:Users
-	COMMENT:\n
-	GPRINT:p:LAST:Processes   \: %5.1lf%s (cur)
-	GPRINT:p:MAX: \: %5.1lf%s (max)
-	GPRINT:p:MIN: \: %5.1lf%s (min)
-	GPRINT:p:AVERAGE: \: %5.1lf%s (avg)\n
-	GPRINT:u:LAST:Users       \: %5.1lf%s (cur)
-	GPRINT:u:MAX: \: %5.1lf%s (max)
-	GPRINT:u:MIN: \: %5.1lf%s (min)
-	GPRINT:u:AVERAGE: \: %5.1lf%s (avg)\n
-
-[users-multi]
-	TITLE Multi-host users
-	FNPATTERN users.rrd
-	YAXIS #
-	DEF:u@RRDIDX@=@RRDFN@:la:AVERAGE
-	LINE2:u@RRDIDX@#@COLOR@:@RRDPARAM@
-	COMMENT:\n
-	GPRINT:u@RRDIDX@:LAST:Users       \: %5.1lf%s (cur)
-	GPRINT:u@RRDIDX@:MAX: \: %5.1lf%s (max)
-	GPRINT:u@RRDIDX@:MIN: \: %5.1lf%s (min)
-	GPRINT:u@RRDIDX@:AVERAGE: \: %5.1lf%s (avg)\n
-
-[tcp]
-	# TCP tests - include all, except the HTTP tests as they tend to have
-	# much longer response times than the normal tcp tests.
-	FNPATTERN tcp.(.+).rrd
-	EXFNPATTERN tcp.http.(.+).rrd
-	TITLE TCP Connection Times
-	YAXIS Seconds
-	DEF:p@RRDIDX@=@RRDFN@:sec:AVERAGE
-	LINE2:p@RRDIDX@#@COLOR@:@RRDPARAM@
-	GPRINT:p@RRDIDX@:LAST: \: %5.1lf%s (cur)
-	GPRINT:p@RRDIDX@:MAX: \: %5.1lf%s (max)
-	GPRINT:p@RRDIDX@:MIN: \: %5.1lf%s (min)
-	GPRINT:p@RRDIDX@:AVERAGE: \: %5.1lf%s (avg)\n
-
-[http]
-	FNPATTERN tcp.http.(.+).rrd
-	TITLE HTTP Response Times
-	YAXIS Seconds
-	DEF:p@RRDIDX@=@RRDFN@:sec:AVERAGE
-	LINE2:p@RRDIDX@#@COLOR@:@RRDPARAM@
-	GPRINT:p@RRDIDX@:LAST: \: %5.1lf%s (cur)
-	GPRINT:p@RRDIDX@:MAX: \: %5.1lf%s (max)
-	GPRINT:p@RRDIDX@:MIN: \: %5.1lf%s (min)
-	GPRINT:p@RRDIDX@:AVERAGE: \: %5.1lf%s (avg)\n
-
-[conn-multi]
-	FNPATTERN tcp.conn.rrd
-	TITLE PING Round-trip time
-	YAXIS Seconds
-	DEF:p@RRDIDX@=@RRDFN@:sec:AVERAGE
-	LINE2:p@RRDIDX@#@COLOR@:@RRDPARAM@
-	GPRINT:p@RRDIDX@:LAST: \: %5.1lf%s (cur)
-	GPRINT:p@RRDIDX@:MAX: \: %5.1lf%s (max)
-	GPRINT:p@RRDIDX@:MIN: \: %5.1lf%s (min)
-	GPRINT:p@RRDIDX@:AVERAGE: \: %5.1lf%s (avg)\n
-
-[ntpstat]
-	TITLE NTP accuracy
-	YAXIS Offset (ms)
-	DEF:u=ntpstat.rrd:offsetms:AVERAGE
-	LINE2:u#FF0000:Offset (ms)
-	COMMENT:\n
-	GPRINT:u:LAST: \: %5.2lf ms (cur)\n
-	GPRINT:u:MAX: \: %5.2lf ms (max)\n
-	GPRINT:u:MIN: \: %5.2lf ms (min)\n
-	GPRINT:u:AVERAGE: \: %5.2lf ms (avg)\n
-
-[vmstat]
-	TITLE CPU Utilization
-	YAXIS % Load
-	-u 100
-	-r
-	DEF:cpu_idl=vmstat.rrd:cpu_idl:AVERAGE
-	DEF:cpu_usr=vmstat.rrd:cpu_usr:AVERAGE
-	DEF:cpu_sys=vmstat.rrd:cpu_sys:AVERAGE
-	AREA:cpu_sys#FF0000:System
-	STACK:cpu_usr#FFFF00:User
-	STACK:cpu_idl#00FF00:Idle
-	COMMENT:\n
-	GPRINT:cpu_sys:LAST:System  \: %5.1lf (cur)
-	GPRINT:cpu_sys:MAX: \: %5.1lf (max)
-	GPRINT:cpu_sys:MIN: \: %5.1lf (min)
-	GPRINT:cpu_sys:AVERAGE: \: %5.1lf (avg)\n
-	GPRINT:cpu_usr:LAST:User    \: %5.1lf (cur)
-	GPRINT:cpu_usr:MAX: \: %5.1lf (max)
-	GPRINT:cpu_usr:MIN: \: %5.1lf (min)
-	GPRINT:cpu_usr:AVERAGE: \: %5.1lf (avg)\n
-	GPRINT:cpu_idl:LAST:Idle    \: %5.1lf (cur)
-	GPRINT:cpu_idl:MAX: \: %5.1lf (max)
-	GPRINT:cpu_idl:MIN: \: %5.1lf (min)
-	GPRINT:cpu_idl:AVERAGE: \: %5.1lf (avg)\n
-
-[vmstat1]
-	TITLE CPU Utilization
-	YAXIS % Load
-	-u 100
-	-r
-	DEF:cpu_idl=vmstat.rrd:cpu_idl:AVERAGE
-	DEF:cpu_usr=vmstat.rrd:cpu_usr:AVERAGE
-	DEF:cpu_sys=vmstat.rrd:cpu_sys:AVERAGE
-	DEF:cpu_wait=vmstat.rrd:cpu_wait:AVERAGE
-	AREA:cpu_sys#FF0000:System
-	STACK:cpu_wait#774400:I/O wait
-	STACK:cpu_usr#FFFF00:User
-	STACK:cpu_idl#00FF00:Idle
-	COMMENT:\n
-	GPRINT:cpu_sys:LAST:System  \: %5.1lf (cur)
-	GPRINT:cpu_sys:MAX: \: %5.1lf (max)
-	GPRINT:cpu_sys:MIN: \: %5.1lf (min)
-	GPRINT:cpu_sys:AVERAGE: \: %5.1lf (avg)\n
-	GPRINT:cpu_wait:LAST:I/O Wait\: %5.1lf (cur)
-	GPRINT:cpu_wait:MAX: \: %5.1lf (max)
-	GPRINT:cpu_wait:MIN: \: %5.1lf (min)
-	GPRINT:cpu_wait:AVERAGE: \: %5.1lf (avg)\n
-	GPRINT:cpu_usr:LAST:User    \: %5.1lf (cur)
-	GPRINT:cpu_usr:MAX: \: %5.1lf (max)
-	GPRINT:cpu_usr:MIN: \: %5.1lf (min)
-	GPRINT:cpu_usr:AVERAGE: \: %5.1lf (avg)\n
-	GPRINT:cpu_idl:LAST:Idle    \: %5.1lf (cur)
-	GPRINT:cpu_idl:MAX: \: %5.1lf (max)
-	GPRINT:cpu_idl:MIN: \: %5.1lf (min)
-	GPRINT:cpu_idl:AVERAGE: \: %5.1lf (avg)\n
-
-[vmstat2]
-	TITLE CPU Utilization
-	YAXIS % Load
-	-u 1.0
-	DEF:avg=la.rrd:la:AVERAGE
-	CDEF:la=avg,100,/
-	DEF:cpu_idl=vmstat.rrd:cpu_idl:AVERAGE
-	CDEF:cpu_idl2=cpu_idl,100,/
-	DEF:cpu_usr=vmstat.rrd:cpu_usr:AVERAGE
-	CDEF:cpu_usr2=cpu_usr,100,/
-	DEF:cpu_sys=vmstat.rrd:cpu_sys:AVERAGE
-	CDEF:cpu_sys2=cpu_sys,100,/
-	AREA:cpu_sys2#FF0000:System
-	STACK:cpu_usr2#FFFF00:User
-	STACK:cpu_idl2#00FF00:Idle
-	LINE1:la#000099:CPU Load Average
-	COMMENT:\n
-	GPRINT:cpu_sys2:LAST:System           \: %5.1lf (cur)
-	GPRINT:cpu_sys2:MAX: \: %5.1lf (max)
-	GPRINT:cpu_sys2:MIN: \: %5.1lf (min)
-	GPRINT:cpu_sys2:AVERAGE: \: %5.1lf (avg)\n
-	GPRINT:cpu_usr2:LAST:User             \: %5.1lf (cur)
-	GPRINT:cpu_usr2:MAX: \: %5.1lf (max)
-	GPRINT:cpu_usr2:MIN: \: %5.1lf (min)
-	GPRINT:cpu_usr2:AVERAGE: \: %5.1lf (avg)\n
-	GPRINT:cpu_idl2:LAST:Idle             \: %5.1lf (cur)
-	GPRINT:cpu_idl2:MAX: \: %5.1lf (max)
-	GPRINT:cpu_idl2:MIN: \: %5.1lf (min)
-	GPRINT:cpu_idl2:AVERAGE: \: %5.1lf (avg)\n
-	GPRINT:la:LAST:CPU Load Average \: %5.1lf (cur)
-	GPRINT:la:MAX: \: %5.1lf (max)
-	GPRINT:la:MIN: \: %5.1lf (min)
-	GPRINT:la:AVERAGE: \: %5.1lf (avg)\n
-
-[vmstat3]
-	TITLE Interrupts and Context Switches
-	YAXIS Average Events/sec
-	DEF:int=vmstat.rrd:cpu_int:AVERAGE
-	DEF:csw=vmstat.rrd:cpu_csw:AVERAGE
-	LINE2:int#0000ff:Interrupts
-	LINE2:csw#00FF00:Context Switches
-	COMMENT:\n
-	GPRINT:int:LAST:Interrupts        \: %5.1lf%s (cur)
-	GPRINT:int:MAX: \: %5.1lf%s (max)
-	GPRINT:int:MIN: \: %5.1lf%s (min)
-	GPRINT:int:AVERAGE: \: %5.1lf%s (avg)\n
-	GPRINT:csw:LAST:Context Switches  \: %5.1lf%s (cur)
-	GPRINT:csw:MAX: \: %5.1lf%s (max)
-	GPRINT:csw:MIN: \: %5.1lf%s (min)
-	GPRINT:csw:AVERAGE: \: %5.1lf%s (avg)\n
-
-[vmstat4]
-	TITLE Swap Activity
-	YAXIS Average kB/s
-	-b 1024
-	DEF:si=vmstat.rrd:mem_si:AVERAGE
-	DEF:so=vmstat.rrd:mem_so:AVERAGE
-	LINE2:si#0000ff:Memory Swapped from Disk
-	LINE2:so#00FF00:Memory Swapped to Disk
-	COMMENT:\n
-	GPRINT:si:LAST:Memory Swapped from Disk  \: %5.1lf (cur)
-	GPRINT:si:MAX: \: %5.1lf (max)
-	GPRINT:si:MIN: \: %5.1lf (min)
-	GPRINT:si:AVERAGE: \: %5.1lf%s (avg)\n
-	GPRINT:si:LAST:Memory Swapped to Disk    \: %5.1lf (cur)
-	GPRINT:si:MAX: \: %5.1lf (max)
-	GPRINT:si:MIN: \: %5.1lf (min)
-	GPRINT:si:AVERAGE: \: %5.1lf%s (avg)\n
-
-[vmstat5]
-	TITLE Block I/O
-	YAXIS Average blocks/s
-	DEF:bi=vmstat.rrd:dsk_bi:AVERAGE
-	DEF:bo=vmstat.rrd:dsk_bo:AVERAGE
-	LINE2:bi#0000FF:Blocks sent to a block device
-	LINE2:bo#00FF00:Blocks received from a block device
-	COMMENT:\n
-	GPRINT:bi:LAST:Blocks sent to a block device        \: %5.1lf (cur)
-	GPRINT:bi:MAX: \: %5.1lf (max)
-	GPRINT:bi:MIN: \: %5.1lf (min)
-	GPRINT:bi:AVERAGE: \: %5.1lf (avg)\n
-	GPRINT:bo:LAST:Blocks received from a block device  \: %5.1lf (cur)
-	GPRINT:bo:MAX: \: %5.1lf (max)
-	GPRINT:bo:MIN: \: %5.1lf (min)
-	GPRINT:bo:AVERAGE: \: %5.1lf (avg)\n
-
-[vmstat6]
-	# This graph only works on some OS'es (Solaris)
-	TITLE Memory Utilization
-	YAXIS Size kB
-	-b 1024
-	DEF:free=vmstat.rrd:mem_free:AVERAGE
-	CDEF:fr=free,1024,*
-	DEF:swap=vmstat.rrd:mem_swap:AVERAGE
-	CDEF:sw=swap,1024,*
-	LINE2:fr#0000ff:Size of the free list
-	LINE2:sw#00FF00:Swap space currently available
-	COMMENT:\n
-	GPRINT:fr:LAST:Size of the free list           \: %5.1lf%s (cur)
-	GPRINT:fr:MAX: \: %5.1lf%s (max)
-	GPRINT:fr:MIN: \: %5.1lf%s (min)
-	GPRINT:fr:AVERAGE: \: %5.1lf%s (avg)\n
-	GPRINT:sw:LAST:Swap space currently available  \: %5.1lf%s (cur)
-	GPRINT:sw:MAX: \: %5.1lf%s (max)
-	GPRINT:sw:MIN: \: %5.1lf%s (min)
-	GPRINT:sw:AVERAGE: \: %5.1lf%s (avg)\n
-
-[vmstat7]
-	# This graph only works on some OS'es (Solaris)
-	TITLE Memory Utilization
-	YAXIS Events/s
-	DEF:re=vmstat.rrd:mem_re:AVERAGE
-	DEF:mf=vmstat.rrd:mem_mf:AVERAGE
-	LINE2:re#0000ff:Page reclaims
-	LINE2:mf#00FF00:Minor faults
-	COMMENT:\n
-	GPRINT:re:LAST:Page reclaims  \: %5.1lf%s (cur)
-	GPRINT:re:MAX: \: %5.1lf%s (max)
-	GPRINT:re:MIN: \: %5.1lf%s (min)
-	GPRINT:re:AVERAGE: \: %5.1lf%s (avg)\n
-	GPRINT:mf:LAST:Minor faults   \: %5.1lf%s (cur)
-	GPRINT:mf:MAX: \: %5.1lf%s (max)
-	GPRINT:mf:MIN: \: %5.1lf%s (min)
-	GPRINT:mf:AVERAGE: \: %5.1lf%s (avg)\n
-
-[vmstat8]
-	# This graph only works on some OS'es (Solaris)
-	TITLE Paging Activity
-	YAXIS kB/s
-	-b 1024
-	DEF:pi=vmstat.rrd:mem_pi:AVERAGE
-	CDEF:rpi=pi,1024,*
-	DEF:po=vmstat.rrd:mem_po:AVERAGE
-	CDEF:rpo=po,1024,*
-	LINE2:rpi#0000ff:Paged in
-	LINE2:rpo#00FF00:Paged out
-	COMMENT:\n
-	GPRINT:pi:LAST:Page Ins   \: %5.1lf%s (cur)
-	GPRINT:pi:MAX: \: %5.1lf%s (max)
-	GPRINT:pi:MIN: \: %5.1lf%s (min)
-	GPRINT:pi:AVERAGE: \: %5.1lf%s (avg)\n
-	GPRINT:po:LAST:Page Outs  \: %5.1lf%s (cur)
-	GPRINT:po:MAX: \: %5.1lf%s (max)
-	GPRINT:po:MIN: \: %5.1lf%s (min)
-	GPRINT:po:AVERAGE: \: %5.1lf%s (avg)\n
-
-[vmstat9]
-	# This graph only works on some OS'es (Solaris)
-	TITLE RAM Scan Rate
-	YAXIS Pages scanned/s
-	DEF:sr=vmstat.rrd:sr:AVERAGE
-	AREA:sr#00CC00:Scan Rate
-	-u 20
-	GPRINT:sr:LAST: \: %5.1lf%s (cur)
-	GPRINT:sr:MAX: \: %5.1lf%s (max)
-	GPRINT:sr:MIN: \: %5.1lf%s (min)
-	GPRINT:sr:AVERAGE: \: %5.1lf%s (avg)\n
-
-[vmstat0]
-	# This graph only works on some OS'es (Solaris)
-	TITLE System Calls
-	YAXIS System Calls/s
-	DEF:cpu_syc=vmstat.rrd:cpu_syc:AVERAGE
-	AREA:cpu_syc#00CC00:System Calls
-	GPRINT:cpu_syc:LAST: \: %5.1lf%s (cur)
-	GPRINT:cpu_syc:MAX: \: %5.1lf%s (max)
-	GPRINT:cpu_syc:MIN: \: %5.1lf%s (min)
-	GPRINT:cpu_syc:AVERAGE: \: %5.1lf%s (avg)\n
-
-[netstat]
-	TITLE TCP/IP statistics
-	YAXIS Packets/second
-	DEF:tcpInInorderPackets=netstat.rrd:tcpInInorderPackets:AVERAGE
-	DEF:tcpOutDataPackets=netstat.rrd:tcpOutDataPackets:AVERAGE
-	DEF:tcpRetransPackets=netstat.rrd:tcpRetransPackets:AVERAGE
-	LINE3:tcpInInorderPackets#00FF00:In 
-	LINE1:tcpOutDataPackets#0000FF:Out 
-	LINE2:tcpRetransPackets#FF0000:Retrans 
-	COMMENT:\n
-	GPRINT:tcpInInorderPackets:LAST:In       \: %5.1lf%s (cur)
-	GPRINT:tcpInInorderPackets:MAX: \: %5.1lf%s (max)
-	GPRINT:tcpInInorderPackets:MIN: \: %5.1lf%s (min)
-	GPRINT:tcpInInorderPackets:AVERAGE: \: %5.1lf%s (avg)\n
-	GPRINT:tcpOutDataPackets:LAST:Out      \: %5.1lf%s (cur)
-	GPRINT:tcpOutDataPackets:MAX: \: %5.1lf%s (max)
-	GPRINT:tcpOutDataPackets:MIN: \: %5.1lf%s (min)
-	GPRINT:tcpOutDataPackets:AVERAGE: \: %5.1lf%s (avg)\n
-	GPRINT:tcpRetransPackets:LAST:Retrans  \: %5.1lf%s (cur)
-	GPRINT:tcpRetransPackets:MAX: \: %5.1lf%s (max)
-	GPRINT:tcpRetransPackets:MIN: \: %5.1lf%s (min)
-	GPRINT:tcpRetransPackets:AVERAGE: \: %5.1lf%s (avg)\n
-
-[netstat0]
-	TITLE TCP/IP statistics
-	YAXIS Bits/second
-	DEF:tcpInInorderBytes=netstat.rrd:tcpInInorderBytes:AVERAGE
-	DEF:tcpOutDataBytes=netstat.rrd:tcpOutDataBytes:AVERAGE
-	DEF:tcpRetransBytes=netstat.rrd:tcpRetransBytes:AVERAGE
-	CDEF:tcpInInorderBits=tcpInInorderBytes,8,*
-	CDEF:tcpOutDataBits=tcpOutDataBytes,8,*
-	CDEF:tcpRetransBits=tcpRetransBytes,8,*
-	LINE3:tcpInInorderBits#00FF00:In 
-	LINE1:tcpOutDataBits#0000FF:Out 
-	LINE2:tcpRetransBits#FF0000:Retrans 
-	COMMENT:\n
-	GPRINT:tcpInInorderBits:LAST:In       \: %5.1lf%s (cur)
-	GPRINT:tcpInInorderBits:MAX: \: %5.1lf%s (max)
-	GPRINT:tcpInInorderBits:MIN: \: %5.1lf%s (min)
-	GPRINT:tcpInInorderBits:AVERAGE: \: %5.1lf%s (avg)\n
-	GPRINT:tcpOutDataBits:LAST:Out      \: %5.1lf%s (cur)
-	GPRINT:tcpOutDataBits:MAX: \: %5.1lf%s (max)
-	GPRINT:tcpOutDataBits:MIN: \: %5.1lf%s (min)
-	GPRINT:tcpOutDataBits:AVERAGE: \: %5.1lf%s (avg)\n
-	GPRINT:tcpRetransBits:LAST:Retrans  \: %5.1lf%s (cur)
-	GPRINT:tcpRetransBits:MAX: \: %5.1lf%s (max)
-	GPRINT:tcpRetransBits:MIN: \: %5.1lf%s (min)
-	GPRINT:tcpRetransBits:AVERAGE: \: %5.1lf%s (avg)\n
-
-[netstat1]
-	TITLE UDP Statistics
-	YAXIS # Datagrams
-	DEF:udpInDatagrams=netstat.rrd:udpInDatagrams:AVERAGE
-	DEF:udpOutDatagrams=netstat.rrd:udpOutDatagrams:AVERAGE
-	DEF:udpInErrors=netstat.rrd:udpInErrors:AVERAGE
-	LINE3:udpInDatagrams#00FF00:UDP In Datagrams
-	LINE1:udpOutDatagrams#0000FF:UDP Out Datagrams
-	LINE2:udpInErrors#FF0000:UDP In Errors
-	COMMENT:\n
-	GPRINT:udpInDatagrams:LAST:UDP In Datagrams       \: %5.1lf%s (cur)
-	GPRINT:udpInDatagrams:MAX: \: %5.1lf%s (max)
-	GPRINT:udpInDatagrams:MIN: \: %5.1lf%s (min)
-	GPRINT:udpInDatagrams:AVERAGE: \: %5.1lf%s (avg)\n
-	GPRINT:udpOutDatagrams:LAST:UDP Out Datagrams      \: %5.1lf%s (cur)
-	GPRINT:udpOutDatagrams:MAX: \: %5.1lf%s (max)
-	GPRINT:udpOutDatagrams:MIN: \: %5.1lf%s (min)
-	GPRINT:udpOutDatagrams:AVERAGE: \: %5.1lf%s (avg)\n
-	GPRINT:udpInErrors:LAST:UDP In Errors          \: %5.1lf%s (cur)
-	GPRINT:udpInErrors:MAX: \: %5.1lf%s (max)
-	GPRINT:udpInErrors:MIN: \: %5.1lf%s (min)
-	GPRINT:udpInErrors:AVERAGE: \: %5.1lf%s (avg)\n
-
-[netstat2]
-	TITLE TCP Statistics
-	YAXIS # Events
-	DEF:tcpActiveOpens=netstat.rrd:tcpActiveOpens:AVERAGE
-	DEF:tcpPassiveOpens=netstat.rrd:tcpPassiveOpens:AVERAGE
-	DEF:tcpAttemptFails=netstat.rrd:tcpAttemptFails:AVERAGE
-	DEF:tcpEstabResets=netstat.rrd:tcpEstabResets:AVERAGE
-	LINE2:tcpActiveOpens#0000FF:TCP Active Open
-	LINE2:tcpPassiveOpens#000088:TCP Passive Open
-	LINE2:tcpAttemptFails#FF0000:TCP Attempts Fail
-	LINE2:tcpEstabResets#88FF00:TCP Established Resets
-	COMMENT:\n
-	GPRINT:tcpActiveOpens:LAST:TCP Active Opens            \: %5.1lf%s (cur)
-	GPRINT:tcpActiveOpens:MAX: \: %5.1lf%s (max)
-	GPRINT:tcpActiveOpens:MIN: \: %5.1lf%s (min)
-	GPRINT:tcpActiveOpens:AVERAGE: \: %5.1lf%s (avg)\n
-	GPRINT:tcpPassiveOpens:LAST:TCP Passive Opens           \: %5.1lf%s (cur)
-	GPRINT:tcpPassiveOpens:MAX: \: %5.1lf%s (max)
-	GPRINT:tcpPassiveOpens:MIN: \: %5.1lf%s (min)
-	GPRINT:tcpPassiveOpens:AVERAGE: \: %5.1lf%s (avg)\n
-	GPRINT:tcpAttemptFails:LAST:TCP Failed Attempts         \: %5.1lf%s (cur)
-	GPRINT:tcpAttemptFails:MAX: \: %5.1lf%s (max)
-	GPRINT:tcpAttemptFails:MIN: \: %5.1lf%s (min)
-	GPRINT:tcpAttemptFails:AVERAGE: \: %5.1lf%s (avg)\n
-	GPRINT:tcpEstabResets:LAST:TCP Established Resets      \: %5.1lf%s (cur)
-	GPRINT:tcpEstabResets:MAX: \: %5.1lf%s (max)
-	GPRINT:tcpEstabResets:MIN: \: %5.1lf%s (min)
-	GPRINT:tcpEstabResets:AVERAGE: \: %5.1lf%s (avg)\n
-
-[netstat3]
-	TITLE Established TCP Connections
-	YAXIS # Connections
-	DEF:tcpCurrEstab=netstat.rrd:tcpCurrEstab:AVERAGE
-	LINE2:tcpCurrEstab#0000FF:TCP Established Connections
-	COMMENT:\n
-	GPRINT:tcpCurrEstab:LAST:TCP Established Connections \: %5.1lf%s (cur)
-	GPRINT:tcpCurrEstab:MAX: \: %5.1lf%s (max)
-	GPRINT:tcpCurrEstab:MIN: \: %5.1lf%s (min)
-	GPRINT:tcpCurrEstab:AVERAGE: \: %5.1lf%s (avg)\n
-
-[netstat3-multi]
-	TITLE Multi-host TCP Connections
-	YAXIS # Connections
-	FNPATTERN netstat.rrd
-	DEF:tcpCurrEstab@RRDIDX@=@RRDFN@:tcpCurrEstab:AVERAGE
-	LINE2:tcpCurrEstab@RRDIDX@#@COLOR@:@RRDPARAM@
-	GPRINT:tcpCurrEstab@RRDIDX@:LAST:# Est. \: %5.1lf%s (cur)
-	GPRINT:tcpCurrEstab@RRDIDX@:MAX: \: %5.1lf%s (max)
-	GPRINT:tcpCurrEstab@RRDIDX@:MIN: \: %5.1lf%s (min)
-	GPRINT:tcpCurrEstab@RRDIDX@:AVERAGE: \: %5.1lf%s (avg)\n
-
-[iostat]
-	TITLE I/O Utilization
-	YAXIS Stats
-	FNPATTERN iostat.(.+).rrd
-	DEF:p@RRDIDX@B=@RRDFN@:b:AVERAGE
-	DEF:p@RRDIDX@A=@RRDFN@:asvc_t:AVERAGE
-	DEF:p@RRDIDX@W=@RRDFN@:wsvc_t:AVERAGE
-	CDEF:p@RRDIDX@t=p@RRDIDX@B,5,GT,p@RRDIDX@B,UNKN,IF
-	LINE2:p@RRDIDX@t#@COLOR@:@RRDPARAM@
-	COMMENT:\n
-	GPRINT:p@RRDIDX@B:LAST:B       \: %5.1lf (cur)
-	GPRINT:p@RRDIDX@B:MAX: \: %5.1lf (max)
-	GPRINT:p@RRDIDX@B:MIN: \: %5.1lf (min)
-	GPRINT:p@RRDIDX@B:AVERAGE: \: %5.1lf (avg)\n
-	GPRINT:p@RRDIDX@A:LAST:asvc_t  \: %5.1lf (cur)
-	GPRINT:p@RRDIDX@A:MAX: \: %5.1lf (max)
-	GPRINT:p@RRDIDX@A:MIN: \: %5.1lf (min)
-	GPRINT:p@RRDIDX@A:AVERAGE: \: %5.1lf (avg)\n
-	GPRINT:p@RRDIDX@W:LAST:wsvc_t  \: %5.1lf (cur)
-	GPRINT:p@RRDIDX@W:MAX: \: %5.1lf (max)
-	GPRINT:p@RRDIDX@W:MIN: \: %5.1lf (min)
-	GPRINT:p@RRDIDX@W:AVERAGE: \: %5.1lf (avg)\n
-	COMMENT:\n
-
-[apache]
-	TITLE Apache Utilization
-	YAXIS Activity
-	DEF:TA=apache.rrd:TA:AVERAGE
-	CDEF:TA1=TA,300,*
-	DEF:TKB=apache.rrd:TKB:AVERAGE
-	CDEF:TKB1=TKB,300,*
-	LINE2:TA1#0000FF:TA (# Accesses)
-	LINE2:TKB1#FF0000:TKB (kBytes Transferred)
-	COMMENT:\n
-	GPRINT:TA1:LAST:TA    \: %5.1lf%s (cur)
-	GPRINT:TA1:MAX: \: %5.1lf%s (max)
-	GPRINT:TA1:MIN: \: %5.1lf%s (min)
-	GPRINT:TA1:AVERAGE: \: %5.1lf%s (avg)\n
-	GPRINT:TKB1:LAST:TKB   \: %5.1lf%s (cur)
-	GPRINT:TKB1:MAX: \: %5.1lf%s (max)
-	GPRINT:TKB1:MIN: \: %5.1lf%s (min)
-	GPRINT:TKB1:AVERAGE: \: %5.1lf%s (avg)\n
-
-[apache1]
-	TITLE Apache Workers
-	YAXIS # Worker Threads/Processes
-	#DEF:BS=apache.rrd:BS:AVERAGE
-	#DEF:IS=apache.rrd:IS:AVERAGE
-	DEF:BW=apache.rrd:BW:AVERAGE
-	DEF:IW=apache.rrd:IW:AVERAGE
-	#LINE2:BS#00CC00:BS
-	#LINE2:IS#FF00FF:IS
-	LINE2:BW#555555:BW Busy Workers
-	LINE2:IW#880000:IW Idle Workers
-	COMMENT:\n
-	GPRINT:BW:LAST:BW   \: %5.1lf%s (cur)
-	GPRINT:BW:MAX: \: %5.1lf%s (max)
-	GPRINT:BW:MIN: \: %5.1lf%s (min)
-	GPRINT:BW:AVERAGE: \: %5.1lf%s (avg)\n
-	GPRINT:IW:LAST:IW   \: %5.1lf%s (cur)
-	GPRINT:IW:MAX: \: %5.1lf%s (max)
-	GPRINT:IW:MIN: \: %5.1lf%s (min)
-	GPRINT:IW:AVERAGE: \: %5.1lf%s (avg)\n
-
-[apache2]
-	TITLE Apache CPU Utilization
-	YAXIS CPU Load
-	DEF:CPU=apache.rrd:CPU:AVERAGE
-	LINE2:CPU#000088:CPU
-	COMMENT:\n
-	GPRINT:CPU:LAST:CPU   \: %5.1lf (cur)
-	GPRINT:CPU:MAX: \: %5.1lf (max)
-	GPRINT:CPU:MIN: \: %5.1lf (min)
-	GPRINT:CPU:AVERAGE: \: %5.1lf (avg)\n
-
-[apache3]
-	TITLE Apache Requests/Second
-	YAXIS # Requests
-	DEF:RPS=apache.rrd:REQPERSEC:AVERAGE
-	LINE2:RPS#000088:RPS
-	COMMENT:\n
-	GPRINT:RPS:LAST:Requests per Second   \: %5.1lf (cur)
-	GPRINT:RPS:MAX: \: %5.1lf (max)
-	GPRINT:RPS:MIN: \: %5.1lf (min)
-	GPRINT:RPS:AVERAGE: \: %5.1lf (avg)\n
-
-[apache3-multi]
-	TITLE Multi-Host Apache Requests/Second
-	FNPATTERN apache.rrd
-	YAXIS # Requests / seconds
-	# --slope-mode
-	DEF:RPS@RRDIDX@=@RRDFN@:REQPERSEC:AVERAGE
-	LINE2:RPS@RRDIDX@#@COLOR@:@RRDPARAM@
-	COMMENT:\n
-	GPRINT:RPS@RRDIDX@:LAST:Requests per Second  \: %5.1lf (cur)
-	GPRINT:RPS@RRDIDX@:MAX: \: %5.1lf (max)
-	GPRINT:RPS@RRDIDX@:MIN: \: %5.1lf (min)
-	GPRINT:RPS@RRDIDX@:AVERAGE: \: %5.1lf (avg)\n
-
-[bea]
-	FNPATTERN bea.memory.(.+).rrd
-	TITLE BEA/Weblogic % Heap Free
-	YAXIS % Free
-	DEF:free@RRDIDX@=@RRDFN@:freeheap:AVERAGE
-	DEF:used@RRDIDX@=@RRDFN@:usedheap:AVERAGE
-	DEF:total@RRDIDX@=@RRDFN@:totalheap:AVERAGE
-	CDEF:mbfree@RRDIDX@=free@RRDIDX@,1048576,/
-	CDEF:mbused@RRDIDX@=used@RRDIDX@,1048576,/
-	CDEF:mbtotal@RRDIDX@=total@RRDIDX@,1048576,/
-	CDEF:pctfree@RRDIDX@=mbfree@RRDIDX@,100,*,mbtotal@RRDIDX@,/
-	LINE2:pctfree@RRDIDX@#@COLOR@:@RRDPARAM@
-	COMMENT:\n
-	GPRINT:mbused@RRDIDX@:LAST:Used \: %8.1lf MB (cur)
-	GPRINT:mbused@RRDIDX@:MAX: \: %8.1lf MB (max)
-	GPRINT:mbused@RRDIDX@:MIN: \: %8.1lf MB (min)
-	GPRINT:mbused@RRDIDX@:AVERAGE: \: %8.1lf MB (avg)\n
-	GPRINT:mbfree@RRDIDX@:LAST:Free \: %8.1lf MB (cur)
-	GPRINT:mbfree@RRDIDX@:MAX: \: %8.1lf MB (max)
-	GPRINT:mbfree@RRDIDX@:MIN: \: %8.1lf MB (min)
-	GPRINT:mbfree@RRDIDX@:AVERAGE: \: %8.1lf MB (avg)\n
-
-[bea2]
-	FNPATTERN bea.memory.(.+).rrd
-	TITLE BEA/Weblogic % Physical Memory Free
-	YAXIS % Free
-	DEF:free@RRDIDX@=@RRDFN@:freephysmem:AVERAGE
-	DEF:used@RRDIDX@=@RRDFN@:usedphysmem:AVERAGE
-	DEF:total@RRDIDX@=@RRDFN@:totalphysmem:AVERAGE
-	CDEF:mbfree@RRDIDX@=free@RRDIDX@,1048576,/
-	CDEF:mbused@RRDIDX@=used@RRDIDX@,1048576,/
-	CDEF:mbtotal@RRDIDX@=total@RRDIDX@,1048576,/
-	CDEF:pctfree@RRDIDX@=mbfree@RRDIDX@,100,*,mbtotal@RRDIDX@,/
-	LINE2:pctfree@RRDIDX@#@COLOR@:@RRDPARAM@
-	COMMENT:\n
-	GPRINT:mbused@RRDIDX@:LAST:Used \: %8.1lf MB (cur)
-	GPRINT:mbused@RRDIDX@:MAX: \: %8.1lf MB (max)
-	GPRINT:mbused@RRDIDX@:MIN: \: %8.1lf MB (min)
-	GPRINT:mbused@RRDIDX@:AVERAGE: \: %8.1lf MB (avg)\n
-	GPRINT:mbfree@RRDIDX@:LAST:Free \: %8.1lf MB (cur)
-	GPRINT:mbfree@RRDIDX@:MAX: \: %8.1lf MB (max)
-	GPRINT:mbfree@RRDIDX@:MIN: \: %8.1lf MB (min)
-	GPRINT:mbfree@RRDIDX@:AVERAGE: \: %8.1lf MB (avg)\n
-
-[bea3]
-	FNPATTERN bea.threads.(.+).weblogic.kernel.Default.rrd
-	TITLE BEA/Weblogic kernel.Default Idle Threads
-	YAXIS # Idle Threads
-	DEF:threads@RRDIDX@=@RRDFN@:currentidlecount:AVERAGE
-	LINE2:threads@RRDIDX@#@COLOR@:@RRDPARAM@
-	COMMENT:\n
-	GPRINT:threads@RRDIDX@:LAST:Free \: %4.2lf (cur)
-	GPRINT:threads@RRDIDX@:MAX: \: %4.2lf (max)
-	GPRINT:threads@RRDIDX@:MIN: \: %4.2lf (min)
-	GPRINT:threads@RRDIDX@:AVERAGE: \: %4.2lf (avg)\n
-
-[bea4]
-	FNPATTERN bea.threads.(.+).weblogic.kernel.Default.rrd
-	TITLE BEA/Weblogic kernel.Default Requests
-	YAXIS # Requests
-	DEF:reqs@RRDIDX@=@RRDFN@:totalcount:AVERAGE
-	LINE2:reqs@RRDIDX@#@COLOR@:@RRDPARAM@
-	COMMENT:\n
-	GPRINT:reqs@RRDIDX@:LAST:Free \: %4.2lf (cur)
-	GPRINT:reqs@RRDIDX@:MAX: \: %4.2lf (max)
-	GPRINT:reqs@RRDIDX@:MIN: \: %4.2lf (min)
-	GPRINT:reqs@RRDIDX@:AVERAGE: \: %4.2lf (avg)\n
-
-[bind]
-	TITLE BIND Utilization
-	YAXIS Stats
-	DEF:A=bind.rrd:A:AVERAGE
-	DEF:ANY=bind.rrd:ANY:AVERAGE
-	DEF:AXFR=bind.rrd:AXFR:AVERAGE
-	DEF:MX=bind.rrd:MX:AVERAGE
-	DEF:O=bind.rrd:O:AVERAGE
-	DEF:PTR=bind.rrd:PTR:AVERAGE
-	DEF:SOA=bind.rrd:SOA:AVERAGE
-	CDEF:A1=A,300,*
-	CDEF:ANY1=ANY,300,*
-	CDEF:AXFR1=AXFR,300,*
-	CDEF:MX1=MX,300,*
-	CDEF:O1=O,300,*
-	CDEF:PTR1=PTR,300,*
-	CDEF:SOA1=SOA,300,*
-	LINE2:A1#0000FF:A
-	LINE2:ANY1#FF0000:ANY
-	LINE2:AXFR1#00CC00:AXFR
-	LINE2:MX1#FF00FF:MX
-	LINE2:O1#555555:O
-	LINE2:PTR1#880000:PTR
-	LINE2:SOA1#000088:SOA
-	COMMENT:\n
-	GPRINT:A1:LAST:A     \: %5.1lf (cur) 
-	GPRINT:A1:MAX:A    \: %5.1lf (max) 
-	GPRINT:A1:MIN:A     \: %5.1lf (min) 
-	GPRINT:A1:AVERAGE:A     \: %5.1lf (avg)\n
-	GPRINT:ANY1:LAST:ANY   \: %5.1lf (cur) 
-	GPRINT:ANY1:MAX:ANY  \: %5.1lf (max) 
-	GPRINT:ANY1:MIN:ANY   \: %5.1lf (min) 
-	GPRINT:ANY1:AVERAGE:ANY   \: %5.1lf (avg)\n
-	GPRINT:AXFR1:LAST:AXFR  \: %5.1lf (cur) 
-	GPRINT:AXFR1:MAX:AXFR \: %5.1lf (max) 
-	GPRINT:AXFR1:MIN:AXFR  \: %5.1lf (min) 
-	GPRINT:AXFR1:AVERAGE:AXFR  \: %5.1lf (avg)\n
-	GPRINT:MX1:LAST:MX    \: %5.1lf (cur) 
-	GPRINT:MX1:MAX:MX   \: %5.1lf (max) 
-	GPRINT:MX1:MIN:MX    \: %5.1lf (min) 
-	GPRINT:MX1:AVERAGE:MX    \: %5.1lf (avg)\n
-	GPRINT:O1:LAST:O     \: %5.1lf (cur) 
-	GPRINT:O1:MAX:O    \: %5.1lf (max) 
-	GPRINT:O1:MIN:O     \: %5.1lf (min) 
-	GPRINT:O1:AVERAGE:O     \: %5.1lf (avg)\n
-	GPRINT:PTR1:LAST:PTR   \: %5.1lf (cur) 
-	GPRINT:PTR1:MAX:PTR  \: %5.1lf (max) 
-	GPRINT:PTR1:MIN:PTR   \: %5.1lf (min) 
-	GPRINT:PTR1:AVERAGE:PTR   \: %5.1lf (avg)\n
-	GPRINT:SOA1:LAST:SOA   \: %5.1lf (cur) 
-	GPRINT:SOA1:MAX:SOA  \: %5.1lf (max) 
-	GPRINT:SOA1:MIN:SOA   \: %5.1lf (min) 
-	GPRINT:SOA1:AVERAGE:SOA   \: %5.1lf (avg)\n
-
-[sendmail]
-	FNPATTERN sendmail.(.+).rrd
-	TITLE Sendmail Activity
-	YAXIS Messages
-	DEF:p@RRDIDX@IN=@RRDFN@:msgsfr:AVERAGE
-	DEF:p@RRDIDX@OUT=@RRDFN@:msgsto:AVERAGE
-	CDEF:p@RRDIDX@IN1=p@RRDIDX@IN,300,*
-	CDEF:p@RRDIDX@OUT1=p@RRDIDX@OUT,300,*
-	LINE1:p@RRDIDX@IN1#@COLOR@:@RRDPARAM@ IN
-	LINE2:p@RRDIDX@OUT1#@COLOR@:@RRDPARAM@ OUT
-	COMMENT:\n
-	GPRINT:p@RRDIDX@IN1:LAST:@RRDPARAM@ in   %5.1lf (cur)
-	GPRINT:p@RRDIDX@IN1:MAX: \: %5.1lf (max)
-	GPRINT:p@RRDIDX@IN1:MIN: \: %5.1lf (min)
-	GPRINT:p@RRDIDX@IN1:AVERAGE: \: %5.1lf (avg)
-	COMMENT:\n
-	GPRINT:p@RRDIDX@OUT1:LAST:@RRDPARAM@ out  %5.1lf (cur)
-	GPRINT:p@RRDIDX@OUT1:MAX: \: %5.1lf (max)
-	GPRINT:p@RRDIDX@OUT1:MIN: \: %5.1lf (min)
-	GPRINT:p@RRDIDX@OUT1:AVERAGE: \: %5.1lf (avg)\n
-	COMMENT:\n
-
-[sendmail1]
-        FNPATTERN sendmail.(.+).rrd
-        TITLE Sendmail Reject/Discards
-        YAXIS Messages
-        DEF:p@RRDIDX@IN=@RRDFN@:msgsrej:AVERAGE
-        DEF:p@RRDIDX@OUT=@RRDFN@:msgsdis:AVERAGE
-        CDEF:p@RRDIDX@IN1=p@RRDIDX@IN,300,*
-        CDEF:p@RRDIDX@OUT1=p@RRDIDX@OUT,300,*
-        LINE1:p@RRDIDX@IN1#@COLOR@:@RRDPARAM@ REJ
-        LINE2:p@RRDIDX@OUT1#@COLOR@:@RRDPARAM@ DIS
-        COMMENT:\n
-        GPRINT:p@RRDIDX@IN1:LAST:@RRDPARAM@ rej  %5.1lf (cur)
-        GPRINT:p@RRDIDX@IN1:MAX: \: %5.1lf (max)
-        GPRINT:p@RRDIDX@IN1:MIN: \: %5.1lf (min)
-        GPRINT:p@RRDIDX@IN1:AVERAGE: \: %5.1lf (avg)
-        COMMENT:\n
-        GPRINT:p@RRDIDX@OUT1:LAST:@RRDPARAM@ dis  %5.1lf (cur)
-        GPRINT:p@RRDIDX@OUT1:MAX: \: %5.1lf (max)
-        GPRINT:p@RRDIDX@OUT1:MIN: \: %5.1lf (min)
-        GPRINT:p@RRDIDX@OUT1:AVERAGE: \: %5.1lf (avg)\n
-        COMMENT:\n
-
-[mailq]
-	# This handles "mailq.rrd", "mailqin.rrd" and "mailqout.rrd"
-	FNPATTERN mailq(.+).rrd
-	TITLE Mail Queue Length
-	YAXIS Queue Length
-	DEF:mailq@RRDIDX@=@RRDFN@:mailq:AVERAGE
-	LINE2:mailq@RRDIDX@#@COLOR@:Queue Length @RRDPARAM@
-	COMMENT:\n
-	GPRINT:mailq@RRDIDX@:LAST: \: %5.1lf (cur)
-	GPRINT:mailq@RRDIDX@:MAX: \: %5.1lf (max)
-	GPRINT:mailq@RRDIDX@:MIN: \: %5.1lf (min)
-	GPRINT:mailq@RRDIDX@:AVERAGE: \: %5.1lf (avg)\n
-
-
-[iishealth]
-	# Based on the "IIShealth.zip" tool from deadcat
-	FNPATTERN iishealth.(.+).rrd
-	TITLE IIS Utilization
-	YAXIS #
-	# Yes, they really do call it "realmempct". Cut'n'paste programming.
-	DEF:p@RRDIDX@=@RRDFN@:realmempct:AVERAGE
-	LINE2:p@RRDIDX@#@COLOR@:@RRDPARAM@
-	-u 100
-	GPRINT:p@RRDIDX@:LAST: \: %5.1lf (cur)
-	GPRINT:p@RRDIDX@:MAX: \: %5.1lf (max)
-	GPRINT:p@RRDIDX@:MIN: \: %5.1lf (min)
-	GPRINT:p@RRDIDX@:AVERAGE: \: %5.1lf (avg)\n
-
-[temperature]
-	FNPATTERN temperature.(.+).rrd
-	TITLE Temperature
-	YAXIS Celsius
-	DEF:p@RRDIDX@=@RRDFN@:temperature:AVERAGE
-	LINE2:p@RRDIDX@#@COLOR@:@RRDPARAM@
-	GPRINT:p@RRDIDX@:LAST: \: %5.1lf (cur)
-	GPRINT:p@RRDIDX@:MAX: \: %5.1lf (max)
-	GPRINT:p@RRDIDX@:MIN: \: %5.1lf (min)
-	GPRINT:p@RRDIDX@:AVERAGE: \: %5.1lf (avg)\n
-
-# If you want your temperature graphs in Fahrenheit,
-# comment out the [temperature] section above, and 
-# uncomment this definition.
-#
-#[temperature]
-#	FNPATTERN temperature.(.+).rrd
-#	TITLE Temperature
-#	YAXIS Fahrenheit
-#	DEF:p@RRDIDX@=@RRDFN@:temperature:AVERAGE
-#	CDEF:tempf@RRDIDX@=9,5,/,p@RRDIDX@,*,32,+
-#	LINE2:tempf@RRDIDX@#@COLOR@:@RRDPARAM@
-#	GPRINT:tempf@RRDIDX@:LAST: \: %5.1lf (cur)
-#	GPRINT:tempf@RRDIDX@:MAX: \: %5.1lf (max)
-#	GPRINT:tempf@RRDIDX@:MIN: \: %5.1lf (min)
-#	GPRINT:tempf@RRDIDX@:AVERAGE: \: %5.1lf (avg)\n
-
-[citrix]
-	TITLE Citrix Users
-	YAXIS # Users
-	DEF:u=citrix.rrd:users:AVERAGE
-	LINE2:u#FF0000:Users
-	COMMENT:\n
-	GPRINT:u:LAST: \: %5.1lf (cur)
-	GPRINT:u:MAX: \: %5.1lf (max)
-	GPRINT:u:MIN: \: %5.1lf (min)
-	GPRINT:u:AVERAGE: \: %5.1lf (avg)\n
-
-[bbgen]
-	TITLE bbgen Runtime
-	YAXIS Seconds
-	DEF:rt=bbgen.rrd:runtime:AVERAGE
-	AREA:rt#00CCCC:Run Time
-	COMMENT:\n
-	GPRINT:rt:LAST: \: %5.1lf (cur)
-	GPRINT:rt:MAX: \: %5.1lf (max)
-	GPRINT:rt:MIN: \: %5.1lf (min)
-	GPRINT:rt:AVERAGE: \: %5.1lf (avg)\n
-
-[bbtest]
-	TITLE bbtest Run Time
-	YAXIS Seconds
-	DEF:rt=bbtest.rrd:runtime:AVERAGE
-	AREA:rt#00CCCC:Run Time
-	COMMENT:\n
-	GPRINT:rt:LAST: \: %5.1lf (cur)
-	GPRINT:rt:MAX: \: %5.1lf (max)
-	GPRINT:rt:MIN: \: %5.1lf (min)
-	GPRINT:rt:AVERAGE: \: %5.1lf (avg)\n
-
-[bbproxy]
-	TITLE bbproxy Average Queue Time
-	YAXIS Seconds
-	DEF:rt=bbproxy.rrd:runtime:AVERAGE
-	LINE2:rt#00CCCC:Queue Time
-	COMMENT:\n
-	GPRINT:rt:LAST: \: %5.1lf (cur)
-	GPRINT:rt:MAX: \: %5.1lf (max)
-	GPRINT:rt:MIN: \: %5.1lf (min)
-	GPRINT:rt:AVERAGE: \: %5.1lf (avg)\n
-
-[hobbitd]
-	TITLE hobbitd Incoming Messages
-	YAXIS Messages
-	DEF:in=hobbitd.rrd:inmessages:AVERAGE
-	LINE2:in#00CCCC:Incoming messages
-	COMMENT:\n
-	GPRINT:in:LAST: \: %5.1lf (cur)
-	GPRINT:in:MAX: \: %5.1lf (max)
-	GPRINT:in:MIN: \: %5.1lf (min)
-	GPRINT:in:AVERAGE: \: %5.1lf (avg)\n
-
-[mrtg]
-	FNPATTERN mrtg.*\.(.+).rrd
-	TITLE Network Traffic (MRTG)
-	YAXIS Bits/second
-	DEF:inbytes@RRDIDX@=@RRDFN@:ds0:AVERAGE
-	CDEF:in@RRDIDX@=inbytes@RRDIDX@,8,*
-	DEF:outbytes@RRDIDX@=@RRDFN@:ds1:AVERAGE
-	CDEF:out@RRDIDX@=outbytes@RRDIDX@,8,*
-	LINE2:in@RRDIDX@#@COLOR@:@RRDPARAM@  inbound
-	GPRINT:in@RRDIDX@:LAST: \: %10.1lf (cur)
-	GPRINT:in@RRDIDX@:MAX: \: %10.1lf (max)
-	GPRINT:in@RRDIDX@:MIN: \: %10.1lf (min)
-	GPRINT:in@RRDIDX@:AVERAGE: \: %10.1lf (avg)\n
-	LINE2:out@RRDIDX@#@COLOR@:@RRDPARAM@ outbound
-	GPRINT:out@RRDIDX@:LAST: \: %10.1lf (cur)
-	GPRINT:out@RRDIDX@:MAX: \: %10.1lf (max)
-	GPRINT:out@RRDIDX@:MIN: \: %10.1lf (min)
-	GPRINT:out@RRDIDX@:AVERAGE: \: %10.1lf (avg)\n
-
-[mysqlslow]
-	DEF:slow=mysql.rrd:Slowqueries:AVERAGE
-	TITLE MySQL Slow Queries
-	YAXIS #
-	LINE2:slow#00CCCC:Slow Queries
-	COMMENT:\n
-	GPRINT:slow:LAST: \: %5.1lf (cur)
-	GPRINT:slow:MAX: \: %5.1lf (max)
-	GPRINT:slow:MIN: \: %5.1lf (min)
-	GPRINT:slow:AVERAGE: \: %5.1lf (avg)\n
-
-[mysqlthread]
-	DEF:threads=mysql.rrd:Threads:AVERAGE
-	TITLE MySQL Active Threads
-	YAXIS #
-	AREA:threads#00CCCC:Threads
-	COMMENT:\n
-	GPRINT:threads:LAST: \: %5.1lf (cur)
-	GPRINT:threads:MAX: \: %5.1lf (max)
-	GPRINT:threads:MIN: \: %5.1lf (min)
-	GPRINT:threads:AVERAGE: \: %5.1lf (avg)\n
-
-[ifstat]
-	FNPATTERN ifstat.(.+).rrd
-	TITLE Network Traffic
-	YAXIS Bits/second
-	DEF:inbytes@RRDIDX@=@RRDFN@:bytesReceived:AVERAGE
-	CDEF:in@RRDIDX@=inbytes@RRDIDX@,8,*
-	DEF:outbytes@RRDIDX@=@RRDFN@:bytesSent:AVERAGE
-	CDEF:out@RRDIDX@=outbytes@RRDIDX@,8,*
-	LINE2:in@RRDIDX@#@COLOR@:@RRDPARAM@  inbound
-	GPRINT:in@RRDIDX@:LAST: \: %10.1lf (cur)
-	GPRINT:in@RRDIDX@:MAX: \: %10.1lf (max)
-	GPRINT:in@RRDIDX@:MIN: \: %10.1lf (min)
-	GPRINT:in@RRDIDX@:AVERAGE: \: %10.1lf (avg)\n
-	LINE2:out@RRDIDX@#@COLOR@:@RRDPARAM@ outbound
-	GPRINT:out@RRDIDX@:LAST: \: %10.1lf (cur)
-	GPRINT:out@RRDIDX@:MAX: \: %10.1lf (max)
-	GPRINT:out@RRDIDX@:MIN: \: %10.1lf (min)
-	GPRINT:out@RRDIDX@:AVERAGE: \: %10.1lf (avg)\n
-
-[files]
-	FNPATTERN filesizes.(.+).rrd
-	TITLE File/Directory sizes
-	YAXIS KB
-	DEF:sz@RRDIDX@=@RRDFN@:size:AVERAGE
-	LINE2:sz@RRDIDX@#@COLOR@:@RRDPARAM@
-	GPRINT:sz@RRDIDX@:LAST: \: %10.1lf (cur)
-	GPRINT:sz@RRDIDX@:MAX: \: %10.1lf (max)
-	GPRINT:sz@RRDIDX@:MIN: \: %10.1lf (min)
-	GPRINT:sz@RRDIDX@:AVERAGE: \: %10.1lf (avg)\n
-
-[processes]
-	FNPATTERN processes.(.+).rrd
-	TITLE Process counts
-	YAXIS #
-	DEF:cnt@RRDIDX@=@RRDFN@:count:AVERAGE
-	LINE2:cnt@RRDIDX@#@COLOR@:@RRDPARAM@
-	GPRINT:cnt@RRDIDX@:LAST: \: %10.1lf (cur)
-	GPRINT:cnt@RRDIDX@:MAX: \: %10.1lf (max)
-	GPRINT:cnt@RRDIDX@:MIN: \: %10.1lf (min)
-	GPRINT:cnt@RRDIDX@:AVERAGE: \: %10.1lf (avg)\n
-
-[ports]
-	FNPATTERN ports.(.+).rrd
-	TITLE Network port counts
-	YAXIS #
-	DEF:cnt@RRDIDX@=@RRDFN@:count:AVERAGE
-	LINE2:cnt@RRDIDX@#@COLOR@:@RRDPARAM@
-	GPRINT:cnt@RRDIDX@:LAST: \: %10.1lf (cur)
-	GPRINT:cnt@RRDIDX@:MAX: \: %10.1lf (max)
-	GPRINT:cnt@RRDIDX@:MIN: \: %10.1lf (min)
-	GPRINT:cnt@RRDIDX@:AVERAGE: \: %10.1lf (avg)\n
-
-[lines]
-	FNPATTERN lines.(.+).rrd
-	TITLE Logfile linecounts
-	YAXIS #
-	DEF:cnt@RRDIDX@=@RRDFN@:count:AVERAGE
-	LINE2:cnt@RRDIDX@#@COLOR@:@RRDPARAM@
-	GPRINT:cnt@RRDIDX@:LAST: %6.1lf (cur) \:
-	GPRINT:cnt@RRDIDX@:MAX: %6.1lf (max) \:
-	GPRINT:cnt@RRDIDX@:MIN: %6.1lf (min) \:
-	GPRINT:cnt@RRDIDX@:AVERAGE: %6.1lf (avg)\n
-
-
diff --git a/abs/mv-core/hobbitmon/diffs/hobbitlaunch.cfg b/abs/mv-core/hobbitmon/diffs/hobbitlaunch.cfg
deleted file mode 100644
index 96e4681..0000000
--- a/abs/mv-core/hobbitmon/diffs/hobbitlaunch.cfg
+++ /dev/null
@@ -1,240 +0,0 @@
-#
-# The hobbitlaunch.cfg file is loaded by "hobbitlaunch".
-# It controls which of the Hobbit modules to run, how often, and
-# with which parameters, options and environment variables.
-#
-
-# This is the main Hobbit daemon. This must be running on at least
-# one server in your setup. If you are setting up a server to do
-# just network tests or run bbproxy, it is OK to disable this (then
-# you also need to remove the "NEEDS hobbitd" lines for the tasks
-# you want to run).
-[hobbitd]
-	ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-	CMD hobbitd --pidfile=$BBSERVERLOGS/hobbitd.pid --restart=$BBTMP/hobbitd.chk --checkpoint-file=$BBTMP/hobbitd.chk --checkpoint-interval=600 --log=$BBSERVERLOGS/hobbitd.log --admin-senders=127.0.0.1,$BBSERVERIP --store-clientlogs=!msgs
-
-
-# "bbstatus" saves status-logs in text- and html-format, like the old Big Brother 
-# daemon does. Unless you are using add-ons that directly access the log-files, you 
-# will not need to run this module, and it is recommended that you keep it disabled
-# since storing the raw logs on disk can cause a significant load on your server.
-
-[bbstatus]
-	DISABLED
-	ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-	NEEDS hobbitd
-	CMD hobbitd_channel --channel=status --log=$BBSERVERLOGS/status.log hobbitd_filestore --status --html
-
-
-# "bbhistory" keeps track of the status changes that happen, in a manner that is
-# compatible with the Big Brother history logs. You probably do want to run this.
-
-[bbhistory]
-	ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-	NEEDS hobbitd
-	CMD hobbitd_channel --channel=stachg --log=$BBSERVERLOGS/history.log hobbitd_history
-
-
-# "hostdata" stores the Hobbit client messages on disk when some status for a host
-# changes. This lets you access a lot of data collected from a host around the time
-# when a problem occurred. However, it may use a significant amount of disk space
-# if you have lots of Hobbit clients.
-# Note: The --store-clientlogs option for the [hobbitd] provides control over
-#       which status-changes will cause a client message to be stored.
-[hostdata]
-	ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-	NEEDS hobbitd
-	CMD hobbitd_channel --channel=clichg --log=$BBSERVERLOGS/hostdata.log hobbitd_hostdata
-
-
-# "bbdata" saves information sent using the BB "data" protocol, like the old Big Brother 
-# daemon does. Unless you are using add-ons that directly access the data-files, you 
-# will not need to run this module, and it is recommended that you keep it disabled
-# since storing the raw data on disk can cause a significant load on your BB server.
-# RRD graphs uses data-files, but since RRD is handled by the hobbitd_rrd module, you do
-# not need to run the "bbdata" module to get RRD graphs.
-
-[bbdata]
-	DISABLED
-	ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-	NEEDS hobbitd
-	CMD hobbitd_channel --channel=data   --log=$BBSERVERLOGS/data.log hobbitd_filestore --data
-
-
-# "bbnotes" saves web note-files, that are sent using the BB "notes" protocol. This is
-# disabled by default; if you use the BB "notes" protocol, then you should enable this.
-
-[bbnotes]
-	DISABLED
-	ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-	NEEDS hobbitd
-	CMD hobbitd_channel --channel=notes  --log=$BBSERVERLOGS/notes.log hobbitd_filestore --notes
-
-
-# "bbenadis" updates the files used to indicate that a host or test has been enabled or disabled.
-# Unless you are running server side scripts that look at these files, you do not need this.
-
-[bbenadis]
-	DISABLED
-	ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-	NEEDS hobbitd
-	CMD hobbitd_channel --channel=enadis --log=$BBSERVERLOGS/enadis.log hobbitd_filestore --enadis
-
-
-# "bbpage" sends out alerts. Note that this module is NOT compatible with the old Big Brother
-# system - it uses a different configuration file to determine how alerts get sent. If you want
-# alerts to go out via pager, e-mail or some other means, then you must run this module.
-
-[bbpage]
-	ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-	NEEDS hobbitd
-	CMD hobbitd_channel --channel=page  --log=$BBSERVERLOGS/page.log hobbitd_alert --checkpoint-file=$BBTMP/alert.chk --checkpoint-interval=600
-
-
-# "rrdstatus" updates RRD files with information that arrives as "status" messages.
-# If you want RRD graphs of your monitoring data, then you want to run this.
-
-[rrdstatus]
-	ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-	NEEDS hobbitd
-	CMD hobbitd_channel --channel=status --log=$BBSERVERLOGS/rrd-status.log hobbitd_rrd --rrddir=$BBVAR/rrd
-
-# "rrddata" updates RRD files with information that arrives as "data" messages.
-# If you want RRD graphs of your monitoring BB data, then you want to run this.
-
-[rrddata]
-	ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-	NEEDS hobbitd
-	CMD hobbitd_channel --channel=data   --log=$BBSERVERLOGS/rrd-data.log hobbitd_rrd --rrddir=$BBVAR/rrd
-
-# The client back-end module. You need this if you are running the Hobbit client on any system.
-[clientdata]
-	ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-	NEEDS hobbitd
-	CMD hobbitd_channel --channel=client --log=$BBSERVERLOGS/clientdata.log hobbitd_client
-
-
-# "bbproxy" is the Hobbit proxy server that allows you to forward status messages
-# from a protected network to your Hobbit server. It is not enabled by default,
-# since it would conflict with the hobbitd task.
-# If you need to run this, then disabled hobbitd and the hobbitd-modules
-# above, then enable this. Make sure you enter the IP-address of your 
-# Hobbit server in the command-line, so that the proxy knows where to forward
-# status messages.
-[bbproxy]
-	DISABLED
-	ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-	CMD $BBHOME/bin/bbproxy --hobbitd --bbdisplay=YOUR.HOBBIT.SERVER.IP --report=$MACHINE.bbproxy --no-daemon --pidfile=$BBSERVERLOGS/bbproxy.pid
-	LOGFILE $BBSERVERLOGS/bbproxy.log
-
-
-# "hobbitfetch" is used when you have clients that cannot connect to your Hobbit server,
-# but the Hobbit server can connect to the client. Normally the clients will initiate
-# a connection to the Hobbit server to deliver the data they collect, but this is
-# forbidden in some firewall setups. By enabling the hobbitfetch task, hosts that have
-# the "pulldata" tag in the bb-hosts file will be polled by hobbitfetch for their data.
-#
-# NOTE: On the clients you must enable the "msgcache" task, since this is what 
-#       hobbitfetch is talking to.
-[hobbitfetch]
-	DISABLED
-	ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-	CMD $BBHOME/bin/hobbitfetch --server=YOUR.HOBBIT.SERVER.IP --no-daemon --pidfile=$BBSERVERLOGS/hobbitfetch.pid
-	LOGFILE $BBSERVERLOGS/hobbitfetch.log
-
-
-# "bbdisplay" runs the bbgen tool to generate the Hobbit webpages from the status information that
-# has been received. Big Brother updated the webpages once every 5 minutes. The default here is to
-# run it every minute for faster updates, but you can change it if you have a highly loaded server
-# and dont need updates that often.
-
-[bbdisplay]
-	ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-	NEEDS hobbitd
-	GROUP generators
-	CMD bbgen $BBGENOPTS --report
-	LOGFILE $BBSERVERLOGS/bb-display.log
-	INTERVAL 1m
-
-# bbcombotest is an extension script for the Hobbit display server. It generates
-# status messages that are combined from the status of one or more normal statuses.
-# It is controlled via the bbcombotest.cfg file.
-[bbcombotest]
-	ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-	NEEDS hobbitd
-	CMD $BBHOME/bin/bbcombotest
-	LOGFILE $BBSERVERLOGS/bbcombotest.log
-	INTERVAL 5m
-
-# "bbnet" runs the bbtest-net tool to perform the network based tests - i.e. http, smtp, ssh, dns and
-# all of the various network protocols we need to test.
-
-[bbnet]
-	ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-	NEEDS hobbitd
-	CMD bbtest-net --report --ping --checkresponse
-	LOGFILE $BBSERVERLOGS/bb-network.log
-	INTERVAL 5m
-
-
-# "bbretest" picks up the tests that the normal network test consider "failed", and re-does those
-# tests more often. This enables Big Brother to pick up a recovered network service faster than
-# if it were tested only by the "bbnet" task (which only runs every 5 minutes). So if you have
-# servers with very high availability guarantees, running this task will make your availability
-# reports look much better.
-
-[bbretest]
-	ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-	NEEDS hobbitd
-	CMD $BBHOME/ext/bbretest-net.sh
-	LOGFILE $BBSERVERLOGS/bb-retest.log
-	INTERVAL 1m
-
-
-# "hobbitclient" runs the Hobbit client. The client is installed automatically
-# when you install a Hobbit server (presumably, you do want to monitor the 
-# Hobbit server ?), but there's no need to have two hobbitlaunch instances
-# running at the same time. So we'll just run it from here.
-# Note: If you are using another client package, you should disable this one.
-
-[hobbitclient]
-	ENVFILE /data/srv/hobbit/client/etc/hobbitclient.cfg
-	NEEDS hobbitd
-	CMD /data/srv/hobbit/client/bin/hobbitclient.sh
-	LOGFILE $BBSERVERLOGS/hobbitclient.log
-	INTERVAL 5m
-
-[storage]
-	
-	ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-	CMD /data/srv/hobbit/server/ext/hobbitstorage.py
-	LOGFILE $BBSERVERLOGS/bb-storage.log
-	INTERVAL 5m
-[notes]
-       ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-       CMD /data/srv/hobbit/server/ext/hbnotes.py
-       LOGFILE $BBSERVERLOGS/bb-notes.log
-       INTERVAL 5m
-[orphan]
-       ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-       CMD /data/srv/hobbit/server/ext/hobbit-myth-orphan.sh
-       LOGFILE $BBSERVERLOGS/orphan.log
-       INTERVAL 5m
- 
-[func]
-       ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-       CMD sudo /data/srv/hobbit/server/ext/hbfunc.py
-       LOGFILE $BBSERVERLOGS/hbfunc.log
-       INTERVAL 5m
-
-[memmyth]
-       ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-       CMD  /data/srv/hobbit/server/ext/hobbit-mem-myth.sh
-       LOGFILE $BBSERVERLOGS/mythmem.log
-       INTERVAL 5m
-
-[mtc]
-       ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-       CMD  /data/srv/hobbit/server/ext/hobbit_myth_data.py
-       LOGFILE $BBSERVERLOGS/mtc
-       INTERVAL 5m
diff --git a/abs/mv-core/hobbitmon/diffs/hobbitlaunch.cfg.diff b/abs/mv-core/hobbitmon/diffs/hobbitlaunch.cfg.diff
deleted file mode 100644
index 6239125..0000000
--- a/abs/mv-core/hobbitmon/diffs/hobbitlaunch.cfg.diff
+++ /dev/null
@@ -1,40 +0,0 @@
---- hobbitlaunch.cfg.orig	2008-02-10 22:30:16.000000000 +0000
-+++ hobbitlaunch.cfg	2008-08-09 07:05:14.000000000 +0000
-@@ -204,3 +204,37 @@
- 	LOGFILE $BBSERVERLOGS/hobbitclient.log
- 	INTERVAL 5m
- 
-+[storage]
-+	
-+	ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-+	CMD /data/srv/hobbit/server/ext/hobbitstorage.py
-+	LOGFILE $BBSERVERLOGS/bb-storage.log
-+	INTERVAL 5m
-+[notes]
-+       ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-+       CMD /data/srv/hobbit/server/ext/hbnotes.py
-+       LOGFILE $BBSERVERLOGS/bb-notes.log
-+       INTERVAL 5m
-+[orphan]
-+       ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-+       CMD /data/srv/hobbit/server/ext/hobbit-myth-orphan.sh
-+       LOGFILE $BBSERVERLOGS/orphan.log
-+       INTERVAL 5m
-+ 
-+[func]
-+       ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-+       CMD sudo /data/srv/hobbit/server/ext/hbfunc.py
-+       LOGFILE $BBSERVERLOGS/hbfunc.log
-+       INTERVAL 5m
-+
-+[memmyth]
-+       ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-+       CMD  /data/srv/hobbit/server/ext/hobbit-mem-myth.sh
-+       LOGFILE $BBSERVERLOGS/mythmem.log
-+       INTERVAL 5m
-+
-+[mtc]
-+       ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-+       CMD  /data/srv/hobbit/server/ext/hobbit_myth_data.py
-+       LOGFILE $BBSERVERLOGS/mtc
-+       INTERVAL 5m
diff --git a/abs/mv-core/hobbitmon/diffs/hobbitlaunch.cfg.orig b/abs/mv-core/hobbitmon/diffs/hobbitlaunch.cfg.orig
deleted file mode 100644
index 93c2dd9..0000000
--- a/abs/mv-core/hobbitmon/diffs/hobbitlaunch.cfg.orig
+++ /dev/null
@@ -1,206 +0,0 @@
-#
-# The hobbitlaunch.cfg file is loaded by "hobbitlaunch".
-# It controls which of the Hobbit modules to run, how often, and
-# with which parameters, options and environment variables.
-#
-
-# This is the main Hobbit daemon. This must be running on at least
-# one server in your setup. If you are setting up a server to do
-# just network tests or run bbproxy, it is OK to disable this (then
-# you also need to remove the "NEEDS hobbitd" lines for the tasks
-# you want to run).
-[hobbitd]
-	ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-	CMD hobbitd --pidfile=$BBSERVERLOGS/hobbitd.pid --restart=$BBTMP/hobbitd.chk --checkpoint-file=$BBTMP/hobbitd.chk --checkpoint-interval=600 --log=$BBSERVERLOGS/hobbitd.log --admin-senders=127.0.0.1,$BBSERVERIP --store-clientlogs=!msgs
-
-
-# "bbstatus" saves status-logs in text- and html-format, like the old Big Brother 
-# daemon does. Unless you are using add-ons that directly access the log-files, you 
-# will not need to run this module, and it is recommended that you keep it disabled
-# since storing the raw logs on disk can cause a significant load on your server.
-
-[bbstatus]
-	DISABLED
-	ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-	NEEDS hobbitd
-	CMD hobbitd_channel --channel=status --log=$BBSERVERLOGS/status.log hobbitd_filestore --status --html
-
-
-# "bbhistory" keeps track of the status changes that happen, in a manner that is
-# compatible with the Big Brother history logs. You probably do want to run this.
-
-[bbhistory]
-	ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-	NEEDS hobbitd
-	CMD hobbitd_channel --channel=stachg --log=$BBSERVERLOGS/history.log hobbitd_history
-
-
-# "hostdata" stores the Hobbit client messages on disk when some status for a host
-# changes. This lets you access a lot of data collected from a host around the time
-# when a problem occurred. However, it may use a significant amount of disk space
-# if you have lots of Hobbit clients.
-# Note: The --store-clientlogs option for the [hobbitd] provides control over
-#       which status-changes will cause a client message to be stored.
-[hostdata]
-	ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-	NEEDS hobbitd
-	CMD hobbitd_channel --channel=clichg --log=$BBSERVERLOGS/hostdata.log hobbitd_hostdata
-
-
-# "bbdata" saves information sent using the BB "data" protocol, like the old Big Brother 
-# daemon does. Unless you are using add-ons that directly access the data-files, you 
-# will not need to run this module, and it is recommended that you keep it disabled
-# since storing the raw data on disk can cause a significant load on your BB server.
-# RRD graphs uses data-files, but since RRD is handled by the hobbitd_rrd module, you do
-# not need to run the "bbdata" module to get RRD graphs.
-
-[bbdata]
-	DISABLED
-	ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-	NEEDS hobbitd
-	CMD hobbitd_channel --channel=data   --log=$BBSERVERLOGS/data.log hobbitd_filestore --data
-
-
-# "bbnotes" saves web note-files, that are sent using the BB "notes" protocol. This is
-# disabled by default; if you use the BB "notes" protocol, then you should enable this.
-
-[bbnotes]
-	DISABLED
-	ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-	NEEDS hobbitd
-	CMD hobbitd_channel --channel=notes  --log=$BBSERVERLOGS/notes.log hobbitd_filestore --notes
-
-
-# "bbenadis" updates the files used to indicate that a host or test has been enabled or disabled.
-# Unless you are running server side scripts that look at these files, you do not need this.
-
-[bbenadis]
-	DISABLED
-	ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-	NEEDS hobbitd
-	CMD hobbitd_channel --channel=enadis --log=$BBSERVERLOGS/enadis.log hobbitd_filestore --enadis
-
-
-# "bbpage" sends out alerts. Note that this module is NOT compatible with the old Big Brother
-# system - it uses a different configuration file to determine how alerts get sent. If you want
-# alerts to go out via pager, e-mail or some other means, then you must run this module.
-
-[bbpage]
-	ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-	NEEDS hobbitd
-	CMD hobbitd_channel --channel=page  --log=$BBSERVERLOGS/page.log hobbitd_alert --checkpoint-file=$BBTMP/alert.chk --checkpoint-interval=600
-
-
-# "rrdstatus" updates RRD files with information that arrives as "status" messages.
-# If you want RRD graphs of your monitoring data, then you want to run this.
-
-[rrdstatus]
-	ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-	NEEDS hobbitd
-	CMD hobbitd_channel --channel=status --log=$BBSERVERLOGS/rrd-status.log hobbitd_rrd --rrddir=$BBVAR/rrd
-
-# "rrddata" updates RRD files with information that arrives as "data" messages.
-# If you want RRD graphs of your monitoring BB data, then you want to run this.
-
-[rrddata]
-	ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-	NEEDS hobbitd
-	CMD hobbitd_channel --channel=data   --log=$BBSERVERLOGS/rrd-data.log hobbitd_rrd --rrddir=$BBVAR/rrd
-
-# The client back-end module. You need this if you are running the Hobbit client on any system.
-[clientdata]
-	ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-	NEEDS hobbitd
-	CMD hobbitd_channel --channel=client --log=$BBSERVERLOGS/clientdata.log hobbitd_client
-
-
-# "bbproxy" is the Hobbit proxy server that allows you to forward status messages
-# from a protected network to your Hobbit server. It is not enabled by default,
-# since it would conflict with the hobbitd task.
-# If you need to run this, then disabled hobbitd and the hobbitd-modules
-# above, then enable this. Make sure you enter the IP-address of your 
-# Hobbit server in the command-line, so that the proxy knows where to forward
-# status messages.
-[bbproxy]
-	DISABLED
-	ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-	CMD $BBHOME/bin/bbproxy --hobbitd --bbdisplay=YOUR.HOBBIT.SERVER.IP --report=$MACHINE.bbproxy --no-daemon --pidfile=$BBSERVERLOGS/bbproxy.pid
-	LOGFILE $BBSERVERLOGS/bbproxy.log
-
-
-# "hobbitfetch" is used when you have clients that cannot connect to your Hobbit server,
-# but the Hobbit server can connect to the client. Normally the clients will initiate
-# a connection to the Hobbit server to deliver the data they collect, but this is
-# forbidden in some firewall setups. By enabling the hobbitfetch task, hosts that have
-# the "pulldata" tag in the bb-hosts file will be polled by hobbitfetch for their data.
-#
-# NOTE: On the clients you must enable the "msgcache" task, since this is what 
-#       hobbitfetch is talking to.
-[hobbitfetch]
-	DISABLED
-	ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-	CMD $BBHOME/bin/hobbitfetch --server=YOUR.HOBBIT.SERVER.IP --no-daemon --pidfile=$BBSERVERLOGS/hobbitfetch.pid
-	LOGFILE $BBSERVERLOGS/hobbitfetch.log
-
-
-# "bbdisplay" runs the bbgen tool to generate the Hobbit webpages from the status information that
-# has been received. Big Brother updated the webpages once every 5 minutes. The default here is to
-# run it every minute for faster updates, but you can change it if you have a highly loaded server
-# and dont need updates that often.
-
-[bbdisplay]
-	ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-	NEEDS hobbitd
-	GROUP generators
-	CMD bbgen $BBGENOPTS --report
-	LOGFILE $BBSERVERLOGS/bb-display.log
-	INTERVAL 1m
-
-# bbcombotest is an extension script for the Hobbit display server. It generates
-# status messages that are combined from the status of one or more normal statuses.
-# It is controlled via the bbcombotest.cfg file.
-[bbcombotest]
-	ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-	NEEDS hobbitd
-	CMD $BBHOME/bin/bbcombotest
-	LOGFILE $BBSERVERLOGS/bbcombotest.log
-	INTERVAL 5m
-
-# "bbnet" runs the bbtest-net tool to perform the network based tests - i.e. http, smtp, ssh, dns and
-# all of the various network protocols we need to test.
-
-[bbnet]
-	ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-	NEEDS hobbitd
-	CMD bbtest-net --report --ping --checkresponse
-	LOGFILE $BBSERVERLOGS/bb-network.log
-	INTERVAL 5m
-
-
-# "bbretest" picks up the tests that the normal network test consider "failed", and re-does those
-# tests more often. This enables Big Brother to pick up a recovered network service faster than
-# if it were tested only by the "bbnet" task (which only runs every 5 minutes). So if you have
-# servers with very high availability guarantees, running this task will make your availability
-# reports look much better.
-
-[bbretest]
-	ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-	NEEDS hobbitd
-	CMD $BBHOME/ext/bbretest-net.sh
-	LOGFILE $BBSERVERLOGS/bb-retest.log
-	INTERVAL 1m
-
-
-# "hobbitclient" runs the Hobbit client. The client is installed automatically
-# when you install a Hobbit server (presumably, you do want to monitor the 
-# Hobbit server ?), but there's no need to have two hobbitlaunch instances
-# running at the same time. So we'll just run it from here.
-# Note: If you are using another client package, you should disable this one.
-
-[hobbitclient]
-	ENVFILE /data/srv/hobbit/client/etc/hobbitclient.cfg
-	NEEDS hobbitd
-	CMD /data/srv/hobbit/client/bin/hobbitclient.sh
-	LOGFILE $BBSERVERLOGS/hobbitclient.log
-	INTERVAL 5m
-
diff --git a/abs/mv-core/hobbitmon/diffs/hobbitserver.cfg b/abs/mv-core/hobbitmon/diffs/hobbitserver.cfg
deleted file mode 100644
index 42fc4c7..0000000
--- a/abs/mv-core/hobbitmon/diffs/hobbitserver.cfg
+++ /dev/null
@@ -1,226 +0,0 @@
-# NB : Even though it might look like a shell-script, it is NOT.
-#
-BBSERVERROOT="/data/srv/hobbit"		# Where Hobbit is installed - holds the server and bbvar sub-dirs.
-BBSERVERLOGS="/var/log/hobbit"		# Directory for server logs. The hobbit user must have write-access here.
-HOBBITCLIENTHOME="/data/srv/hobbit/client"    # BBHOME directory for the client
-
-
-BBSERVERHOSTNAME="localhost"		# The hostname of your server
-BBSERVERIP="127.0.0.1"			# The IP-address of your server. Use the real one, not 127.0.0.1 .
-BBSERVEROS="linux"			# The operating system of your server. linux,freebsd,solaris,hpux,aix,osf
-
-BBSERVERWWWNAME="localhost"		# The name used for this hosts' webserver
-BBSERVERWWWURL="/hobbit"		# The top URL for the Hobbit webpages
-BBSERVERCGIURL="/hobbit/hobbit-cgi"		# The URL for the Hobbit CGI scripts.
-BBSERVERSECURECGIURL="/hobbit/hobbit-seccgi"	# The URL for the secured Hobbit CGI scripts.
-
-# BBLOCATION="foo"			# The network location, makes bbtest-net test only hosts with NET:foo
-					# You only need to set this if you have multiple network test servers with
-					# a shared bb-hosts file.
-
-# Make sure the path includes the directories where you have fping, mail and (optionally) ntpdate installed,
-# as well as the BBHOME/bin directory where all of the Hobbit programs reside.
-PATH="/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/data/srv/hobbit/server/bin"
-
-# Some systems need extra settings e.g. to locate run-time libraries.
-# You can add these extra settings here:
-
-
-
-##### Normally you do not need to modify anything below this point #####
-
-# General settings
-BBPORT="1984"			# Portnumber where hobbitd/bbd listens
-BBDISP="$BBSERVERIP"		# IP of a single hobbit/bbd server
-BBDISPLAYS=""			# IP of multiple hobbit/bbd servers. If used, BBDISP must be 0.0.0.0
-FQDN="TRUE"			# Use fully-qualified hostnames internally. Keep it TRUE unless you know better.
-BBGHOSTS="1"                    # How to handle status messages from unknown hosts.
-                                # 0=accept message, 1=discard message, 2=discard message and log the event
-BBLOGSTATUS="DYNAMIC"		# Are HTML status logs statically or dynamically generated?
-				# Use DYNAMIC with Hobbit, unless you run hobbitd_filestore --status --html
-
-PINGCOLUMN="conn"		# Column where the ping-test reports results.
-INFOCOLUMN="info"		# Column where the info-pages are reported.
-TRENDSCOLUMN="trends"		# Column where the RRD graphs are reported.
-
-BBMAXMSGSPERCOMBO="100"         # How many individual messages to combine in a combo-message. 0=unlimited.
-BBSLEEPBETWEENMSGS="0"          # Delay between sending each combo message, in milliseconds.
-
-
-# Specific to this host
-BBOSTYPE="$BBSERVEROS"		# Hosttype (operating system). Not used by server-side, but clients use this.
-MACHINEDOTS="$BBSERVERHOSTNAME"	# This systems hostname
-MACHINEADDR="$BBSERVERIP"	# This systems IP-address
-
-# URL's generated/used by bbgen
-BBWEBHOST="http://$BBSERVERWWWNAME"		# Just the host part of the URL - http://www.foo.com
-BBWEBHOSTURL="$BBWEBHOST$BBSERVERWWWURL"	# Prefix for all static Hobbit pages - http://www.foo.com/bb
-BBWEBHTMLLOGS="$BBWEBHOSTURL/html"		# Prefix for the Hobbit HTML logs (only if BBLOGSTATUS=STATIC)
-BBWEB="$BBSERVERWWWURL"				# Hobbit URL prefix without the host part
-BBSKIN="$BBSERVERWWWURL/gifs"			# Hobbit URL prefix for the GIF files
-BBHELPSKIN="$BBSERVERWWWURL/help"               # Hobbit URL prefix for the online help files.
-BBNOTESSKIN="$BBSERVERWWWURL/notes"             # Hobbit URL prefix for the online notes-files.
-BBMENUSKIN="$BBSERVERWWWURL/menu"               # Hobbit URL prefix for the webpage menu files.
-BBREPURL="$BBSERVERWWWURL/rep"			# Hobbit URL prefix for the Hobbit availability reports
-BBSNAPURL="$BBSERVERWWWURL/snap"		# Hobbit URL prefix for the Hobbit snapshots
-BBWAP="$BBSERVERWWWURL/wml"			# Hobbit URL prefix for the WAP/WML files.
-CGIBINURL="$BBSERVERCGIURL"			# URL prefix for the Hobbit CGI-scripts - /cgi-bin
-SECURECGIBINURL="$BBSERVERSECURECGIURL"		# URL prefix for the secured Hobbit CGI-scripts - /cgi-secure
-
-# Locations of system-wide files and directories
-BBHOME="/data/srv/hobbit/server"				# The Hobbit server directory, where programs and configurations go. 
-BBTMP="$BBHOME/tmp"				# Directory used for temporary files.
-BBHOSTS="$BBHOME/etc/bb-hosts"			# The bb-hosts file
-BB="$BBHOME/bin/bb"				# The 'bb' client program
-BBGEN="$BBHOME/bin/bbgen"			# The bbgen program
-
-# Server specific directories
-BBVAR="/data/srv/hobbit/var"					# The bbvar directory holds all monitoring data
-BBACKS="$BBVAR/acks"				# Acknowledge event info stored here (hobbitd_alert)
-BBDATA="$BBVAR/data"				# Data files go here (hobbitd_filestore --data)
-BBDISABLED="$BBVAR/disabled"			# Enabled/disabled flags are stored here (hobbitd_filestore --enadis)
-BBHIST="$BBVAR/hist"				# History logs are stored here (hobbitd_history)
-BBHISTLOGS="$BBVAR/histlogs"			# Historical detail status-loge are stored here (hobbitd_history)
-BBLOGS="$BBVAR/logs"				# Status logs go here (hobbitd_filestore --status). Not needed by Hobbit.
-BBWWW="$BBHOME/www"				# The directory for Hobbit webpage files.
-BBHTML="$BBWWW/html"				# HTML status logs go here (hobbitd_filestore --status --html)
-BBNOTES="$BBWWW/notes"				# For notes-files (hobbitd_filestore --notes)
-BBREP="$BBWWW/rep"				# Top-level directory for Hobbit reports.
-BBSNAP="$BBWWW/snap"				# Top-level directory for Hobbit snapshots.
-
-# For the hobbitd_history module
-BBALLHISTLOG="TRUE"				# Save a common log of all events (used for the bb2 webpage)
-BBHOSTHISTLOG="TRUE"				# Save a log of all events for a host (not used by any tool currently)
-SAVESTATUSLOG="TRUE"				# Save the detailed status log each time the status changes.
-
-# For the hobbitd_alert module
-MAILC="mail"				# Command used to send an e-mail with no subject
-MAIL="$MAILC -s"				# Command used to send an e-mail with a subject
-SVCCODES="disk:100,cpu:200,procs:300,svcs:350,msgs:400,conn:500,http:600,dns:800,smtp:725,telnet:723,ftp:721,pop:810,pop3:810,pop-3:810,ssh:722,imap:843,ssh1:722,ssh2:722,imap2:843,imap3:843,imap4:843,pop2:809,pop-2:809,nntp:819,test:901"
-ALERTCOLORS="red,yellow,purple"			# Colors that may trigger an alert message
-OKCOLORS="green,blue,clear"			# Colors that may trigger a recovery message
-ALERTREPEAT="30"				# The default interval between repeated alert-messages (in minutes)
-
-# For bbtest-net
-CONNTEST="TRUE"					# Should we 'ping' hosts ?
-IPTEST_2_CLEAR_ON_FAILED_CONN="TRUE"		# If TRUE, then failing network tests go CLEAR if conn-test fails.
-NONETPAGE=""					# Network tests that go YELLOW upon failure
-FPING="hobbitping"					# Path and options for the ping program.
-NTPDATE="ntpdate"				# Path to the 'ntpdate' program
-TRACEROUTE="traceroute"                         # How to do traceroute on failing ping tests. Requires "trace" in bb-hosts.
-BBROUTERTEXT="router"				# What to call a failing intermediate network device.
-NETFAILTEXT="not OK"				# Text indicating a network test failed
-
-
-# Settings for the RRD graphs
-
-# Top level directory for the RRD files
-BBRRDS="$BBVAR/rrd"
-
-# Size of the generated graph images
-RRDHEIGHT="120"
-RRDWIDTH="576"		# The RRD's contain 576 data points, so this is a good value
-NCV_storage="*:GAUGE"
-NCV_memmbe="*:GAUGE"
-NCV_memmfe="*:GAUGE"
-# TEST2RRD defines the status- and data-messages you want to collect RRD data
-# about. You will normally not need to modify this, unless you have added a
-# script to pick up RRD data from custom tests (the hobbitd_larrd --extra-script
-# and --extra-tests options).
-# Note that network tests defined in the bb-services file are automatically
-# included.
-# The format here is "COLUMN=RRDSERVICE". If you leave out the "=RRDSERVICE"
-# part, it is assumed to be the same as the COLUMN value.
-#
-# This is also used by the bb-hostsvc.cgi script to determine if the detailed
-# status view of a test should include a graph.
-TEST2RRD="cpu=la,disk,inode,qtree,memory,$PINGCOLUMN=tcp,http=tcp,dns=tcp,dig=tcp,time=ntpstat,vmstat,iostat,netstat,temperature,apache,bind,sendmail,mailq,nmailq=mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,files,procs=processes,ports,clock,lines,storage=ncv,memmbe=ncv,memmfe=ncv"
-
-# This defines which RRD files to include on the "trends" column webpage,
-# and the order in which they appear.
-GRAPHS="la,disk,inode,qtree,files,processes,memory,users,vmstat,iostat,tcp.http,tcp,ncv,netstat,ifstat,mrtg::1,ports,temperature,ntpstat,apache,bind,sendmail,mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,clock,lines,storage,memmbe,memmfe"
-
-# These two settings can be used to restrict what filesystems are being
-# tracked (i.e. have their utilisation graphed) by Hobbit.
-# NORRDDISKS=""		# Filesystems that will NOT be tracked
-# RRDDISKS=""		# Only track these filesystems
-
-
-############################################################
-# These determine some parts of how bbgen generates webpages
-############################################################
-BBGENOPTS="--recentgifs --subpagecolumns=2"     # Standard options for bbgen.
-SUMMARY_SET_BKG="FALSE"				# Do summaries affect the background color of the BB webpage ?
-BBMKBB2EXT="eventlog.sh acklog.sh"		# What extensions to have on the BB2 page.
-DOTHEIGHT="16"					# Height (in pixels) of the color GIF's
-DOTWIDTH="16"					# Width (in pixels) of the color GIF's
-COLUMNDOCURL="$CGIBINURL/hobbitcolumn.sh?%s"	# URL formatting string for column-links
-
-# HTML content
-HTMLCONTENTTYPE="text/html"                     # You can add charset options here.
-
-# Fonts and texts
-HOBBITLOGO=""                             # HTML inserted on all header pages at top-left corner.
-MKBBLOCAL="<B><I>Pages Hosted Locally</I></B>"
-MKBBREMOTE="<B><I>Remote Status Display</I></B>"
-MKBBSUBLOCAL="<B><I>Subpages Hosted Locally</I></B>"
-MKBBACKFONT="COLOR=\"#33ebf4\" SIZE=\"-1\""	# Size and color of the 'Current acknowledgement...' text in the html log.
-MKBBCOLFONT="COLOR=\"#87a9e5\" SIZE=\"-1\""	# Size and color of the column headings text
-MKBBROWFONT="SIZE=\"+1\" COLOR=\"#FFFFCC\" FACE=\"Tahoma, Arial, Helvetica\""   # Size,color,font of text in each row (hostname)
-MKBBTITLE="COLOR=\"#FFFFF0\" SIZE=\"+1\""	# Size and color of the BB titles (the old "ivory" is invalid HTML)
-BBDATEFORMAT="%a %b %d %H:%M:%S %Y"		# Date format
-BBRSSTITLE="Hobbit Alerts"			# Title for the RSS and WML outputs.
-ACKUNTILMSG="Next update at: %H:%M %Y-%m-%d"    # strftime format for the acknowledgement status display.
-
-# For WML output
-WMLMAXCHARS="1500"				# Max number of bytes in a WAP message
-
-# For BB reports
-BBREPWARN="97"					# Default availability causing yellow status on availability report.
-BBREPGREEN="99.995"				# Default availability causing green status on availability report.
-BBGENREPOPTS="$BBGENOPTS"			# bbgen(1) options used when generating availability reports.
-BBREPEXT=""					# What extensions to run on report pages.
-
-# For BB snapshots
-BBGENSNAPOPTS="$BBGENOPTS"			# bbgen(1) options used when generating snapshots.
-
-# For the bb-hist CGI 
-BBHISTEXT=""					# What extensions to run on history pages.
-
-
-# The following defines a bunch of commands that BB extensions expect to be present.
-# Hobbit does not use them, but they are provided here so if you use BB extension
-# scripts, then they will hopefully run without having to do a lot of tweaking.
-
-UPTIME=""
-AWK="/bin/awk"
-CAT="/bin/cat"
-CP="/bin/cp"
-CUT="/bin/cut"
-DATE="/bin/date"
-EGREP="/bin/egrep"
-EXPR="/usr/bin/expr"
-FIND="/usr/bin/find"
-GREP="/bin/grep"
-HEAD="/usr/bin/head"
-ID="/usr/bin/id"
-LN="/bin/ln"
-LS="/bin/ls"
-MV="/bin/mv"
-RM="/bin/rm"
-SED="/bin/sed"
-SORT="/usr/bin/sort"
-TAIL="/usr/bin/tail"
-TOUCH="/bin/touch"
-TR="/bin/tr"
-UNIQ="/usr/bin/uniq"
-WHO="/usr/bin/who"
-TOP=""
-WC="/usr/bin/wc -l"
-WCC="/usr/bin/wc"
-# DF,DFCMD and PS are for compatibility only, NOT USED by the Hobbit client
-DF="/bin/df -Pk"
-DFCMD="/bin/df -Pk"
-PS="ps ax"
-
-MAXLINE="32768"
diff --git a/abs/mv-core/hobbitmon/diffs/hobbitserver.cfg.diff b/abs/mv-core/hobbitmon/diffs/hobbitserver.cfg.diff
deleted file mode 100644
index 7c829fe..0000000
--- a/abs/mv-core/hobbitmon/diffs/hobbitserver.cfg.diff
+++ /dev/null
@@ -1,45 +0,0 @@
---- hobbitserver.cfg.orig	2008-01-08 15:25:34.000000000 +0000
-+++ hobbitserver.cfg	2008-01-08 16:22:56.000000000 +0000
-@@ -105,7 +105,7 @@
- CONNTEST="TRUE"					# Should we 'ping' hosts ?
- IPTEST_2_CLEAR_ON_FAILED_CONN="TRUE"		# If TRUE, then failing network tests go CLEAR if conn-test fails.
- NONETPAGE=""					# Network tests that go YELLOW upon failure
--FPING="/usr/sbin/fping"					# Path and options for the ping program.
-+FPING="hobbitping"					# Path and options for the ping program.
- NTPDATE="ntpdate"				# Path to the 'ntpdate' program
- TRACEROUTE="traceroute"                         # How to do traceroute on failing ping tests. Requires "trace" in bb-hosts.
- BBROUTERTEXT="router"				# What to call a failing intermediate network device.
-@@ -120,7 +120,9 @@
- # Size of the generated graph images
- RRDHEIGHT="120"
- RRDWIDTH="576"		# The RRD's contain 576 data points, so this is a good value
--
-+NCV_storage="*:GAUGE"
-+NCV_memmbe="*:GAUGE"
-+NCV_memmfe="*:GAUGE"
- # TEST2RRD defines the status- and data-messages you want to collect RRD data
- # about. You will normally not need to modify this, unless you have added a
- # script to pick up RRD data from custom tests (the hobbitd_larrd --extra-script
-@@ -132,11 +134,11 @@
- #
- # This is also used by the bb-hostsvc.cgi script to determine if the detailed
- # status view of a test should include a graph.
--TEST2RRD="cpu=la,disk,inode,qtree,memory,$PINGCOLUMN=tcp,http=tcp,dns=tcp,dig=tcp,time=ntpstat,vmstat,iostat,netstat,temperature,apache,bind,sendmail,mailq,nmailq=mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,files,procs=processes,ports,clock,lines"
-+TEST2RRD="cpu=la,disk,inode,qtree,memory,$PINGCOLUMN=tcp,http=tcp,dns=tcp,dig=tcp,time=ntpstat,vmstat,iostat,netstat,temperature,apache,bind,sendmail,mailq,nmailq=mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,files,procs=processes,ports,clock,lines,storage=ncv,memmbe=ncv,memmfe=ncv"
- 
- # This defines which RRD files to include on the "trends" column webpage,
- # and the order in which they appear.
--GRAPHS="la,disk,inode,qtree,files,processes,memory,users,vmstat,iostat,tcp.http,tcp,ncv,netstat,ifstat,mrtg::1,ports,temperature,ntpstat,apache,bind,sendmail,mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,clock,lines"
-+GRAPHS="la,disk,inode,qtree,files,processes,memory,users,vmstat,iostat,tcp.http,tcp,ncv,netstat,ifstat,mrtg::1,ports,temperature,ntpstat,apache,bind,sendmail,mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,clock,lines,storage,memmbe,memmfe"
- 
- # These two settings can be used to restrict what filesystems are being
- # tracked (i.e. have their utilisation graphed) by Hobbit.
-@@ -158,7 +160,7 @@
- HTMLCONTENTTYPE="text/html"                     # You can add charset options here.
- 
- # Fonts and texts
--HOBBITLOGO="Hobbit"                             # HTML inserted on all header pages at top-left corner.
-+HOBBITLOGO=""                             # HTML inserted on all header pages at top-left corner.
- MKBBLOCAL="<B><I>Pages Hosted Locally</I></B>"
- MKBBREMOTE="<B><I>Remote Status Display</I></B>"
- MKBBSUBLOCAL="<B><I>Subpages Hosted Locally</I></B>"
diff --git a/abs/mv-core/hobbitmon/diffs/hobbitserver.cfg.orig b/abs/mv-core/hobbitmon/diffs/hobbitserver.cfg.orig
deleted file mode 100644
index 2ba56f5..0000000
--- a/abs/mv-core/hobbitmon/diffs/hobbitserver.cfg.orig
+++ /dev/null
@@ -1,224 +0,0 @@
-# NB : Even though it might look like a shell-script, it is NOT.
-#
-BBSERVERROOT="/data/srv/hobbit"		# Where Hobbit is installed - holds the server and bbvar sub-dirs.
-BBSERVERLOGS="/var/log/hobbit"		# Directory for server logs. The hobbit user must have write-access here.
-HOBBITCLIENTHOME="/data/srv/hobbit/client"    # BBHOME directory for the client
-
-
-BBSERVERHOSTNAME="localhost"		# The hostname of your server
-BBSERVERIP="127.0.0.1"			# The IP-address of your server. Use the real one, not 127.0.0.1 .
-BBSERVEROS="linux"			# The operating system of your server. linux,freebsd,solaris,hpux,aix,osf
-
-BBSERVERWWWNAME="localhost"		# The name used for this hosts' webserver
-BBSERVERWWWURL="/hobbit"		# The top URL for the Hobbit webpages
-BBSERVERCGIURL="/hobbit/hobbit-cgi"		# The URL for the Hobbit CGI scripts.
-BBSERVERSECURECGIURL="/hobbit/hobbit-seccgi"	# The URL for the secured Hobbit CGI scripts.
-
-# BBLOCATION="foo"			# The network location, makes bbtest-net test only hosts with NET:foo
-					# You only need to set this if you have multiple network test servers with
-					# a shared bb-hosts file.
-
-# Make sure the path includes the directories where you have fping, mail and (optionally) ntpdate installed,
-# as well as the BBHOME/bin directory where all of the Hobbit programs reside.
-PATH="/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin:/data/srv/hobbit/server/bin"
-
-# Some systems need extra settings e.g. to locate run-time libraries.
-# You can add these extra settings here:
-
-
-
-##### Normally you do not need to modify anything below this point #####
-
-# General settings
-BBPORT="1984"			# Portnumber where hobbitd/bbd listens
-BBDISP="$BBSERVERIP"		# IP of a single hobbit/bbd server
-BBDISPLAYS=""			# IP of multiple hobbit/bbd servers. If used, BBDISP must be 0.0.0.0
-FQDN="TRUE"			# Use fully-qualified hostnames internally. Keep it TRUE unless you know better.
-BBGHOSTS="1"                    # How to handle status messages from unknown hosts.
-                                # 0=accept message, 1=discard message, 2=discard message and log the event
-BBLOGSTATUS="DYNAMIC"		# Are HTML status logs statically or dynamically generated?
-				# Use DYNAMIC with Hobbit, unless you run hobbitd_filestore --status --html
-
-PINGCOLUMN="conn"		# Column where the ping-test reports results.
-INFOCOLUMN="info"		# Column where the info-pages are reported.
-TRENDSCOLUMN="trends"		# Column where the RRD graphs are reported.
-
-BBMAXMSGSPERCOMBO="100"         # How many individual messages to combine in a combo-message. 0=unlimited.
-BBSLEEPBETWEENMSGS="0"          # Delay between sending each combo message, in milliseconds.
-
-
-# Specific to this host
-BBOSTYPE="$BBSERVEROS"		# Hosttype (operating system). Not used by server-side, but clients use this.
-MACHINEDOTS="$BBSERVERHOSTNAME"	# This systems hostname
-MACHINEADDR="$BBSERVERIP"	# This systems IP-address
-
-# URL's generated/used by bbgen
-BBWEBHOST="http://$BBSERVERWWWNAME"		# Just the host part of the URL - http://www.foo.com
-BBWEBHOSTURL="$BBWEBHOST$BBSERVERWWWURL"	# Prefix for all static Hobbit pages - http://www.foo.com/bb
-BBWEBHTMLLOGS="$BBWEBHOSTURL/html"		# Prefix for the Hobbit HTML logs (only if BBLOGSTATUS=STATIC)
-BBWEB="$BBSERVERWWWURL"				# Hobbit URL prefix without the host part
-BBSKIN="$BBSERVERWWWURL/gifs"			# Hobbit URL prefix for the GIF files
-BBHELPSKIN="$BBSERVERWWWURL/help"               # Hobbit URL prefix for the online help files.
-BBNOTESSKIN="$BBSERVERWWWURL/notes"             # Hobbit URL prefix for the online notes-files.
-BBMENUSKIN="$BBSERVERWWWURL/menu"               # Hobbit URL prefix for the webpage menu files.
-BBREPURL="$BBSERVERWWWURL/rep"			# Hobbit URL prefix for the Hobbit availability reports
-BBSNAPURL="$BBSERVERWWWURL/snap"		# Hobbit URL prefix for the Hobbit snapshots
-BBWAP="$BBSERVERWWWURL/wml"			# Hobbit URL prefix for the WAP/WML files.
-CGIBINURL="$BBSERVERCGIURL"			# URL prefix for the Hobbit CGI-scripts - /cgi-bin
-SECURECGIBINURL="$BBSERVERSECURECGIURL"		# URL prefix for the secured Hobbit CGI-scripts - /cgi-secure
-
-# Locations of system-wide files and directories
-BBHOME="/data/srv/hobbit/server"				# The Hobbit server directory, where programs and configurations go. 
-BBTMP="$BBHOME/tmp"				# Directory used for temporary files.
-BBHOSTS="$BBHOME/etc/bb-hosts"			# The bb-hosts file
-BB="$BBHOME/bin/bb"				# The 'bb' client program
-BBGEN="$BBHOME/bin/bbgen"			# The bbgen program
-
-# Server specific directories
-BBVAR="/data/srv/hobbit/var"					# The bbvar directory holds all monitoring data
-BBACKS="$BBVAR/acks"				# Acknowledge event info stored here (hobbitd_alert)
-BBDATA="$BBVAR/data"				# Data files go here (hobbitd_filestore --data)
-BBDISABLED="$BBVAR/disabled"			# Enabled/disabled flags are stored here (hobbitd_filestore --enadis)
-BBHIST="$BBVAR/hist"				# History logs are stored here (hobbitd_history)
-BBHISTLOGS="$BBVAR/histlogs"			# Historical detail status-loge are stored here (hobbitd_history)
-BBLOGS="$BBVAR/logs"				# Status logs go here (hobbitd_filestore --status). Not needed by Hobbit.
-BBWWW="$BBHOME/www"				# The directory for Hobbit webpage files.
-BBHTML="$BBWWW/html"				# HTML status logs go here (hobbitd_filestore --status --html)
-BBNOTES="$BBWWW/notes"				# For notes-files (hobbitd_filestore --notes)
-BBREP="$BBWWW/rep"				# Top-level directory for Hobbit reports.
-BBSNAP="$BBWWW/snap"				# Top-level directory for Hobbit snapshots.
-
-# For the hobbitd_history module
-BBALLHISTLOG="TRUE"				# Save a common log of all events (used for the bb2 webpage)
-BBHOSTHISTLOG="TRUE"				# Save a log of all events for a host (not used by any tool currently)
-SAVESTATUSLOG="TRUE"				# Save the detailed status log each time the status changes.
-
-# For the hobbitd_alert module
-MAILC="mail"				# Command used to send an e-mail with no subject
-MAIL="$MAILC -s"				# Command used to send an e-mail with a subject
-SVCCODES="disk:100,cpu:200,procs:300,svcs:350,msgs:400,conn:500,http:600,dns:800,smtp:725,telnet:723,ftp:721,pop:810,pop3:810,pop-3:810,ssh:722,imap:843,ssh1:722,ssh2:722,imap2:843,imap3:843,imap4:843,pop2:809,pop-2:809,nntp:819,test:901"
-ALERTCOLORS="red,yellow,purple"			# Colors that may trigger an alert message
-OKCOLORS="green,blue,clear"			# Colors that may trigger a recovery message
-ALERTREPEAT="30"				# The default interval between repeated alert-messages (in minutes)
-
-# For bbtest-net
-CONNTEST="TRUE"					# Should we 'ping' hosts ?
-IPTEST_2_CLEAR_ON_FAILED_CONN="TRUE"		# If TRUE, then failing network tests go CLEAR if conn-test fails.
-NONETPAGE=""					# Network tests that go YELLOW upon failure
-FPING="/usr/sbin/fping"					# Path and options for the ping program.
-NTPDATE="ntpdate"				# Path to the 'ntpdate' program
-TRACEROUTE="traceroute"                         # How to do traceroute on failing ping tests. Requires "trace" in bb-hosts.
-BBROUTERTEXT="router"				# What to call a failing intermediate network device.
-NETFAILTEXT="not OK"				# Text indicating a network test failed
-
-
-# Settings for the RRD graphs
-
-# Top level directory for the RRD files
-BBRRDS="$BBVAR/rrd"
-
-# Size of the generated graph images
-RRDHEIGHT="120"
-RRDWIDTH="576"		# The RRD's contain 576 data points, so this is a good value
-
-# TEST2RRD defines the status- and data-messages you want to collect RRD data
-# about. You will normally not need to modify this, unless you have added a
-# script to pick up RRD data from custom tests (the hobbitd_larrd --extra-script
-# and --extra-tests options).
-# Note that network tests defined in the bb-services file are automatically
-# included.
-# The format here is "COLUMN=RRDSERVICE". If you leave out the "=RRDSERVICE"
-# part, it is assumed to be the same as the COLUMN value.
-#
-# This is also used by the bb-hostsvc.cgi script to determine if the detailed
-# status view of a test should include a graph.
-TEST2RRD="cpu=la,disk,inode,qtree,memory,$PINGCOLUMN=tcp,http=tcp,dns=tcp,dig=tcp,time=ntpstat,vmstat,iostat,netstat,temperature,apache,bind,sendmail,mailq,nmailq=mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,files,procs=processes,ports,clock,lines"
-
-# This defines which RRD files to include on the "trends" column webpage,
-# and the order in which they appear.
-GRAPHS="la,disk,inode,qtree,files,processes,memory,users,vmstat,iostat,tcp.http,tcp,ncv,netstat,ifstat,mrtg::1,ports,temperature,ntpstat,apache,bind,sendmail,mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,clock,lines"
-
-# These two settings can be used to restrict what filesystems are being
-# tracked (i.e. have their utilisation graphed) by Hobbit.
-# NORRDDISKS=""		# Filesystems that will NOT be tracked
-# RRDDISKS=""		# Only track these filesystems
-
-
-############################################################
-# These determine some parts of how bbgen generates webpages
-############################################################
-BBGENOPTS="--recentgifs --subpagecolumns=2"     # Standard options for bbgen.
-SUMMARY_SET_BKG="FALSE"				# Do summaries affect the background color of the BB webpage ?
-BBMKBB2EXT="eventlog.sh acklog.sh"		# What extensions to have on the BB2 page.
-DOTHEIGHT="16"					# Height (in pixels) of the color GIF's
-DOTWIDTH="16"					# Width (in pixels) of the color GIF's
-COLUMNDOCURL="$CGIBINURL/hobbitcolumn.sh?%s"	# URL formatting string for column-links
-
-# HTML content
-HTMLCONTENTTYPE="text/html"                     # You can add charset options here.
-
-# Fonts and texts
-HOBBITLOGO="Hobbit"                             # HTML inserted on all header pages at top-left corner.
-MKBBLOCAL="<B><I>Pages Hosted Locally</I></B>"
-MKBBREMOTE="<B><I>Remote Status Display</I></B>"
-MKBBSUBLOCAL="<B><I>Subpages Hosted Locally</I></B>"
-MKBBACKFONT="COLOR=\"#33ebf4\" SIZE=\"-1\""	# Size and color of the 'Current acknowledgement...' text in the html log.
-MKBBCOLFONT="COLOR=\"#87a9e5\" SIZE=\"-1\""	# Size and color of the column headings text
-MKBBROWFONT="SIZE=\"+1\" COLOR=\"#FFFFCC\" FACE=\"Tahoma, Arial, Helvetica\""   # Size,color,font of text in each row (hostname)
-MKBBTITLE="COLOR=\"#FFFFF0\" SIZE=\"+1\""	# Size and color of the BB titles (the old "ivory" is invalid HTML)
-BBDATEFORMAT="%a %b %d %H:%M:%S %Y"		# Date format
-BBRSSTITLE="Hobbit Alerts"			# Title for the RSS and WML outputs.
-ACKUNTILMSG="Next update at: %H:%M %Y-%m-%d"    # strftime format for the acknowledgement status display.
-
-# For WML output
-WMLMAXCHARS="1500"				# Max number of bytes in a WAP message
-
-# For BB reports
-BBREPWARN="97"					# Default availability causing yellow status on availability report.
-BBREPGREEN="99.995"				# Default availability causing green status on availability report.
-BBGENREPOPTS="$BBGENOPTS"			# bbgen(1) options used when generating availability reports.
-BBREPEXT=""					# What extensions to run on report pages.
-
-# For BB snapshots
-BBGENSNAPOPTS="$BBGENOPTS"			# bbgen(1) options used when generating snapshots.
-
-# For the bb-hist CGI 
-BBHISTEXT=""					# What extensions to run on history pages.
-
-
-# The following defines a bunch of commands that BB extensions expect to be present.
-# Hobbit does not use them, but they are provided here so if you use BB extension
-# scripts, then they will hopefully run without having to do a lot of tweaking.
-
-UPTIME=""
-AWK="/bin/awk"
-CAT="/bin/cat"
-CP="/bin/cp"
-CUT="/bin/cut"
-DATE="/bin/date"
-EGREP="/bin/egrep"
-EXPR="/usr/bin/expr"
-FIND="/usr/bin/find"
-GREP="/bin/grep"
-HEAD="/usr/bin/head"
-ID="/usr/bin/id"
-LN="/bin/ln"
-LS="/bin/ls"
-MV="/bin/mv"
-RM="/bin/rm"
-SED="/bin/sed"
-SORT="/usr/bin/sort"
-TAIL="/usr/bin/tail"
-TOUCH="/bin/touch"
-TR="/bin/tr"
-UNIQ="/usr/bin/uniq"
-WHO="/usr/bin/who"
-TOP=""
-WC="/usr/bin/wc -l"
-WCC="/usr/bin/wc"
-# DF,DFCMD and PS are for compatibility only, NOT USED by the Hobbit client
-DF="/bin/df -Pk"
-DFCMD="/bin/df -Pk"
-PS="ps ax"
-
-MAXLINE="32768"
diff --git a/abs/mv-core/hobbitmon/hbfunc.py b/abs/mv-core/hobbitmon/hbfunc.py
deleted file mode 100755
index 9cb66df..0000000
--- a/abs/mv-core/hobbitmon/hbfunc.py
+++ /dev/null
@@ -1,167 +0,0 @@
-#!/usr/bin/python
-#checks that the MBE can connect to the minions
-
-# ===============================================
-import sys
-import os
-import string
-import time
-import func.overlord.client as fc
-BBLINE = ''
-BBCOLOR="green"
-DATE = time.strftime("%a %b %d %H:%M:%S %Z %Y", time.localtime(time.time()))
-if os.environ['BB']:
-    #print os.environ['BB']
-    BB=os.environ['BB']
-if os.environ['BBDISP']:
-    #print os.environ['BBDISP']
-    BBDISP=os.environ['BBDISP']
-if os.environ['MACHINE']:
-     #print os.environ['MACHINE']
-     MACHINE=os.environ['MACHINE']
-
-
-
-def readbb():
-        global hostlist
-        global mythtype
-
-        try:
-                infile = open('/data/srv/hobbit/etc/bb-hosts', 'r')
-        except(IOError), e:
-          print "couldn't open bb-hosts file"
-          sys.exit(1)
-        else:
-                bbhostlist = infile.readlines()
-                infile.close()
-		for line in bbhostlist:
-			cline=line.strip()
-			if not cline.startswith("#") and cline != '' and cline.find("bbd") == -1 and cline.find("func") != -1  :
-				host=cline.split("#")
-				host=host[0].split()
-				hostlist.append(host[1].strip())
-		infile.close()
-        try:
-                infile = open('/usr/local/share/mythtv/.releasetype')
-                mythtype= infile.readline()
-                infile.close()
-        except(IOError), e:
-            print "couldn't open mythfile "
-            mythtype='unkown'
-
-def find_local_myth_version():
-    global mythtype
-    local_pkg_name="not_found"
-    pkgname="mythtv"
-    pkgname+=mythtype
-    cmd="/usr/bin/pacman -Q %s " %pkgname
-    result = os.popen2(cmd)[1].readlines()
-    for list in result:
-        l=list.strip()
-        if l.startswith('mythtv') :
-            local_pkg_name=l.strip()
-            break
-    return local_pkg_name
-
-
-def  mythversion_check(currentclient,local_myth_version):
-    global mythtype
-    pkgname="mythtv"
-    pkgname+=mythtype
-    remote_pkg_name="remote_pkg_not_found"
-    client = (fc.Client( currentclient ))
-    results=client.pacman.pkgversion(pkgname)
-    #print currentclient
-    #print local_myth_version
-    #print results[currentclient][1]
-    try:
-        for pkg in results[currentclient][1] :
-            p=pkg.strip()
-            if p.startswith('mythtv'):
-                remote_pkg_name=p
-                break
-        if (remote_pkg_name != local_myth_version):
-            BBLINE="Myth version MBE: %s does not match %s  %s \n " %(local_myth_version,currentclient,remote_pkg_name)
-            LINE = "status " + currentclient  + ".myth_version yellow" + " " + DATE + " " + BBLINE
-
-        if (remote_pkg_name == local_myth_version):
-            BBLINE="%s:  success (green) Myth version match %s \n " %(currentclient,remote_pkg_name)
-            LINE = "status " + currentclient  + ".myth_version green" + " " + DATE + " " + BBLINE
-    except:
-        BBLINE="Something went wrong! \n "
-        LINE = "status " + currentclient  + ".myth_version red" + " " + DATE + " " + BBLINE
-
-
-    cmd = BB + ' ' + BBDISP + ' "' + LINE + '"'
-    os.system(cmd)
-    return
-
-#-------------------------
-global hostlist
-global mythtype
-mythtype=""
-hostlist = []
-readbb()
-local_myth_version=find_local_myth_version()
-
-for currentclient in hostlist:
-    client = (fc.Client( currentclient ))
-    cmd='/data/srv/hobbit/server/bin/bb 127.0.0.1  "query '
-    cmd+=currentclient
-    cmd+='.conn"'
-    bbresults=os.popen(cmd,'r'	).readline().strip().split()
-    bbstate=bbresults[0]
-    if bbstate == 'green':
-        results=client.test.add("1","2")
-        try:
-            #print currentclient
-            #print results[currentclient]
-            #print type(results[currentclient])
-            #print "----------"
-            if  type(results[currentclient]) == str:
-                if results[currentclient] == '12':
-                    BBLINE="%s:  success (green) \n " %currentclient
-                    LINE = "status " + currentclient  + ".func green" + " " + DATE + " " + BBLINE
-                    cmd = BB + ' ' + BBDISP + ' "' + LINE + '"'
-                    os.system(cmd)
-                    #REMOVE HOST FROM FAILED_FUNC
-                    cmd='sed -i "/' +  currentclient + '/d" /data/srv/httpd/htdocs/failed_func_hosts'
-                    os.system(cmd)
-                    mythversion_check(currentclient,local_myth_version)
-                else:
-                    BBLINE="%s:  connected but wtf  (yellow)  \n " %currentclient
-                    LINE = "status " + currentclient  + ".func yellow" + " " + DATE + " " + BBLINE
-                    cmd = BB + ' ' + BBDISP + ' "' + LINE + '"'
-                    os.system(cmd)
-                    if BBCOLOR != "red":
-                        BBCOLOR="yellow"
-            else:
-                BBLINE="%s: %s  (red)  \n "  %(currentclient,results[currentclient])
-                LINE = "status " + currentclient  + ".func red" + " " + DATE + " " + BBLINE
-                cmd = BB + ' ' + BBDISP + ' "' + LINE + '"'
-                cmd2= "echo " + currentclient + " >> /data/srv/httpd/htdocs/failed_func_hosts"
-                cmd3="sudo /usr/bin/certmaster-ca -c " + currentclient
-                os.system(cmd2)
-                os.system(cmd3)
-                os.system(cmd)
-                BBCOLOR="red"
-        except:
-            BBLINE="%s had an error : %s (red) \n "   % (currentclient,str(results))
-            LINE = "status " + currentclient  + ".func red" + " " + DATE + " " + BBLINE
-            cmd = BB + ' ' + BBDISP + ' "' + LINE + '"'
-            cmd2= "echo " + currentclient + " >> /data/srv/httpd/htdocs/failed_func_hosts"
-            os.system(cmd)
-            os.system(cmd2)
-            cmd3="sudo /usr/bin/certmaster-ca -c " + currentclient
-            os.system(cmd3)
-            BBCOLOR="red"
-    else:
-        BBLINE+= "not testing %s \n "  % currentclient
-
-
-#LINE = "status " + MACHINE + ".func green" + " " + DATE + " " + BBLINE
-#cmd = BB + ' ' + BBDISP + ' "' + LINE + '"'
-#os.system(cmd)
-
-#print BBLINE
-#print BBCOLOR
diff --git a/abs/mv-core/hobbitmon/hbnotes.py b/abs/mv-core/hobbitmon/hbnotes.py
deleted file mode 100755
index 5300e88..0000000
--- a/abs/mv-core/hobbitmon/hbnotes.py
+++ /dev/null
@@ -1,344 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-# import MySQL module
-
-import MySQLdb
-import sys
-import getopt
-import socket
-import os
-global ignorehostlist
-try:
-    import  ignoreclient
-    ignorehostlist=ignoreclient.ignorehosts
-except:
-    print "could not find the ignore list"
-    ignorehostlist="'ignoreme'"
-
-
-
-
-
-def createdropdown():
-    dropdown='''
-     <input name="param2" type="radio"  value="Restore" />Restore database </>
-     <select name="param1">
-    '''
-    dir = "/data/database_backup"
-    files = os.listdir(dir)
-    for file in os.listdir(dir):
-        if (file.endswith(".tgz")):
-            dropdown+='<option value="' + file + '">' + file + '</option> '
-    dropdown+='</select> <br><input name="param2" type="radio" value="Backup" checked="checked" />Backup database<br />  '
-    dropdown+='<input name="param2" type="radio" value="Optimize"  />Optimize database<br />  '
-    dropdown+='<input name="param2" type="radio" value="ShutdownAll"  />Shutdown All Systems (expect MBE)<br />  '
-    dropdown+='''<input name="param2" type="radio"  value="UpdateAll" />Update All Systems </>           <select name="param5">
-                   <option value="Myth_only">Myth only</option>
-                   <option value="All"> Full System</option>
-           </select>
-       </br>
-       </br>
-           </br>'''
-    return dropdown
-
-def main(argv):
-    db = MySQLdb.connect(host="localhost", user="mythtv", passwd="mythtv", db="mythconverg")
-
-    # create a cursor
-    cursor = db.cursor()
-#------------------------------write client-config------------------------------------------------
-    SQL="SELECT DISTINCT(hostname) from settings where hostname not in(%s)"
-    cursor.execute(SQL %ignorehostlist)
-    result = cursor.fetchall()
-    frontonly="_FRONTEND_"
-    masterbackend="_MASTERBACKEND_"
-    masterbacked_w_fe="_MASTERFE_"
-    slave_w_fe="_SLAVEFE_"
-    slave="_SLAVEBACKEND_"
-    stand_alone="_STANDALONE_"
-    dotMBE=""
-    dotfrontend=list()
-    dotslave=list()
-    dotslavefe=list()
-    tunerdict = {}
-    currenthostype=''
-    for row in result:
-  #     print row[0]
-   #Find the system type
-       cursor.execute("select value,data  from settings where hostname=%s and value in ('HostSystemType','HostRunFrontend');",(row))
-       hostvalues=cursor.fetchall()
-       if  len(hostvalues) == 2:
-          if hostvalues[1][1] == 'Frontend_only':
-             frontonly+=","+row[0]
-             dotfrontend.append(row[0])
-
-          elif hostvalues[1][1] == 'Standalone':
-             stand_alone+=","+row[0]
-             dotMBE="MBE" + " [ label=\"" + row[0]  + "  \\n Standalone  \" shapefile=\"/data/srv/httpd/htdocs/hobbit/gifs/be.png\"  fontcolor=\"white\"  color=blue4 style=filled   ] "
-             dotfrontend.append(row[0])
-             cursor.execute("select cardtype,defaultinput  from capturecard  where hostname=%s;",(row))
-             tuners=cursor.fetchall()
-             tstring=""
-
-             if len(tuners) == 0:
-                 tunerdict["MBE"]="no tuners \\n"
-             else:
-                for t in tuners:
-                    tstring+=t[0]
-                    tstring+=t[1]
-                    tstring+='\\n'
-                    tunerdict["MBE"]=tstring
-
-          elif hostvalues[1][1] == 'Master_backend':
-              if hostvalues[0][1]=='0':
-                  masterbackend+=","+row[0]
-                  dotMBE=row[0] + "\\n Master Backend"
-              else:
-                  masterbacked_w_fe+=","+row[0]
-                  dotMBE="MBE" + " [ label=\"" + row[0]  + "  \\n Master Backend with frontend  \" shapefile=\"/data/srv/httpd/htdocs/hobbit/gifs/be.png\"  fontcolor=\"white\"  color=blue4 style=filled   ] "
-                  cursor.execute("select cardtype,defaultinput  from capturecard  where hostname=%s;",(row))
-                  tuners=cursor.fetchall()
-                  tstring=""
-
-                  if len(tuners) == 0:
-                    tunerdict["MBE"]="no tuners \\n"
-                  else:
-                    for t in tuners:
-                            tstring+=t[0]
-                            tstring+=t[1]
-                            tstring+='\\n'
-                            tunerdict["MBE"]=tstring
-                  dotfrontend.append(row[0])
-
-          elif hostvalues[1][1] == 'Slave_backend':
-              if hostvalues[0][1]=='0':
-                  slave+=","+row[0]
-                  dotslave.append(row[0])
-                  cursor.execute("select cardtype,defaultinput  from capturecard  where hostname=%s;",(row))
-                  tuners=cursor.fetchall()
-                  tstring=""
-                  for t in tuners:
-                        tstring+=t[0]
-                        tstring+=t[1]
-                        tstring+='\\n'
-                  tunerdict["STUNER"+row[0]]=tstring
-                  #dotfrontend.append(row[0])
-              else:
-                  cursor.execute("select cardtype,defaultinput  from capturecard  where hostname=%s;",(row))
-                  tuners=cursor.fetchall()
-                  tstring=""
-                  for t in tuners:
-                        tstring+=t[0]
-                        tstring+=t[1]
-                        tstring+='\\n'
-                  tunerdict["STUNER"+row[0]]=tstring
-                  print tstring
-
-                  slave_w_fe+=","+row[0]
-                  dotslave.append(row[0])
-                  dotfrontend.append(row[0])
-
-#----------------------------------Create graphviz dot files
-    dotfilename="/data/srv/hobbit/server/etc/mythdot"
-
-    dotfile=open(dotfilename,'w')
-    dotfile.write("digraph G {   " + "\n" )
-    dotfile.write("graph [bgcolor=transparent]" + "\n" )
-
-
-#define the nodes
-    dotfile.write( dotMBE + "  \n" )
-
-    dotfile.write("tunermbe"+   " [ label= \"" + tunerdict["MBE"] +     "\" , shapefile=\"/data/srv/httpd/htdocs/hobbit/gifs/tuner.png\"   fontcolor=\"white\"  color=red ]  \n" )
-
-    for fe in dotfrontend:
-        dotfile.write("FEND"+fe + "[ label=\"frontend \\n " + fe +     "\" ,shapefile=\"/data/srv/httpd/htdocs/hobbit/gifs/tv.png\" , fontcolor=\"white\" , imagescale=\"true\"  color=\"gold2\" ]   \n" )
-
-    for fe in dotslave:
-        cslave="STUNER"+fe
-        if tunerdict[cslave] != "" :
-            dotfile.write(cslave+   " [ label= \"" + tunerdict[cslave] +     "\" ,  shape=box ]     \n" )
-        dotfile.write("SLAVE"+fe + "[ label=\"slave backend \\n " + fe +     "\" shapefile=\"/data/srv/httpd/htdocs/hobbit/gifs/be.png\"  fontcolor=\"white\"  color=green ]   \n" )
-
-
-#connect up the nodes!
-    dotfile.write("tunermbe -> MBE  [color=\"red\"] \n  "  )
-
-    for fe in dotfrontend:
-        dotfile.write("MBE  -> FEND" + fe + "[color=\"gold2\"]   \n  "  )
-
-    for fe in dotslave:
-        cslave="STUNER"+fe
-        dotfile.write("SLAVE" + fe + "-> MBE [color=\"green\"]  \n  "  )
-        if tunerdict[cslave] != "" :
-            dotfile.write(cslave + "-> SLAVE"+fe + "\n"  )
-
-
-
-    dotfile.write("}  " + "\n"   )
-    dotfile.close()
-
-
-    cmd="/usr/bin/unflatten -l6 -c3 -f " + dotfilename + " |/usr/bin/dot -Tpng  -o/data/srv/httpd/htdocs/hobbit/gifs/network.png "
- #   cmd="/usr/bin/circo -Tpng  -o/data/srv/httpd/htdocs/hobbit/gifs/network.png " + dotfilename
-
-    results=os.popen(cmd,'r')
-
- #--------------------------------------------------
-    hobbitfile="/data/srv/hobbit/server/etc/hobbit-clients.cfg"
-    hobbitf=open(hobbitfile,'r')
-    hobbitconfig=hobbitf.readlines()
-    hobbitf.close()
-    hobbitf=open(hobbitfile,'w')
-#    print "FE",frontonly
- #   print "MBE",masterbackend
-  #  print "MBEwFW",masterbacked_w_fe
-   # print "SLAVEwFW",slave_w_fe
-    #print "SLAVE",slave
-    #print "STD",stand_alone
-
-    for line in hobbitconfig:
-        if line.startswith("HOST"):
-            cline=line.split("=")
-            if cline[1].startswith("_FRONTEND_"):
-                pline="HOST="
-                pline+=frontonly.strip()
-                hobbitf.write(pline + "\n")
-            elif cline[1].startswith("_MASTERBACKEND_"):
-                pline="HOST="
-                pline+=masterbackend.strip()
-                #print pline
-                hobbitf.write(pline+ "\n")
-            elif cline[1].startswith("_MASTERFRONTEND_"):
-                pline="HOST="
-                pline+=masterbacked_w_fe.strip()
-                #print pline
-                hobbitf.write(pline+ "\n")
-            elif cline[1].startswith("_SLAVEBACKEND_"):
-                pline="HOST="
-                pline+=slave.strip()
-                #print pline
-                hobbitf.write(pline+ "\n")
-            elif cline[1].startswith("_SLAVEFE_"):
-                pline="HOST="
-                pline+=slave_w_fe.strip()
-                #print pline
-                hobbitf.write(pline+ "\n")
-            else:
-                #print line
-                hobbitf.write(line)
-        else:
-            #print line
-            hobbitf.write(line)
-
-#-----------------------------------------------------------END CLIENT CONFIG
-
-    # execute SQL statement
-    cursor.execute("SELECT DISTINCT(hostname) from settings")
-    result = cursor.fetchall()
-
-    for row in result:
-       cursor.execute("select value,data  from settings where hostname=%s and value in ('HostSystemType','HostHwuuid');",(row))
-       hostvalues=cursor.fetchall()
-       found_uuid="false"
-       filename="/data/srv/hobbit/server/www/notes/"
-       filename+=str(row[0])
-       filename+=(".html")
-
-       file = open(filename,'w')
-       string='''
-        <html>
-        <head>
-            <style type="text/css">@import "/frame.css";</style>
-        </head>
-       '''
-       file.write(string)
-
-
-       for i in range( 0 , len(hostvalues)):
-            value=hostvalues[i][0]
-            data=hostvalues[i][1]
-            currenthostype=''
-            currenthostname=''
-            if  value == "HostHwuuid" :
-                if data != "blank" :
-                    found_uuid="true"
-                    uuid=data
-            if value == "HostSystemType" :
-
-                currenthostname= str(row[0]).strip()
-                currenthostype=str(data).strip()
-                header="<h1>" + currenthostname + "(" + currenthostype + ") </h1>"
-                file.write(header + '\n')
-
-
-       if found_uuid == "true" :
-            string=str("http://smolt.mythvantage.com/client/show?uuid=")
-            string+=str(uuid)
-            file.write("<A href=\""  )
-            file.write(string)
-            file.write("\" >" +  str(uuid)   + "</A>")
-       else:
-            file.write( "uuid  not found, please submit a hardware profile" )
-
-
-
-       buttonform_top='''
-         <div class="content" style="solid #aaa; width:500px; height:350px; overflow:auto; color:#FFF;text-align:left;">
-         <form action="/process.py" method="get">
-         '''
-
-
-       buttonform_bottom='''
-           <input name="param2" type="radio"  value="Update" />Update System </>
-           <select name="param3">
-                   <option value="Myth_only">Myth only</option>
-                   <option value="All"> Full System</option>
-           </select>
-           </br>
-           <input name="param2" type="radio"  value="Kill" />Restart interface: </>
-           <select name="param6">
-                   <option value="killX">Full UI</option>
-                   <option value="killmyth">MythFrontend</option>
-           </select>
-           </br>
-           <input name="param2" type="radio"  value="Shutdown" />Shutdown System<br />
-           <input name="param2" type="radio"  value="Reboot" />Reboot System<br />
-           <input name="param2" type="radio"  value="WOL" />Wake on Lan<br />
-           <input name="hiddenparam" type="hidden" value="
-            '''
-       oldurlform='''
-                   "/>
-            <input name="param4" type="hidden" value="
-            '''
-
-
-       closetag='''
-           "/>
-            </br>
-            <input id="submitbutton" type="submit" />
-        </form>
-        </div>
-        '''
-
-       if currenthostype == "Master_backend":
-            mbeoptions=createdropdown()
-       else:
-            mbeoptions=''
-       returnurl="/hobbit/notes/"
-       returnurl+=str(row[0])
-       returnurl+=(".html")
-       file.write('</br> </br>  ')
-       file.write(buttonform_top)
-       file.write(mbeoptions)
-       file.write(buttonform_bottom)
-       file.write(str(row[0]))
-       file.write(oldurlform)
-       file.write(returnurl)
-       file.write(closetag)
-
-       string=(' </html>')
-       file.write(string)
-
-if __name__ == "__main__":
-    main(sys.argv[1:])
diff --git a/abs/mv-core/hobbitmon/hobbit-alerts.cfg b/abs/mv-core/hobbitmon/hobbit-alerts.cfg
deleted file mode 100644
index 66ac7e6..0000000
--- a/abs/mv-core/hobbitmon/hobbit-alerts.cfg
+++ /dev/null
@@ -1,124 +0,0 @@
-#
-# The hobbit-alerts.cfg file controls who receives alerts
-# when a status in the BB system goes into a critical
-# state (usually: red, yellow or purple).
-#
-# This file is made up from RULES and RECIPIENTS.
-#
-# A RULE is a filter made from the PAGE where a host
-# is located in BB; the HOST name, the SERVICE name,
-# the COLOR of the status, the TIME of day, and the
-# DURATION of the event.
-#
-# A RECIPIENT can be a MAIL address, or a SCRIPT.
-#
-# Recipients can also have rules associated with them,
-# that modify the rules for a single recipient, e.g.
-# you can define a rule for alerting, then add an
-# extra criteria e.g. so a single recipient does not get
-# alerted until after 20 minutes.
-#
-# A sample rule:
-#
-# HOST=www.foo.com SERVICE=http
-#      MAIL webadmin@foo.com REPEAT=20 RECOVERED
-#      MAIL cio@foo.com DURATION>60 COLOR=red
-#      SCRIPT /usr/local/bin/sendsms 1234567890 FORMAT=SMS
-#
-# The first line sets up a rule that catches alerts
-# for the host "www.foo.com" and the "http" service.
-# There are three recipients for these alerts: The first
-# one is the "webadmin@foo.com" - they get alerted 
-# immediately when the status goes into an alert state,
-# and the alert is repeated every 20 minutes until it
-# recovers. When it recovers, a message is sent about
-# the recovery.
-#
-# The second recipient is "cio@foo.com". He gets alerted
-# only when the service goes "red" for more than 60 minutes.
-#
-# The third recipient is a script, "/usr/local/bin/sendsms".
-# The real recipient is "1234567890", but it is handled
-# by the script - the script receives a set of environment
-# variables with the details about the alert, including the
-# real recipient. The alert message is preformatted for 
-# an SMS recipient.
-#
-# You can use Perl-compatible "regular expressions" for
-# the PAGE, HOST and SERVICE definitions, by putting a "%"
-# in front of the regex. E.g.
-#
-# HOST=%^www.*
-#      MAIL webadmin@foo.com EXHOST=www.testsite.foo.com
-#
-# This sets up a rule so that alerts from any hostname 
-# beginning with "www" goes to "webadmin@foo.com", EXCEPT
-# alerts from "www.testsite.foo.com"
-#
-# The following keywords are recognized:
-#    PAGE      - rule matching an alert by the name of the
-#                page in BB. This is the name following
-#                the "page", "subpage" or "subparent" keyword
-#                in the bb-hosts file.
-#    EXPAGE    - rule excluding an alert if the pagename matches.
-#    HOST      - rule matching an alert by the hostname.
-#    EXHOST    - rule excluding an alert by matching the hostname.
-#    SERVICE   - rule matching an alert by the service name.
-#    EXSERVICE - rule excluding an alert by matching the hostname.
-#    GROUP     - rule matching an alert by the group ID.
-#                (Group ID's are associated with a status through the
-#                 hobbit-clients.cfg configuration).
-#    EXGROUP   - rule excluding an alert by matching the group ID.
-#    COLOR     - rule matching an alert by color. Can be "red",
-#                "yellow", or "purple".
-#    TIME      - rule matching an alert by the time-of-day. This
-#                is specified as the DOWNTIME timespecification
-#                in the bb-hosts file (see bb-hosts(5)).
-#    DURATION  - Rule matcing an alert if the event has lasted
-#                longer/shorter than the given duration. E.g.
-#                DURATION>10 (lasted longer than 10 minutes) or
-#                DURARION<30 (only sends alerts the first 30 minutes).
-#    RECOVERED - Rule matches if the alert has recovered from an 
-#                alert state.
-#    NOTICE    - Rule matches if the message is a "notify" message
-#                (typically sent when a status is enabled or disabled).
-#    MAIL      - Recipient who receives an e-mail alert. This takes
-#                one parameter, the e-mail address.
-#    SCRIPT    - Recipient that invokes a script. This takes two
-#                parameters: The script filename, and the recipient
-#                that gets passed to the script.
-#    FORMAT    - format of the text message with the alert. Default
-#                is "TEXT" (suitable for e-mail alerts). "SMS" is
-#                a short message with no subject for SMS alerts.
-#                "SCRIPT" is a brief message template for scripts.
-#    REPEAT    - How often an alert gets repeated, in minutes.
-#    STOP      - Valid for a recipient: If this recipient gets an
-#                alert, recipients further down in hobbit-alerts.cfg
-#                are ignored.
-#    UNMATCHED - Matches if no alerts have been sent so far.
-#
-#
-# Script get the following environment variables pre-defined so
-# that they can send a meaningful alert:
-#
-#    BBCOLORLEVEL  - The color of the alert: "red", "yellow" or "purple"
-#    BBALPHAMSG    - The full text of the status log triggering the alert
-#    ACKCODE       - The "cookie" that can be used to acknowledge the alert
-#    RCPT          - The recipient, from the SCRIPT entry
-#    BBHOSTNAME    - The name of the host that the alert is about
-#    MACHIP        - The IP-address of the host that has a problem
-#    BBSVCNAME     - The name of the service that the alert is about
-#    BBSVCNUM      - The numeric code for the service. From SVCCODES definition.
-#    BBHOSTSVC     - HOSTNAME.SERVICE that the alert is about.
-#    BBHOSTSVCCOMMAS - As BBHOSTSVC, but dots in the hostname replaced with commas
-#    BBNUMERIC     - A 22-digit number made by BBSVCNUM, MACHIP and ACKCODE.
-#    RECOVERED     - Is "1" if the service has recovered.
-#    DOWNSECS      - Number of seconds the service has been down.
-#    DOWNSECSMSG   - When recovered, holds the text "Event duration : N" where
-#                    N is the DOWNSECS value.
-
-HOST=* SERVICE=disk
-      SCRIPT /data/srv/hobbit/server/bin/hobbit_notify.sh  1234567890 FORMAT=SMS REPEAT=10h COLOR=yellow
-      SCRIPT /data/srv/hobbit/server/bin/hobbit_notify.sh  1234567890 FORMAT=SMS REPEAT=1h COLOR=red
-
-
diff --git a/abs/mv-core/hobbitmon/hobbit-clients.cfg b/abs/mv-core/hobbitmon/hobbit-clients.cfg
deleted file mode 100755
index c77fce8..0000000
--- a/abs/mv-core/hobbitmon/hobbit-clients.cfg
+++ /dev/null
@@ -1,427 +0,0 @@
-# hobbit-clients.cfg - configuration file for clients reporting to Hobbit
-#
-# This file is used by the hobbitd_client module, when it builds the
-# cpu, disk, files, memory, msgs and procs status messages from the 
-# information reported by clients running on the monitored systems.
-#
-# This file must be installed on the Hobbit server - client installations
-# do not need this file.
-#
-# The file defines a series of rules:
-#    UP     : Changes the "cpu" status when the system has rebooted recently,
-#             or when it has been running for too long.
-#    LOAD   : Changes the "cpu" status according to the system load.
-#    CLOCK  : Changes the "cpu" status if the client system clock is
-#             not synchronized with the clock of the Hobbit server.
-#    DISK   : Changes the "disk" status, depending on the amount of space
-#             used of filesystems.
-#    MEMPHYS: Changes the "memory" status, based on the percentage of real
-#             memory used.
-#    MEMACT : Changes the "memory" status, based on the percentage of "actual"
-#             memory used. Note: Not all systems report an "actual" value.
-#    MEMSWAP: Changes the "memory" status, based on the percentage of swap
-#             space used.
-#    PROC   : Changes the "procs" status according to which processes were found
-#             in the "ps" listing from the client.
-#    LOG    : Changes the "msgs" status according to entries in text-based logfiles.
-#             Note: The "client-local.cfg" file controls which logfiles the client will report.
-#    FILE   : Changes the "files" status according to meta-data for files.
-#             Note: The "client-local.cfg" file controls which files the client will report.
-#    DIR    : Changes the "files" status according to the size of a directory.
-#             Note: The "client-local.cfg" file controls which directories the client will report.
-#    PORT   : Changes the "ports" status according to which tcp ports were found
-#             in the "netstat" listing from the client.
-#    DEFAULT: Set the default values that apply if no other rules match.
-#
-# All rules can be qualified so they apply only to certain hosts, or on certain
-# times of the day (see below).
-#
-# Each type of rule takes a number of parameters:
-#    UP bootlimit toolonglimit
-#             The cpu status goes yellow if the system has been up for less than
-#             "bootlimit" time, or longer than "toolonglimit". The time is in
-#             minutes, or you can add h/d/w for hours/days/weeks - eg. "2h" for
-#             two hours, or "4w" for 4 weeks.
-#             Defaults: bootlimit=1h, toolonglimit=-1 (infinite).
-#
-#    LOAD warnlevel paniclevel
-#             If the system load exceeds "warnlevel" or "paniclevel", the "cpu"
-#             status will go yellow or red, respectively. These are decimal
-#             numbers.
-#             Defaults: warnlevel=5.0, paniclevel=10.0
-#
-#    CLOCK maximum-offset
-#             If the system clock of the client differs from that of the Hobbit
-#             server by more than "maximum-offset" seconds, then the CPU status
-#             column will go yellow. Note that the accuracy of this test is limited,
-#             since it is affected by the time it takes a client status report to
-#             go from the client to the Hobbit server and be processed. You should
-#             therefore allow for a few seconds (5-10) of slack when you define
-#             your max. offset.
-#             It is not wise to use this test, unless your servers are synchronized
-#             to a common clock, e.g. through NTP.
-#
-#    DISK filesystem warnlevel paniclevel
-#    DISK filesystem IGNORE
-#             If the utilization of "filesystem" is reported to exceed "warnlevel"
-#             or "paniclevel", the "disk" status will go yellow or red, respectively.
-#             "warnlevel" and "paniclevel" are either the percentage used, or the
-#             space available as reported by the local "df" command on the host.
-#             For the latter type of check, the "warnlevel" must be followed by the
-#             letter "U", e.g. "1024U".
-#             The special keyword "IGNORE" causes this filesystem to be ignored
-#             completely, i.e. it will not appear in the "disk" status column and
-#             it will not be tracked in a graph. This is useful for e.g. removable
-#             devices, backup-disks and similar hardware.
-#             "filesystem" is the mount-point where the filesystem is mounted, e.g.
-#             "/usr" or "/home". A filesystem-name that begins with "%" is interpreted
-#             as a Perl-compatible regular expression; e.g. "%^/oracle.*/" will match
-#             any filesystem whose mountpoint begins with "/oracle".
-#             Defaults: warnlevel=90%, paniclevel=95%
-#
-#    MEMPHYS warnlevel paniclevel
-#    MEMACT warnlevel paniclevel
-#    MEMSWAP warnlevel paniclevel
-#             If the memory utilization exceeds the "warnlevel" or "paniclevel", the
-#             "memory" status will change to yellow or red, respectively.
-#             Note: The words "PHYS", "ACT" and "SWAP" are also recognized.
-#             Defaults: MEMPHYS warnlevel=100 paniclevel=101 (i.e. it will never go red)
-#                       MEMSWAP warnlevel=50 paniclevel=80
-#                       MEMACT  warnlevel=90 paniclevel=97
-#
-#    PROC processname minimumcount maximumcount color [TRACK=id] [TEXT=displaytext]
-#             The "ps" listing sent by the client will be scanned for how many
-#             processes containing "processname" are running, and this is then
-#             matched against the min/max settings defined here. If the running
-#             count is outside the thresholds, the color of the "procs" status
-#             changes to "color".
-#             To check for a process that must NOT be running: Set minimum and 
-#             maximum to 0.
-#
-#             "processname" can be a simple string, in which case this string must
-#             show up in the "ps" listing as a command. The scanner will find
-#             a ps-listing of e.g. "/usr/sbin/cron" if you only specify "processname"
-#             as "cron".
-#             "processname" can also be a Perl-compatiable regular expression, e.g.
-#             "%java.*inst[0123]" can be used to find entries in the ps-listing for
-#             "java -Xmx512m inst2" and "java -Xmx256 inst3". In that case, 
-#             "processname" must begin with "%" followed by the reg.expression.
-#             If "processname" contains whitespace (blanks or TAB), you must enclose
-#             the full string in double quotes - including the "%" if you use regular
-#             expression matching. E.g.
-#                 PROC "%hobbitd_channel --channel=data.*hobbitd_rrd" 1 1 yellow
-#             or
-#                 PROC "java -DCLASSPATH=/opt/java/lib" 2 5
-#
-#             You can have multiple "PROC" entries for the same host, all of the
-#             checks are merged into the "procs" status and the most severe
-#             check defines the color of the status.
-#
-#             The TRACK=id option causes the number of processes found to be recorded
-#             in an RRD file, with "id" as part of the filename. This graph will then
-#             appear on the "procs" page as well as on the "trends" page. Note that
-#             "id" must be unique among the processes tracked for each host.
-#
-#             The TEXT=displaytext option affects how the process appears on the
-#             "procs" status page. By default, the process is listed with the
-#             "processname" as identification, but if this is a regular expression
-#             it may be a bit difficult to understand. You can then use e.g.
-#             "TEXT=Apache" to make these processes appear with the name "Apache"
-#             instead.
-#
-#             Defaults: mincount=1, maxcount=-1 (unlimited), color="red".
-#                       Note: No processes are checked by default.
-#
-#             Example: Check that "cron" is running:
-#                 PROC cron
-#             Example: Check that at least 5 "httpd" processes are running, but
-#             not more than 20:
-#                 PROC httpd 5 20
-#
-#    LOG filename match-pattern [COLOR=color] [IGNORE=ignore-pattern] [TEXT=displaytext]
-#             In the "client-local.cfg" file, you can list any number of files
-#             that the client will collect log data from. These are sent to the
-#             Hobbit server together with the other client data, and you can then
-#             choose how to analyze the log data with LOG entries.
-#
-#                             ************ IMPORTANT ***************
-#             To monitor a logfile, you *MUST* configure both client-local.cfg
-#             and hobbit-clients.cfg. If you configure only the client-local.cfg
-#             file, the client will collect the log data and you can view it in 
-#             the "client data" display, but it will not affect the color of the
-#             "msgs" status. On the other hand, if you configure only the
-#             hobbit-clients.cfg file, then there will be no log data to inspect,
-#             and you will not see any updates of the "msgs" status either.
-#
-#             "filename" is a filename or pattern. The set of files reported by
-#             the client is matched against "filename", and if they match then
-#             this LOG entry is processed against the data from a file.
-#
-#             "match-pattern": The log data is matched against this pattern. If
-#             there is a match, this log file causes a status change to "color".
-#
-#             "ignore-pattern": The log data that matched "match-pattern" is also
-#             matched against "ignore-pattern". If the data matches the "ignore-pattern",
-#             this line of data does not affect the status color. In other words,
-#             the "ignore-pattern" can be used to refine the strings which cause
-#             a match.
-#             Note: The "ignore-pattern" is optional.
-#
-#             "color": The color which this match will trigger.
-#             Note: "color" is optional, if omitted then "red" will be used.
-#
-#             Example: Go yellow if the text "WARNING" shows up in any logfile.
-#                 LOG %.* WARNING COLOR=yellow
-#
-#             Example: Go red if the text "I/O error" or "read error" appears.
-#                 LOG %/var/(adm|log)/messages %(I/O|read).error COLOR=red
-#
-#    FILE filename [color] [things to check] [TRACK]
-#             NB: The files you wish to monitor must be listed in a "file:..."
-#             entry in the client-local.cfg file, in order for the client to 
-#             report any data about them.
-#
-#             "filename" is a filename or pattern. The set of files reported by
-#             the client is matched against "filename", and if they match then
-#             this FILE entry is processed against the data from that file.
-#
-#             [things to check] can be one or more of the following:
-#             - "NOEXIST" triggers a warning if the file exists. By default,
-#               a warning is triggered for files that have a FILE entry, but
-#               which do not exist.
-#             - "TYPE=type" where "type" is one of "file", "dir", "char", "block", 
-#               "fifo", or "socket". Triggers warning if the file is not of the
-#               specified type.
-#             - "OWNERID=owner" and "GROUPID=group" triggers a warning if the owner
-#               or group does not match what is listed here. "owner" and "group" is
-#               specified either with the numeric uid/gid, or the user/group name.
-#             - "MODE=mode" triggers a warning if the file permissions are not
-#               as listed. "mode" is written in the standard octal notation, e.g.
-#               "644" for the rw-r--r-- permissions.
-#             - "SIZE<max.size" and "SIZE>min.size" triggers a warning it the file
-#               size is greater than "max.size" or less than "min.size", respectively.
-#               You can append "K" (KB), "M" (MB), "G" (GB) or "T" (TB) to the size.
-#               If there is no such modifier, KB is assumed.
-#               E.g. to warn if a file grows larger than 1MB (1024 KB): "SIZE<1M".
-#             - "SIZE=size" triggers a warning it the file size is not what is listed.
-#             - "MTIME>min.mtime" and "MTIME<max.mtime" checks how long ago the file
-#               was last modified (in seconds). E.g. to check if a file was updated
-#               within the past 10 minutes (600 seconds): "MTIME<600". Or to check 
-#               that a file has NOT been updated in the past 24 hours: "MTIME>86400".
-#             - "MTIME=timestamp" checks if a file was last modified at "timestamp".
-#               "timestamp" is a unix epoch time (seconds since midnight Jan 1 1970 UTC).
-#             - "CTIME>min.ctime", "CTIME<max.ctime", "CTIME=timestamp" acts as the
-#               mtime checks, but for the ctime timestamp (when the files' directory
-#               entry was last changed, eg. by chown, chgrp or chmod).
-#             - "MD5=md5sum", "SHA1=sha1sum", "RMD160=rmd160sum" trigger a warning 
-#               if the file checksum using the MD5, SHA1 or RMD160 message digest
-#               algorithms do not match the one configured here. Note: The "file"
-#               entry in the client-local.cfg file must specify which algorithm to use.
-#
-#             "TRACK" causes the size of this file to be tracked in an RRD file, and
-#             shown on the graph on the "files" display.
-#
-#             Example: Check that the /var/log/messages file is not empty and was updated
-#                      within the past 10 minutes, and go yellow if either fails:
-#                 FILE /var/log/messages SIZE>0 MTIME<600 yellow
-#
-#             Example: Check the timestamp, size and SHA-1 hash of the /bin/sh program:
-#                 FILE /bin/sh MTIME=1128514608 SIZE=645140 SHA1=5bd81afecf0eb93849a2fd9df54e8bcbe3fefd72
-#
-#    DIR directory [color] [SIZE<maxsize] [SIZE>minsize] [TRACK]
-#             NB: The directories you wish to monitor must be listed in a "dir:..."
-#             entry in the client-local.cfg file, in order for the client to 
-#             report any data about them.
-#
-#             "directory" is a filename or pattern. The set of directories reported by
-#             the client is matched against "directory", and if they match then
-#             this DIR entry is processed against the data for that directory.
-#
-#             "SIZE<maxsize" and "SIZE>minsize" defines the size limits that the
-#             directory must stay within. If it goes outside these limits, a warning
-#             will trigger. Note the Hobbit uses the raw number reported by the
-#             local "du" command on the client. This is commonly KB, but it may be
-#             disk blocks which are often 512 bytes.
-#
-#             "TRACK" causes the size of this directory to be tracked in an RRD file, 
-#             and shown on the graph on the "files" display.
-#
-#    PORT [LOCAL=addr] [EXLOCAL=addr] [REMOTE=addr] [EXREMOTE=addr] [STATE=state] [EXSTATE=state] [MIN=mincount] [MAX=maxcount] [COLOR=color] [TRACK=id] [TEXT=displaytext]
-#             The "netstat" listing sent by the client will be scanned for how many
-#             sockets match the criteria listed.
-#             "addr" is a (partial) address specification in the format used on 
-#             the output from netstat. This is typically "10.0.0.1:80" for the IP 
-#             10.0.0.1, port 80. Or "*:80" for any local address, port 80.
-#             NB: The Hobbit clients normally report only the numeric data for
-#                 IP-adresses and port-numbers, so you must specify the port
-#                 number (e.g. "80") instead of the service name ("www").
-#             "state" causes only the sockets in the specified state to be included;
-#             it is usually LISTEN or ESTABLISHED.
-#             The socket count is then matched against the min/max settings defined 
-#             here. If the count is outside the thresholds, the color of the "ports" 
-#             status changes to "color".
-#             To check for a socket that must NOT exist: Set minimum and
-#             maximum to 0.
-#
-#             "addr" and "state" can be a simple strings, in which case these string must 
-#             show up in the "netstat" at the appropriate column.
-#             "addr" and "state" can also be a Perl-compatiable regular expression, e.g.
-#             "LOCAL=%(:80|:443)" can be used to find entries in the netstat local port for
-#             both http (port 80) and https (port 443). In that case, portname or state must 
-#             begin with "%" followed by the reg.expression.
-#
-#             The TRACK=id option causes the number of sockets found to be recorded
-#             in an RRD file, with "id" as part of the filename. This graph will then
-#             appear on the "ports" page as well as on the "trends" page. Note that
-#             "id" must be unique among the ports tracked for each host.
-#
-#             The TEXT=displaytext option affects how the port appears on the
-#             "ports" status page. By default, the port is listed with the
-#             local/remote/state rules as identification, but this may be somewhat
-#             difficult to understand. You can then use e.g. "TEXT=Secure Shell" to make 
-#             these ports appear with the name "Secure Shell" instead.
-#
-#             Defaults: state="LISTEN", mincount=1, maxcount=-1 (unlimited), color="red".
-#                       Note: No ports are checked by default.
-#
-#             Example: Check that there is someone listening on the https port:
-#                 PORT "LOCAL=%([.:]443)$" state=LISTEN TEXT=https
-#
-#             Example: Check that at least 5 "ssh" connections are established, but
-#             not more than 10; warn but do not error; graph the connection count:
-#                 PORT "LOCAL=%([.:]22)$" state=ESTABLISHED min=5 max=20 color=yellow TRACK=ssh "TEXT=SSH logins"
-#
-#             Example: Check that ONLY ports 22, 80 and 443 are open for incoming connections:
-#                 PORT STATE=LISTEN LOCAL=%0.0.0.0[.:].* EXLOCAL=%[.:](22|80|443)$ MAX=0 "TEXT=Bad listeners"
-#
-#
-# To apply rules to specific hosts, you can use the "HOST=", "EXHOST=", "PAGE=" 
-# "EXPAGE=", "CLASS=" or "EXCLASS=" qualifiers.  (These act just as in the 
-# hobbit-alerts.cfg file).
-#
-# Hostnames are either a comma-separated list of hostnames (from the bb-hosts file), 
-# "*" to indicate "all hosts", or a Perl-compatible regular expression.
-# E.g. "HOST=dns.foo.com,www.foo.com" identifies two specific hosts; 
-# "HOST=%www.*.foo.com EXHOST=www-test.foo.com" matches all hosts with a name
-# beginning with "www", except the "www-test" host.
-# "PAGE" and "EXPAGE" match the hostnames against the page on where they are
-# located in the bb-hosts file, via the bb-hosts' page/subpage/subparent
-# directives. This can be convenient to pick out all hosts on a specific page.
-#
-# Rules can be dependant on time-of-day, using the standard Hobbit syntax 
-# (the bb-hosts(5) about the NKTIME parameter). E.g. "TIME=W:0800:2200"
-# applied to a rule will make this rule active only on week-days between
-# 8AM and 10PM.
-#
-# You can also associate a GROUP id with a rule. The group-id is passed to
-# the alert module, which can then use it to control who gets an alert when
-# a failure occurs. E.g. the following associates the "httpd" process check 
-# with the "web" group, and the "sshd" check with the "admins" group:
-#    PROC httpd 5 GROUP=web
-#    PROC sshd 1 GROUP=admins
-# In the hobbit-alerts.cfg file, you could then have rules like
-#    GROUP=web
-#       MAIL webmaster@foo.com
-#    GROUP=admins
-#       MAIL root@foo.com
-#
-# Qualifiers must be placed after each rule, e.g.
-#    LOAD 8.0 12.0  HOST=db.foo.com TIME=*:0800:1600
-#
-# If you have multiple rules that you want to apply the same qualifiers to,
-# you can write the qualifiers *only* on one line, followed by the rules. E.g.
-#    HOST=%db.*.foo.com TIME=W:0800:1600
-#       LOAD 8.0 12.0
-#       DISK /db  98 100
-#       PROC mysqld 1
-# will apply the three rules to all of the "db" hosts on week-days between 8AM
-# and 4PM. This can be combined with per-rule qualifiers, in which case the
-# per-rule qualifier overrides the general qualifier; e.g.
-#    HOST=%.*.foo.com
-#       LOAD 7.0 12.0 HOST=bax.foo.com
-#       LOAD 3.0 8.0
-# will result in the load-limits being 7.0/12.0 for the "bax.foo.com" host,
-# and 3.0/8.0 for all other foo.com hosts.
-#
-# The special DEFAULT section can modify the built-in defaults - this must
-# be placed at the end of the file.
-
-HOST=_MASTERBACKEND_
-	PROC sshd 1 
-	PROC lighttpd  
-	PROC hobbitd
-   	PROC crond
-	PROC mysql
-	PROC mythbackend
-        DISK  *  95 99
-        PORT "LOCAL=%([.:]80)$" state=LISTEN TEXT=http
-	PORT "LOCAL=%([.:]1337)$" state=LISTEN TEXT=cgi
-        PORT "LOCAL=%([.:]22)$" state=LISTEN TEXT=ssh
-
-HOST=_MASTERFRONTEND_
-	PROC mythfrontend
-	PROC sshd 1 
-	PROC lighttpd  
-	PROC hobbitd
-   	PROC crond
-	PROC mysql
-	PROC mythbackend
-       DISK  *  95 99
-        PORT "LOCAL=%([.:]80)$" state=LISTEN TEXT=http
-	PORT "LOCAL=%([.:]1337)$" state=LISTEN TEXT=cgi
-        PORT "LOCAL=%([.:]22)$" state=LISTEN TEXT=ssh
-        PORT "LOCAL=%([.:]5000)$" state=LISTEN TEXT=ghosd
-        PORT "LOCAL=%([.:]5001)$" state=LISTEN TEXT=ghosd
-
-
-HOST=_FRONTEND_
-	PROC sshd 1 
-   	PROC crond
-	PROC mythfrontend
-        PORT "LOCAL=%([.:]22)$" state=LISTEN TEXT=ssh
-        PORT "LOCAL=%([.:]5000)$" state=LISTEN TEXT=ghosd
-        PORT "LOCAL=%([.:]5001)$" state=LISTEN TEXT=ghosd
-
-HOST=_SLAVEBACKEND_
-	PROC sshd 1 
-	PROC crond
-	PROC mythbackend
-       DISK  *  95 99
-        PORT "LOCAL=%([.:]22)$" state=LISTEN TEXT=ssh
-
-HOST=_SLAVEFRONTEND_
-	PROC sshd 1 
-	PROC lighttpd  
-	PROC hobbitd
-   	PROC crond
-	PROC mythbackend
-	PROC mythfrontend
-       DISK  *  95 99
-        PORT "LOCAL=%([.:]22)$" state=LISTEN TEXT=ssh
-        PORT "LOCAL=%([.:]5000)$" state=LISTEN TEXT=ghosd
-        PORT "LOCAL=%([.:]5001)$" state=LISTEN TEXT=ghosd
-
-HOST=_STANDALONE_
-	PROC sshd 1 
-	PROC lighttpd  
-	PROC hobbitd
-   	PROC crond
-	PROC mysql
-	PROC mythbackend
-       DISK  *  95 99
-        PORT "LOCAL=%([.:]22)$" state=LISTEN TEXT=ssh
-        PORT "LOCAL=%([.:]5000)$" state=LISTEN TEXT=ghosd
-        PORT "LOCAL=%([.:]5001)$" state=LISTEN TEXT=ghosd
-        PORT "LOCAL=%([.:]80)$" state=LISTEN TEXT=http
-	PORT "LOCAL=%([.:]1337)$" state=LISTEN TEXT=cgi
-        PORT "LOCAL=%([.:]22)$" state=LISTEN TEXT=ssh
-
-DEFAULT
-	# These are the built-in defaults.
-	UP      1h
-	LOAD    5.0 10.0
-	DISK    * 99 100
-	MEMPHYS 100 101
-	MEMSWAP 50 80
-	MEMACT  90 97
-
diff --git a/abs/mv-core/hobbitmon/hobbit-mem-myth.sh b/abs/mv-core/hobbitmon/hobbit-mem-myth.sh
deleted file mode 100755
index 642672f..0000000
--- a/abs/mv-core/hobbitmon/hobbit-mem-myth.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash
-MBEPID=`ps -ef|grep mythbackend |grep -v runsv|grep -v grep|grep -v logger|awk '{print $2 }'`
-MFEPID=`ps -ef|grep mythfrontend |grep -v runsv|grep -v grep|grep -v logger|awk '{print $2 }'`
-
-
-
-COLOR=green      # By default, everything is OK
-
-   # Do whatever you need to test for something
-if [ ! x$MBEPID = x ]
-then
-VmSize=`cat /proc/$MBEPID/status|grep -i vmsize|awk '{print $2 }'`
-VmPeak=`cat /proc/$MBEPID/status|grep -i vmpeak|awk '{print $2 }'`
-VmRSS=`cat /proc/$MBEPID/status|grep -i vmrss |awk '{print $2 }'`
-MSGMBE="
-	VmSize:$VmSize
-	VmPeak:$VmPeak
-	VmRSS:$VmRSS
-	"
-#	echo $MSGMBE
- # Tell Hobbit about it
-   $BB $BBDISP "data $MACHINE.memmbe $COLOR `date`
-
-   ${MSGMBE}
-
-   " 
-fi
-   
-
-
-if [ ! x$MFEPID = x ]
-then
-VmSize=`cat /proc/$MFEPID/status|grep -i vmsize|awk '{print $2 }'`
-VmPeak=`cat /proc/$MFEPID/status|grep -i vmpeak|awk '{print $2 }'`
-VmRSS=`cat /proc/$MFEPID/status|grep -i vmrss |awk '{print $2 }'`
-MSGMBE="
-	VmSize:$VmSize
-	VmPeak:$VmPeak
-	VmRSS:$VmRSS
-	"
-#	echo $MSGMBE
- # Tell Hobbit about it
-   $BB $BBDISP "data $MACHINE.memmfe $COLOR `date`
-
-   ${MSGMBE}
-
-   " 
-fi
-   
-
-
-
diff --git a/abs/mv-core/hobbitmon/hobbit-myth-orphan.sh b/abs/mv-core/hobbitmon/hobbit-myth-orphan.sh
deleted file mode 100755
index f9f7d54..0000000
--- a/abs/mv-core/hobbitmon/hobbit-myth-orphan.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-TMPFILE=/tmp/oprhan.result
-/usr/local/bin/myth.find_orphans.pl > $TMPFILE
-
-
-   COLUMN=orphan    # Name of the column
-   COLOR=green      # By default, everything is OK
-
-   # Do whatever you need to test for something
-   # As an example, go red if /tmp/badstuff exists.
-
-thumbs=`grep -A 4 "Summary:" $TMPFILE  |tail -n 1  |  cut  -d" "   -f3 `
-if [ !  x$thumbs  = x0 ]
-then
-    MSG="$thumbs orphaned thumbnails with no corresponding recording"
-    COLOR='yellow'
-fi
-
-missing=`grep -A 2 "Summary:" $TMPFILE  |tail -n 1 | cut -d, -f2 | cut  -d" "  -f2 `
-if [ !  x$missing  = x0 ]
-then
-	COLOR='red'
-MSG="${MSG}
-   `grep -A 2 "Summary:" $TMPFILE  |tail -n 1 ` "
-fi
-
-unkown=`grep -A 5 "Summary:" $TMPFILE  |tail -n 1  |  cut  -d" "   -f3 `
-if [ !  x$unkown  = x0 ]
-then
-	COLOR='red'
-MSG="${MSG}
-`grep -A 5 "Summary:" $TMPFILE  |tail -n 1  `"
-fi
-
-
-MSG="${MSG}
-	
-
-	`cat $TMPFILE`
-	"
-
-   # Tell Hobbit about it
-   $BB $BBDISP "status $MACHINE.$COLUMN $COLOR `date`
-/usr/local/bin/myth.find_orphans.pl
-
-   ${MSG}
-
-   " 
-
-   exit 0
-
-
-
-
diff --git a/abs/mv-core/hobbitmon/hobbit.install b/abs/mv-core/hobbitmon/hobbit.install
deleted file mode 100755
index a39308d..0000000
--- a/abs/mv-core/hobbitmon/hobbit.install
+++ /dev/null
@@ -1,32 +0,0 @@
-post_install() {
-	. /etc/systemconfig
-	if  [ ! -f   /data/srv/hobbit/server/ext/ignoreclient.py ]
-	then
-		echo "#this is a list of hosts to ignore" >  /data/srv/hobbit/server/ext/ignoreclient.py 
-		echo ignorehosts=\"\'ignoreme1\',\'ignoreme2\'\" >> /data/srv/hobbit/server/ext/ignoreclient.py 
-	fi
-	sed -i -e "s/localhost/$hostname/" /data/srv/hobbit/server/etc/bb-hosts
-	sed -i -e "s/localhost/$hostname/" /data/srv/hobbit/server/etc/hobbitserver.cfg
-	chown -R nobody /data/srv/hobbit
-	chown -R nobody /data/srv/httpd/htdocs/hobbit
-	chown -R nobody /var/log/hobbit
-	chown root /data/srv/hobbit/server/bin/hobbitping
-	chmod +s /data/srv/hobbit/server/bin/hobbitping
-
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
- rm -f /data/srv/httpd/htdocs/hobbit/index.html
-}
-
-pre_remove() {
- rm -f /data/srv/httpd/htdocs/hobbit/index.html
-}
-op=$1
-shift
-$op $*
-# vim: ft=sh ts=2
diff --git a/abs/mv-core/hobbitmon/hobbit_myth_data.py b/abs/mv-core/hobbitmon/hobbit_myth_data.py
deleted file mode 100755
index 14e3304..0000000
--- a/abs/mv-core/hobbitmon/hobbit_myth_data.py
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/usr/bin/python
-# checks for the number of days of guide data left
-# make sure myth_mtc ran ok
-
-
-import urllib2
-import string
-import time
-import sys,os
-BBLINE = ''
-BBCOLOR="green"
-DATE = time.strftime("%a %b %d %H:%M:%S %Z %Y", time.localtime(time.time()))
-if os.environ['BB']:
-    #print os.environ['BB']
-    BB=os.environ['BB']
-if os.environ['BBDISP']:
-    #print os.environ['BBDISP']
-    BBDISP=os.environ['BBDISP']
-if os.environ['MACHINE']:
-     #print os.environ['MACHINE']
-     MACHINE=os.environ['MACHINE']
-
-
-
-
-def check_mtc():
-    try:
-        infile = open('/var/log/myth_mtc.log', 'r')
-    except(IOError), e:
-        print "couldn't open myth_mtc.log file"
-        return False
-    else:
-        mtc = infile.readlines()
-        for i in mtc:
-           line=i
-        infile.close()
-    if line.strip() == "Finished":
-        return True
-    else:
-        return False
-
-def find_data_left():
-	try:
-		f = urllib2.urlopen("http://localhost:6544")
-	except urllib2.HTTPError, e:
-		if e.code != 200:
-			print 'error: could not find Masterbackend'
-			days_left=-100
-	else:
-		MBE_data = f.readlines()
-		f.close()
-        for line in MBE_data:
-            if line.find("guide data") != -1:
-                if line.find("no guide data") != -1:
-                    days_left = 0
-                else:
-                    line=line.split("(")
-                    line=line[1].split(")")
-                    days_left=line[0].split()[0]
-                return days_left
-
-
-mtc=check_mtc()
-num_days=find_data_left()
-
-if mtc:
-    BBCOLOR="green"
-    msg="\n Maintenace script ran ok \n "
-else:
-    BBCOLOR ="yellow"
-    msg="\n Maintenance script didn't run \n"
-
-if num_days ==  1 :
-    BBCOLOR="yellow"
-    msg+="Only 1 day of guide data left"
-elif num_days == 0 :
-    BBCOLOR="yellow"
-    msg+="No guide data available"
-else:
-    data_check = True
-    BBCOLOR="green"
-    msg+="%s days of guide data" %(num_days)
-
-BBLINE=msg
-LINE = "status " + MACHINE  + ".myth_mtc" + " " + BBCOLOR +  " " + DATE + " " + BBLINE
-cmd = BB + ' ' + BBDISP + ' "' + LINE + '"'
-os.system(cmd)
-
-sys.exit(0)
-
-
diff --git a/abs/mv-core/hobbitmon/hobbit_notify.sh b/abs/mv-core/hobbitmon/hobbit_notify.sh
deleted file mode 100755
index 7569e2a..0000000
--- a/abs/mv-core/hobbitmon/hobbit_notify.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-#
-#    BBCOLORLEVEL  - The color of the alert: "red", "yellow" or "purple"
-#    BBALPHAMSG    - The full text of the status log triggering the alert
-#    ACKCODE       - The "cookie" that can be used to acknowledge the alert
-#    RCPT          - The recipient, from the SCRIPT entry
-#    BBHOSTNAME    - The name of the host that the alert is about
-#    MACHIP        - The IP-address of the host that has a problem
-#    BBSVCNAME     - The name of the service that the alert is about
-#    BBSVCNUM      - The numeric code for the service. From SVCCODES definition.
-#    BBHOSTSVC     - HOSTNAME.SERVICE that the alert is about.
-#    BBHOSTSVCCOMMAS - As BBHOSTSVC, but dots in the hostname replaced with commas
-#    BBNUMERIC     - A 22-digit number made by BBSVCNUM, MACHIP and ACKCODE.
-#    RECOVERED     - Is "1" if the service has recovered.
-#    DOWNSECS      - Number of seconds the service has been down.
-#    DOWNSECSMSG   - When recovered, holds the text "Event duration : N" where
-echo $BBCOLORLEVEL  > /tmp/hobbitout
-echo $BBALPHAMSG >>/tmp/hobbitout
-echo $RCPT >>/tmp/hobbitout
-echo $BBHOSTNAME >>/tmp/hobbitout
-echo $BBSVCNAME >>/tmp/hobbitout
-echo $BBHOSTSVC >>/tmp/hobbitout
-
-#BBCOLORLEVEL=red
-#BBCOLORLEVEL=yellow
-#BBALPHAMSG="vmtest:disk red [751147]"
-#BBHOSTNAME="vmtest"
-#BBSVCNAME="disk"
-#BBHOSTSVC="vmtest.disk"
-
-if  [ x$BBSVCNAME = xdisk ]
-then
-	case $BBCOLORLEVEL in 
-		red )	
-			/usr/bin/notify.py ALT "$BBHOSTNAME disk is full"
-		;;
-		yellow )
-
-			/usr/bin/notify.py PHN "$BBHOSTNAME disk almost full "
-		;;
-	esac
-fi
-
-
-
-
-
-
diff --git a/abs/mv-core/hobbitmon/hobbitadd.py b/abs/mv-core/hobbitmon/hobbitadd.py
deleted file mode 100755
index b8ae15d..0000000
--- a/abs/mv-core/hobbitmon/hobbitadd.py
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/usr/bin/python
-#polls the hobbit server for ghost clients.  If it finds ghosts it will make a new bb-hosts file 
-#with the new clients. 
-#Will not add duplicate clients
-#return code of 0 means a new file was written, anything else is an error or no inserts occured
-import urllib2
-import string
-import sys
-
-
-def readbb():
-	global bblist
-	try:
-		infile = open('/data/srv/hobbit/etc/bb-hosts', 'r')
-	except(IOError), e:
-	  print "couldn't open bb-hosts file"
-       	  sys.exit(1)
-    	else:
-    		bblist = infile.readlines()
-		infile.close()
-
-
-def findghosts():
-	global infile
-	global bblist
-	global ghostitems
-	global numberitems
-	try:
-		f = urllib2.urlopen("http://localhost/hobbit/hobbit-cgi/hobbit-ghosts.sh?SORT=name&MAXAGE=300&TEXT")
-	except urllib2.HTTPError, e:
-		if e.code != 200:
-			print 'error find ghost list'
-			sys.exit(1)
-	else:
-		ghostitems = f.readlines()
-		f.close()
-		numberitems = len(ghostitems)
-		
-
-def makenewbb():
-	global bblist
-	global ghostitems
-	global numberitems
-	global numinserts
-	numinserts=0
-	outlist = []
-	for item in bblist:
-		if item not in outlist:
-			outlist.append(item)
-	
-	for item in ghostitems:
-		line = item.rstrip()
-		nline = "%s #func" % (line)
-		nline = nline + '\n'
-		if nline not in outlist:
-			outlist.append(nline)
-			print "adding: " + nline
-			numinserts = numinserts + 1
-	if numinserts > 0:
-		outfile = open("/data/srv/hobbit/etc/bb-hosts","w")
-		#outfile = open("/tmp/new-bb","w")
-		for i in outlist:
-			outfile.write(i + '\n' )
-		outfile.close
-
-
-global infile
-global bblist
-global ghostitems
-global numberitems
-global numinserts
-
-readbb()
-findghosts()
-print numberitems
-if numberitems > 0:
-	makenewbb()
-else:
-	print "nothing to add"
-	
-	
-if numinserts < 1:
-	sys.exit(1)
-else:
-	sys.exit(0)
-	
-	
diff --git a/abs/mv-core/hobbitmon/hobbitcheck.sh b/abs/mv-core/hobbitmon/hobbitcheck.sh
deleted file mode 100755
index 70f6508..0000000
--- a/abs/mv-core/hobbitmon/hobbitcheck.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-su nobody -c /data/srv/hobbit/server/bin/hobbitadd.py
-#if [ $? = 0 ]
-#then
-#	sv restart hobbit
-#fi
diff --git a/abs/mv-core/hobbitmon/hobbitgraph.cfg.diff b/abs/mv-core/hobbitmon/hobbitgraph.cfg.diff
deleted file mode 100644
index 1ca4caf..0000000
--- a/abs/mv-core/hobbitmon/hobbitgraph.cfg.diff
+++ /dev/null
@@ -1,42 +0,0 @@
---- hobbitgraph.cfg.orig	2008-01-08 09:24:59.000000000 -0600
-+++ hobbitgraph.cfg	2008-01-08 09:12:51.000000000 -0600
-@@ -1135,4 +1135,39 @@
- 	GPRINT:cnt@RRDIDX@:MIN: %6.1lf (min) \:
- 	GPRINT:cnt@RRDIDX@:AVERAGE: %6.1lf (avg)\n
- 
-+[storage]
-+	TITLE Storage Groups 
-+	YAXIS  recordings
-+	DEF:storage1=storage.rrd:rectvtotal:AVERAGE
-+	LINE2:storage1#00CCCC:current recorded
- 
-+	DEF:rectime=storage.rrd:rectvtime:AVERAGE
-+	LINE2:rectime#000000:current recorded time
-+
-+	DEF:livetime=storage.rrd:livetvtime:AVERAGE
-+	LINE2:livetime#00CC11:current live  time
-+
-+
-+[memmbe]
-+	TITLE Memory usage for MythBackend
-+	YAXIS mythbackend
-+	DEF:vmsize=memmbe.rrd:VmSize:AVERAGE
-+	LINE2:vmsize#00CCCC:vmsize
-+
-+	DEF:vmpeak=memmbe.rrd:VmPeak:AVERAGE
-+	LINE2:vmpeak#000000:vmpeak
-+
-+	DEF:vmrss=memmbe.rrd:VmRSS:AVERAGE
-+	LINE2:vmrss#00CC11:vmrss
-+
-+[memmfe]
-+	TITLE Memory usage for MythFrontend
-+	YAXIS mythfrontend
-+	DEF:vmsize=memmfe.rrd:VmSize:AVERAGE
-+	LINE2:vmsize#00CCCC:vmsize
-+
-+	DEF:vmpeak=memmfe.rrd:VmPeak:AVERAGE
-+	LINE2:vmpeak#000000:vmpeak
-+
-+	DEF:vmrss=memmfe.rrd:VmRSS:AVERAGE
-+	LINE2:vmrss#00CC11:vmrss
diff --git a/abs/mv-core/hobbitmon/hobbitlaunch.cfg.diff b/abs/mv-core/hobbitmon/hobbitlaunch.cfg.diff
deleted file mode 100644
index 6239125..0000000
--- a/abs/mv-core/hobbitmon/hobbitlaunch.cfg.diff
+++ /dev/null
@@ -1,40 +0,0 @@
---- hobbitlaunch.cfg.orig	2008-02-10 22:30:16.000000000 +0000
-+++ hobbitlaunch.cfg	2008-08-09 07:05:14.000000000 +0000
-@@ -204,3 +204,37 @@
- 	LOGFILE $BBSERVERLOGS/hobbitclient.log
- 	INTERVAL 5m
- 
-+[storage]
-+	
-+	ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-+	CMD /data/srv/hobbit/server/ext/hobbitstorage.py
-+	LOGFILE $BBSERVERLOGS/bb-storage.log
-+	INTERVAL 5m
-+[notes]
-+       ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-+       CMD /data/srv/hobbit/server/ext/hbnotes.py
-+       LOGFILE $BBSERVERLOGS/bb-notes.log
-+       INTERVAL 5m
-+[orphan]
-+       ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-+       CMD /data/srv/hobbit/server/ext/hobbit-myth-orphan.sh
-+       LOGFILE $BBSERVERLOGS/orphan.log
-+       INTERVAL 5m
-+ 
-+[func]
-+       ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-+       CMD sudo /data/srv/hobbit/server/ext/hbfunc.py
-+       LOGFILE $BBSERVERLOGS/hbfunc.log
-+       INTERVAL 5m
-+
-+[memmyth]
-+       ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-+       CMD  /data/srv/hobbit/server/ext/hobbit-mem-myth.sh
-+       LOGFILE $BBSERVERLOGS/mythmem.log
-+       INTERVAL 5m
-+
-+[mtc]
-+       ENVFILE /data/srv/hobbit/server/etc/hobbitserver.cfg
-+       CMD  /data/srv/hobbit/server/ext/hobbit_myth_data.py
-+       LOGFILE $BBSERVERLOGS/mtc
-+       INTERVAL 5m
diff --git a/abs/mv-core/hobbitmon/hobbitserver.cfg.diff b/abs/mv-core/hobbitmon/hobbitserver.cfg.diff
deleted file mode 100644
index 7c829fe..0000000
--- a/abs/mv-core/hobbitmon/hobbitserver.cfg.diff
+++ /dev/null
@@ -1,45 +0,0 @@
---- hobbitserver.cfg.orig	2008-01-08 15:25:34.000000000 +0000
-+++ hobbitserver.cfg	2008-01-08 16:22:56.000000000 +0000
-@@ -105,7 +105,7 @@
- CONNTEST="TRUE"					# Should we 'ping' hosts ?
- IPTEST_2_CLEAR_ON_FAILED_CONN="TRUE"		# If TRUE, then failing network tests go CLEAR if conn-test fails.
- NONETPAGE=""					# Network tests that go YELLOW upon failure
--FPING="/usr/sbin/fping"					# Path and options for the ping program.
-+FPING="hobbitping"					# Path and options for the ping program.
- NTPDATE="ntpdate"				# Path to the 'ntpdate' program
- TRACEROUTE="traceroute"                         # How to do traceroute on failing ping tests. Requires "trace" in bb-hosts.
- BBROUTERTEXT="router"				# What to call a failing intermediate network device.
-@@ -120,7 +120,9 @@
- # Size of the generated graph images
- RRDHEIGHT="120"
- RRDWIDTH="576"		# The RRD's contain 576 data points, so this is a good value
--
-+NCV_storage="*:GAUGE"
-+NCV_memmbe="*:GAUGE"
-+NCV_memmfe="*:GAUGE"
- # TEST2RRD defines the status- and data-messages you want to collect RRD data
- # about. You will normally not need to modify this, unless you have added a
- # script to pick up RRD data from custom tests (the hobbitd_larrd --extra-script
-@@ -132,11 +134,11 @@
- #
- # This is also used by the bb-hostsvc.cgi script to determine if the detailed
- # status view of a test should include a graph.
--TEST2RRD="cpu=la,disk,inode,qtree,memory,$PINGCOLUMN=tcp,http=tcp,dns=tcp,dig=tcp,time=ntpstat,vmstat,iostat,netstat,temperature,apache,bind,sendmail,mailq,nmailq=mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,files,procs=processes,ports,clock,lines"
-+TEST2RRD="cpu=la,disk,inode,qtree,memory,$PINGCOLUMN=tcp,http=tcp,dns=tcp,dig=tcp,time=ntpstat,vmstat,iostat,netstat,temperature,apache,bind,sendmail,mailq,nmailq=mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,files,procs=processes,ports,clock,lines,storage=ncv,memmbe=ncv,memmfe=ncv"
- 
- # This defines which RRD files to include on the "trends" column webpage,
- # and the order in which they appear.
--GRAPHS="la,disk,inode,qtree,files,processes,memory,users,vmstat,iostat,tcp.http,tcp,ncv,netstat,ifstat,mrtg::1,ports,temperature,ntpstat,apache,bind,sendmail,mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,clock,lines"
-+GRAPHS="la,disk,inode,qtree,files,processes,memory,users,vmstat,iostat,tcp.http,tcp,ncv,netstat,ifstat,mrtg::1,ports,temperature,ntpstat,apache,bind,sendmail,mailq,socks,bea,iishealth,citrix,bbgen,bbtest,bbproxy,hobbitd,clock,lines,storage,memmbe,memmfe"
- 
- # These two settings can be used to restrict what filesystems are being
- # tracked (i.e. have their utilisation graphed) by Hobbit.
-@@ -158,7 +160,7 @@
- HTMLCONTENTTYPE="text/html"                     # You can add charset options here.
- 
- # Fonts and texts
--HOBBITLOGO="Hobbit"                             # HTML inserted on all header pages at top-left corner.
-+HOBBITLOGO=""                             # HTML inserted on all header pages at top-left corner.
- MKBBLOCAL="<B><I>Pages Hosted Locally</I></B>"
- MKBBREMOTE="<B><I>Remote Status Display</I></B>"
- MKBBSUBLOCAL="<B><I>Subpages Hosted Locally</I></B>"
diff --git a/abs/mv-core/hobbitmon/hobbitstorage.py b/abs/mv-core/hobbitmon/hobbitstorage.py
deleted file mode 100755
index e79f8d1..0000000
--- a/abs/mv-core/hobbitmon/hobbitstorage.py
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/usr/bin/python
-# import MySQL module
-
-import MySQLdb
-import sys
-import getopt
-import socket
-import os
-import time
-import string
-
-def LIVETV():
-    grandtotal=0
-    global rectv_total
-    global rectv_time
-    global livetv_total
-    global livetv_time
-    # create a cursor
-    cursor = db.cursor()
-    # execute SQL statement
-
-    cursor.execute("SELECT unix_timestamp(starttime),unix_timestamp(endtime),title FROM recorded where recgroup=(%s) ORDER by starttime;" , ("livetv"))
-    result = cursor.fetchall()
-
-    for row in result:
-      #  print row[0], row[1] ,row [2]
-        start=row[0]
-        end=row[1]
-        if ( end  > start ):
-            total = (end - start) /60
-            grandtotal+=total
-    hours = grandtotal / 60.0
-    days = hours / 24.0
-
-    livetv_total=len(result)
-    livetv_time=hours
-
-
-
-def RECORDTV():
-    grandtotal=0
-    global rectv_total
-    global rectv_time
-    global livetv_total
-    global livetv_time
-    # create a cursor
-    cursor = db.cursor()
-    # execute SQL statement
-
-    cursor.execute("SELECT unix_timestamp(starttime),unix_timestamp(endtime),title FROM recorded where not recgroup=(%s) ORDER by starttime;" , ("livetv"))
-    result = cursor.fetchall()
-
-    for row in result:
-      #  print row[0], row[1] ,row [2]
-        start=row[0]
-        end=row[1]
-        if ( end  > start ):
-            total = (end - start) /60
-            grandtotal+=total
-    hours = grandtotal / 60.0
-    days = hours / 24.0
-
-    rectv_total=len(result)
-    rectv_time=hours
-
-
-
-def printvars():
-    print rectv_time
-    print rectv_total
-    print livetv_time
-    print livetv_total
-
-def sendTObb():
-    DATE = time.strftime("%a %b %d %H:%M:%S %Z %Y", time.localtime(time.time()))
-    if os.environ['BB']:
-        #print os.environ['BB']
-        BB=os.environ['BB']
-    if os.environ['BBDISP']:
-        #print os.environ['BBDISP']
-        BBDISP=os.environ['BBDISP']
-    if os.environ['MACHINE']:
-       # print os.environ['MACHINE']
-        MACHINE=os.environ['MACHINE']
-
-  #  MACHINE = socket.gethostname()
-  #  MACHINE = string.replace(MACHINE, '.', ',')
-    INFOLINE= "\n rectv_total:" + str(rectv_total)
-    INFOLINE= INFOLINE + "\n rectv_time:" + str(rectv_time)
-    INFOLINE= INFOLINE + "\n livetv_total:" + str(livetv_total)
-    INFOLINE= INFOLINE + "\n livetv_time:" + str(livetv_time)
-    INFOLINE= INFOLINE + "\n "
-
-
-
-    LINE = "status " + MACHINE + ".storage green" + " " + DATE + " " + INFOLINE
-
-    cmd = BB + ' ' + BBDISP + ' "' + LINE + '"'
-    os.system(cmd)
-    #print LINE
-
-def main(argv):
-    global db
-    global rectv_total
-    global rectv_time
-    global livetv_total
-    global livetv_time
-
-    rectv_total=0
-    rectv_time=0
-    livetv_total=0
-    livetv_time=0
-
-    db = MySQLdb.connect(host="localhost", user="mythtv", passwd="mythtv", db="mythconverg")
-
-    LIVETV()
-    RECORDTV()
-    #printvars()
-    sendTObb()
-if __name__ == "__main__":
-    main(sys.argv[1:])
diff --git a/abs/mv-core/hobbitmon/tuner.png b/abs/mv-core/hobbitmon/tuner.png
deleted file mode 100644
index e4ca198..0000000
--- a/abs/mv-core/hobbitmon/tuner.png
+++ /dev/null
diff --git a/abs/mv-core/hobbitmon/tv.png b/abs/mv-core/hobbitmon/tv.png
deleted file mode 100644
index 9c4490c..0000000
--- a/abs/mv-core/hobbitmon/tv.png
+++ /dev/null
diff --git a/abs/mv-core/initscripts/ChangeLog b/abs/mv-core/initscripts/ChangeLog
deleted file mode 100644
index 6bca6e0..0000000
--- a/abs/mv-core/initscripts/ChangeLog
+++ /dev/null
@@ -1,2447 +0,0 @@
-commit d0722bd6fb631ce6c678de32d09a10e2e5fa7c35
-Author: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-Date:   Sat Jul 18 02:58:04 2009 -0300
-
-    Fix rtc device to match current rule in udev-141-4.
-    
-    Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-    Signed-off-by: Allan McRae <allan@archlinux.org>
-
-commit 28d34292a9a8a03ea78a909ccb1d8d50ee21d0bb
-Author: Allan McRae <allan@archlinux.org>
-Date:   Sat Jul 18 14:20:55 2009 +1000
-
-    Fix incomplete elif statement
-    
-    Commit 92cbc62e introduced an incomplete elif statement which caues
-    shutdown to fail.
-    
-    Signed-off-by: Allan McRae <allan@archlinux.org>
-
-commit da966f2da8fc670e17f753b22b1365fdd72e1499
-Author: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-Date:   Thu May 28 00:17:42 2009 -0300
-
-    Convert to new initscript to new virtual console scheme
-    
-    Just convert vc/N to ttyN in all required places.
-    
-    Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-    Signed-off-by: Allan McRae <allan@archlinux.org>
-
-commit ad1e81556aa351fea39ed6eaf6efbed0ba7ce894
-Author: Aaron Griffin <aaronmgriffin@gmail.com>
-Date:   Tue Jun 30 14:57:18 2009 -0700
-
-    rc.conf: Switch to dhcp by default
-    
-    More of a sane default. Static config left as example
-    
-    Ref: FS#12670
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit 92cbc62e1c1b22c6cc251628e8d51a45607998b6
-Author: Gerhard Brauer <gerhard.brauer@web.de>
-Date:   Fri Jun 26 10:52:09 2009 -0700
-
-    Don't change hardwareclock if settings unclear
-    
-    Don't default to 'localtime' if HARDWARECLOCK is not set to UTC.
-    Check explicit values
-    
-    Ref: FS#15263
-    
-    Edited-by: Aaron Griffin <aaronmgriffin@gmail.com>
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit fb1177118b663da6b45021cb0ebdb40741047bac
-Author: Kurt J. Bosch <kujub@quantentunnel.de>
-Date:   Fri Jun 26 10:47:08 2009 -0700
-
-    Trigger uevents earlier
-    
-    Backgrounding the udev uevent triggering right after the launch
-    of the udev daemon allows us to do more in parallel before we wait
-    for uevents to complete (udevadm settle). This should speed up boot
-    
-    Ref: FS#12706
-    
-    Idea-from: Vahid Hamidullah <vh22@njit.edu>
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit 2b94f1cf826ddbb61fa840c4175bb9c681eea0be
-Author: Gerardo Exequiel Pozzi <djgera@exequiel.ban2.ar>
-Date:   Sun May 24 17:08:49 2009 -0300
-
-    Fix warning when compiling without -ansi flag
-    
-    Add a #define without checking if already defined
-    (introduced in a2db62cbc2f326c30bfd39be31fe71472b8e47e1 )
-    
-    Signed-off-by: Gerardo Exequiel Pozzi <djgera@exequiel.ban2.ar>
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit ef21324f73efe5ca7777d9acc3a262de2294f371
-Author: Gerardo Exequiel Pozzi <djgera@exequiel.ban2.ar>
-Date:   Sun May 24 16:58:42 2009 -0300
-
-    Fix minilogd.c eat memory on buflines>=MAX_BUF_LINES
-    
-    Do not allocate more memory and leak when buflines>=MAX_BUF_LINES
-    
-    Signed-off-by: Gerardo Exequiel Pozzi <djgera@exequiel.ban2.ar>
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit 5e0ac3a1759134a63936e7a3dcf2c4378b934617
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Tue Jun 9 00:02:58 2009 +0200
-
-    network: Remove the hotplug_ifup command, the function has been removed a long time ago
-
-commit d42decabd30ff8031a02cb94ddf98a86a38eecdc
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Sun Jun 7 16:36:03 2009 +0200
-
-    Fix array count/walk in rc.shutdown and rc.single, see #13263
-
-commit f4a0e350119794972bb1d022a6364fd10a0d80e9
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Sun Jun 7 16:22:47 2009 +0200
-
-    We always mount /sys, thus remove a superfluous check for /sys/block. Also fixes #14437
-
-commit a9a347fc65966265a30774d02e1d114623185b92
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Sun Jun 7 16:11:46 2009 +0200
-
-    Make the daemon shutdown in rc.single consistent with rc.shutdown, see #12978
-
-commit 2577e2d04044253add5df0bf8dc3af01a7609c24
-Author: Hugo Doria <hugo@archlinux.org>
-Date:   Wed May 27 16:30:19 2009 -0300
-
-    Remove a useless check of dmesg.log file Signed-off-by: Hugo Doria <hugo@archlinux.org>
-
-commit 07d2701e269042015656bfbdacff8349ca77a687
-Author: Aaron Griffin <aaronmgriffin@gmail.com>
-Date:   Thu Apr 2 09:05:12 2009 -0700
-
-    Make sure functions ends cleanly
-    
-    When errexit was set, sourcing functions caused a script to
-    exit. Fix this by using a real 'if' instead of the
-       [ a ] && b
-    syntax.
-    
-    Also, fix the vim modeline :)
-    
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit e679e9db7c09474da1411db3f18449a1f5e8cc6b
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Tue Mar 10 22:04:12 2009 +0100
-
-    Create /var/lib/misc if it doesn't exist
-    This is necessary because the filesystem package doesn't currently contain this directory
-
-commit c79828e29eae787048535fa67726c2f174f6b2c5
-Author: Aaron Griffin <aaronmgriffin@gmail.com>
-Date:   Tue Mar 10 13:59:16 2009 -0700
-
-    Add the adjtime cron job to install.sh
-    
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit cbb9215591b618f09adc70889f32864a6f566f47
-Author: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-Date:   Mon Mar 9 14:47:35 2009 -0700
-
-    minilogd: ensure we free() the buffer
-    
-    This isn't strictly needed, as memory is cleaned up
-    on exit anyway, but let's shoot for good form :)
-    
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit c206cfd1de94e2e79c1d9d42dc8f44f140d4c3f8
-Author: Aaron Griffin <aaronmgriffin@gmail.com>
-Date:   Mon Mar 9 14:09:56 2009 -0700
-
-    Add adjtime handling to hwclock init
-    
-    The hwclock man page recommends calling hwclock with --adjust
-    at start time, and periodically during system run. So let's do
-    that here.
-    
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit 5d0fb0ef703ca78f399aadce43dd813effda52f5
-Author: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-Date:   Mon Mar 9 13:58:44 2009 -0700
-
-    minilogd: Initialize values for accept()
-    
-    From the accept(2) manpage:
-    The addrlen argument is a value-result argument: the caller must initialize it
-    to contain the size (in bytes) of the structure pointed to by addr; on return it
-    will contain the actual size of the peer address.
-    
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit f3a60b900d22349445de1481d6171297ac022ff0
-Author: Allan McRae <allan@archlinux.org>
-Date:   Mon Mar 9 19:53:39 2009 +1000
-
-    Fix status display functions
-    
-    The status display functions were returning the opposite of what
-    they should have been.  Also made cosmetic changes to the output.
-    
-    Signed-off-by: Allan McRae <allan@archlinux.org>
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit a2db62cbc2f326c30bfd39be31fe71472b8e47e1
-Author: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
-Date:   Mon Mar 9 12:08:45 2009 -0700
-
-    Fix minilogd headers
-    
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit 623e3fac060b0f4b32c0ec767d76ef57f5040ed1
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Sat Mar 7 20:16:45 2009 +0100
-
-    Use the device nodes from /lib/udev/devices/* instead of hardcoding them in initscripts. This requires a new udev package (at least 139-1)
-
-commit 666cd9b3971e171f4e8ec348666ab8ff8bfe97d8
-Author: Aaron Griffin <aaronmgriffin@gmail.com>
-Date:   Tue Mar 3 08:39:13 2009 -0800
-
-    Remove the kernel 'quiet' handling for fsck
-    
-    This is simply confusing that we use the kernel "quiet" parameter
-    to mute fsck output. Removed for now - perhaps we can add a better
-    solution later.
-    
-    Ref: FS#12928
-    
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit 21f528419f945f0d2f867ffa55553b4d5da7f4b8
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Wed Feb 11 22:06:13 2009 +0100
-
-    Fix bug #13205: better random-seed entropy
-    - For the random-seed file location to be more "FHS compliant" is better to put in /var/lib/misc/random-seed (Variable state
-      information, that persists after reboot) than the /var/run/random-seed (Run-time variable data, that not necessarily persists
-      after reboot) for example with /var/run mounted as TMPFS.
-    - The random-seed file permision should be "0600" not "0644"
-    - The size of random-seed acording to random(4) manpage should be the size specified in "/proc/sys/kernel/random/poolsize" in
-      other case 512 bytes.
-
-commit e932c3406acf105c99e159ca0610768fbfb49b1a
-Author: Petar Bogdanovic <petar@smokva.net>
-Date:   Tue Feb 10 08:27:07 2009 -0800
-
-    Allow the user to cancel an fsck
-    
-    Don't fail and force a reboot if the user cancels an fsck
-    on boot.
-    
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit 2c5e306be0bcc8d91662176bfcfb55ec95777bc3
-Author: Aaron Griffin <aaronmgriffin@gmail.com>
-Date:   Wed Jan 21 13:10:34 2009 -0800
-
-    Adjust copyright year to 2009
-    
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit ad81ddafabd95ee1ea7169880a6a80f04babf9a6
-Author: Aaron Griffin <aaronmgriffin@gmail.com>
-Date:   Tue Dec 23 14:45:30 2008 -0800
-
-    Add some simple status display functions
-    
-    This is useful for displaying daemon status in functions
-    like /etc/rc.d/$DAEMON status
-    
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit fa4f2f14870500eeab3233da07647a7c2c5e1648
-Author: Aaron Griffin <aaronmgriffin@gmail.com>
-Date:   Tue Dec 23 14:43:51 2008 -0800
-
-    Adjust minilogd's maximums
-    
-    A max of 200000 lines stored, at 8K per line, was a little
-    ridiculous and soaked up way to much memory if a syslogger
-    was not started. Drop the max to 10000 so that we don't kill
-    the user's system.
-    
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit 0e4ff39e5a5c72b7d4e8d251d029d4342f68b7b6
-Author: Aaron Griffin <aaronmgriffin@gmail.com>
-Date:   Tue Dec 23 14:41:09 2008 -0800
-
-    chmod /var/run/utmp to 664 when creating
-    
-    This allows X terminals to write to /var/run/utmp
-    so that they are reported properly to commands like
-    who and w
-    
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit af3ac0dc954d96855555aa8cb12633494d465a77
-Author: Aaron Griffin <aaronmgriffin@gmail.com>
-Date:   Thu Dec 4 09:40:14 2008 -0800
-
-    unset the TZ envvar in 'functions'
-    
-    This prevents a local TZ variable from breaking
-    daemon's when started by root. Daemon's should always
-    respect the system's /etc/localtime
-    
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit 9ac428a113d5dee2b4d5469fdfdb383eda90d4c6
-Author: Aaron Griffin <aaronmgriffin@gmail.com>
-Date:   Mon Nov 24 07:50:45 2008 -0800
-
-    Switch commented kdm path
-    
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit 572019c5a188d22a1e833c1a27081227a65133f9
-Author: Roman Kyrylych <roman@archlinux.org>
-Date:   Thu Sep 25 00:33:32 2008 -0500
-
-    Added missing slash
-    
-    Signed-off-by: Roman Kyrylych <roman@archlinux.org>
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit af5516dc690a3b2fab88188cfcde898ca0efbf4b
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Thu Sep 18 22:21:39 2008 +0200
-
-    Fix bug #11229
-
-commit 8f1628613cc5746b7c85c6f84776b365833f1dad
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Thu Sep 18 18:55:14 2008 +0200
-
-    Respawn udev properly when running 'init s'. Fixes #9739
-
-commit ce600eea3b9383f167cb91d784aff04821fa0528
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Sun Sep 14 19:46:14 2008 +0200
-
-    Remove references to start_udev from rc.sysinit
-
-commit d399979d08be1ae2cc8e4ab60a68c57b120d08a0
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Sun Sep 14 19:41:14 2008 +0200
-
-    Revert "Create udev required device nodes if missing"
-    
-    This reverts commit 119b8df1fb1258231750309f01e747e72f382493.
-    These nodes are created like 10 lines above, the [ -f ... ] check would always return false anyway (-f == regular file)
-
-commit 119b8df1fb1258231750309f01e747e72f382493
-Author: Aaron Griffin <aaronmgriffin@gmail.com>
-Date:   Sat Aug 30 21:11:39 2008 -0500
-
-    Create udev required device nodes if missing
-    
-    Udev requires /dev/console, /dev/null, and /dev/zero to exist
-    before running. Create these on init if they're missing
-    
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit d2ae38c8b06d057c7593b7ba836bf24a1f8f6c4f
-Author: Aaron Griffin <aaronmgriffin@gmail.com>
-Date:   Tue Aug 5 14:34:53 2008 -0400
-
-    Set kbd_mode on all virtual consoles
-    
-    Previous behavior only set the mode for vc0.
-    See FS#11093
-    
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit b7d66decca5117aaba3b73d2eccb97594ef1ea98
-Author: Daniel Kaminski <maniel.rulez@gmail.com>
-Date:   Tue Jul 22 17:50:02 2008 -0400
-
-    ipv6 over ipv4 tunneling support in /etc/rc.d/network
-    
-    This is done by checking the route config for a double colon
-    
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit 04899c1b829f1a4708a04e2188b256901845770f
-Author: Aaron Griffin <aaronmgriffin@gmail.com>
-Date:   Fri Jul 18 11:47:22 2008 -0400
-
-    Remount filesystems RO if umounting fails
-    
-    Just a safeguard, suggested by FS#10947
-    
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit e13ee23fd2d0035150d178fc683079696fb446fc
-Author: James Rayner <james@archlinux.org>
-Date:   Mon Jul 14 21:24:33 2008 +1000
-
-    Add some useful error messages to wireless code
-    
-    Additionally add optional WIRELESS_TIMEOUT parameter
-    
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit 84f76aafc5f6d7f3d2c2141d2930e42dcb82def0
-Author: Aaron Griffin <aaronmgriffin@gmail.com>
-Date:   Mon Jun 30 12:35:21 2008 -0400
-
-    Decouple ISO release name from initscripts
-    
-    This should aleviate some gripes
-    
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit 9dcd7a9fed510dacd14e4cf4497e73a98f847fac
-Author: Natanael Copa <natanael.copa@gmail.com>
-Date:   Fri Jun 20 13:46:10 2008 -0400
-
-    Minor simplication for /etc/rc.d/functions.d/
-    
-    Trivial simplification to make code more readable.
-    Removes one fork so booting should be "faster". Probably not mesureable
-    
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit fa73767d19ea505ec32533b8856122968207db2f
-Author: Anton Fiuman <llexiw@gmail.com>
-Date:   Sun May 25 00:55:56 2008 +0200
-
-    Allow users to ovverride daemon start and stop in rc.multi and rc.shutdown
-    
-    Signed-off-by: Anton Fiuman <llexiw@gmail.com>
-
-commit 63db98c2a8e256f9219c5c6501b40846040bf089
-Author: Aaron Griffin <aaronmgriffin@gmail.com>
-Date:   Thu May 22 13:02:55 2008 -0400
-
-    Remove source_functions in favor of always sourcing the dir
-    
-    This is an obvious oversight on my part - this change allows
-    the overridden functions to work in daemon scripts and
-    anything else that uses /etc/rc.d/functions by itself.
-    
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit de031161e02772aaeaefed1398f8ad59621bd8bc
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Wed May 14 13:49:16 2008 +0200
-
-    Fix commit 521d7678cecb3018923f7c869bc8a5f74dc29268, this makes more sense
-
-commit af36e8dd3c025d7593bda4f310612989927149d1
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Sun Apr 13 18:32:43 2008 +0200
-
-    Always quote $TIMEZONE to fix FS#10178
-
-commit 521d7678cecb3018923f7c869bc8a5f74dc29268
-Author: Pierre Schmitz <pierre@archlinux.de>
-Date:   Sat Apr 12 13:37:22 2008 +0200
-
-    fixing udev hotplugging Some devices like scanners do not work with recent udev/initscript changes. This patch seems to fix such issues.
-
-commit 42c5f304ad361fd9e16d08a5230043e47437c399
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Tue Apr 8 20:12:55 2008 +0200
-
-    Just some whitespace fixes
-
-commit 391cfa71285cfca49aed0d6d2a05c9a949cb9857
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Mon Apr 7 15:33:20 2008 +0200
-
-    Remove setterm screen blanking from rc.sysinit
-    Contrary to what one may think, screen blanking not only affects the
-    console, but also the X server. This line may lead to unwanted blank screens
-    although one has DPMS disabled in X. Furthermore, it adds a hardcoded,
-    non-configurable default setting to Arch.
-    This should either be made configurable (but IMO, we don't need more stuff
-    in rc.conf) or added to rc.local by the user if needed. As this is a
-    one-liner, the second solution sounds good to me.
-
-commit a58228bfe3764008ecf971d420fb7fa0bb704b54
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Sun Apr 6 23:37:17 2008 +0200
-
-    Remove extra newline from udev status output
-
-commit 307c850a0c345a092a21fff50da2f0658c3c03c4
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Sun Apr 6 23:30:48 2008 +0200
-
-    Remove the "interface is already up" check from ifup
-    As stated in commit f589387f0b9ef56de8ab30f50a3c562e010baeeb, even an
-    interface that is 'UP' may need configuring. However, the check introduced
-    in this commit is nonsense (causing bug #9960, possibly others). The best
-    idea is to remove the check altogether: This may cause duplicate dhcpcd
-    processes to run (should be fixed), but otherwise ensures the interface is
-    brought up when it should be.
-
-commit 89355a468670983476d29b415c12e097d5d79ca5
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Sun Apr 6 23:20:37 2008 +0200
-
-    Fix USEDIRECTISA in rc.shutdown as well
-
-commit b55845f7d0e3c81f1936d471370dcb40822463b0
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Sun Apr 6 15:55:23 2008 +0200
-
-    Remove old initrd hacks
-    We haven't been using initrd for a while, so these hacks are unnecessary.
-    The "encrypted root device hack" was obsoleted by proper udev rules long
-    ago. The code to umount and free the initrd is not critical, so if somebody
-    insists on using initrd, it can be done in rc.local.
-
-commit 4c493ec5599b1a30dadc51567e2546a63feb87ef
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Sun Apr 6 15:50:57 2008 +0200
-
-    Make USEDIRECTISA default to no, which is a sane default according to hwlock's manpage. This is contrary to the behaviour in older initscripts.
-
-commit 4a4cb51a138d73753bb967c27a9f7ea8bf9f88b3
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Sun Apr 6 15:48:22 2008 +0200
-
-    Move /sys mounting to the beginning, together with /proc and /dev and clean up some comments
-
-commit f3e064ec822b3dae191e1ae5d2bb921a970af86e
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Sun Apr 6 15:40:08 2008 +0200
-
-    Remove any special handling of usbfs from rc.sysinit
-    libusb has migrated to /dev/bus/usb, which is managed by udev and thus more
-    flexible. Some legacy applications (like VirtualBox) still use it. However,
-    since users need special permissions to access usbfs, they have to be
-    specified via mount options in fstab. So there are two cases:
-    1) a user does not need usbfs
-    2) a user needs it, but must add it to fstab to force the right permissions
-    Our old special handling in rc.sysinit is thus obsolete (and it was ugly
-    anyway).
-
-commit 5386d7332dd77ecf4113dfc10773b529f583e797
-Author: Roman Kyrylych <roman@archlinux.org>
-Date:   Wed Mar 19 11:12:19 2008 +0200
-
-    Use actual device number for creating /dev/misc/rtc0
-    
-    Signed-off-by: Roman Kyrylych <roman@archlinux.org>
-
-commit 6e37620983c107e13120d1e249a37b3be6d0b12d
-Author: Roman Kyrylych <roman@archlinux.org>
-Date:   Tue Mar 18 22:43:38 2008 +0200
-
-    Do not try to create /dev/pts and /dev/shm twice
-    
-    Signed-off-by: Roman Kyrylych <roman@archlinux.org>
-
-commit a71b075e90154073e3ba331de9b74b8bc088ec45
-Author: Aaron Griffin <aaronmgriffin@gmail.com>
-Date:   Tue Mar 18 12:33:24 2008 -0500
-
-    Fix a directory typo
-    
-    Looks like a 'bin/' slipped in there somewhere. Whoops
-    
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit 52a6990bc7ab0b48d6d227a8dcb782cb1d419dd5
-Author: Aaron Griffin <aaronmgriffin@gmail.com>
-Date:   Mon Mar 17 11:34:12 2008 -0500
-
-    Variable expansion quoting
-    
-    This was missed, and caused some gross output if a user
-    mistakenly had a space in their timezone (we should fail
-    gracefully here, not let bash error).
-    
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit 15647a9f42a00406ec1c1c02515fe1e90825bd9b
-Author: Roman Kyrylych <roman@archlinux.org>
-Date:   Tue Mar 11 00:02:22 2008 +0200
-
-    Remove the 'makedevs' script
-    
-    * last touched somewhere in 2005
-    * not used by anything
-    * sits in /sbin but uses software from /usr/bin
-    * makedev in Extra exists
-    * if one wants a static /dev - just use mknod
-    
-    Signed-off-by: Roman Kyrylych <roman@archlinux.org>
-
-commit 12ee0a4fe0108fe952dc31c5f42648037b9c5cde
-Author: Roman Kyrylych <roman@archlinux.org>
-Date:   Mon Mar 10 17:58:48 2008 +0200
-
-    Fix a typo in /dev/rtc creation steps
-    
-    Signed-off-by: Roman Kyrylych <roman@archlinux.org>
-
-commit 7526db5d0405188fee94d16fbcfbdf13a17e6a45
-Author: Roman Kyrylych <roman@archlinux.org>
-Date:   Sun Mar 9 17:22:11 2008 +0200
-
-    More full-path fixes
-    
-    Signed-off-by: Roman Kyrylych <roman@archlinux.org>
-
-commit 2c9681f461a0cde98a88de65e232369df68ed859
-Author: Roman Kyrylych <roman@archlinux.org>
-Date:   Sat Mar 8 20:02:09 2008 +0200
-
-    Add basic support for dependencies in rc.d scripts
-    
-    Example of use:
-      DEPENDS=('dbus' 'acpid')
-      . . .
-      ck_depends ${DEPENDS[@]}
-    and those daemons will be started if not running already
-    
-    Signed-off-by: Roman Kyrylych <roman@archlinux.org>
-
-commit 45e331302268490cfb532ea6fe827cba1351ec5b
-Author: Roman Kyrylych <roman@archlinux.org>
-Date:   Sat Mar 8 19:22:48 2008 +0200
-
-    Use full path to binaries everywhere
-    
-    Signed-off-by: Roman Kyrylych <roman@archlinux.org>
-
-commit 6214a05ea023b8bc3014d8032af18b2404276d00
-Author: Roman Kyrylych <roman@archlinux.org>
-Date:   Sat Mar 8 18:45:24 2008 +0200
-
-    Create /dev/rtc before running hwclock (FS#9636)
-    
-    Signed-off-by: Roman Kyrylych <roman@archlinux.org>
-
-commit 973c1b65ad9fb92c6a0e017a7b8bfb40c38b3bcd
-Author: Roman Kyrylych <roman@archlinux.org>
-Date:   Sat Mar 8 19:28:08 2008 +0200
-
-    Fix indentation in rc.d/functions
-    
-    Signed-off-by: Roman Kyrylych <roman@archlinux.org>
-
-commit 646862aa989d82c35d267d5771c6cc620275bf4c
-Author: Aaron Griffin <aaronmgriffin@gmail.com>
-Date:   Fri Mar 7 14:35:31 2008 -0600
-
-    Additional /dev/ setup that udev doesn't do
-    
-    These nodes are not covered by default udev, so lets make
-    sure they're added properly.
-    
-    Ref: FS#9726
-    
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit abe6dcb83d16c6e40fed99c202085c78cb356fa1
-Author: Aaron Griffin <aaronmgriffin@gmail.com>
-Date:   Fri Mar 7 14:34:26 2008 -0600
-
-    Add my name to the copyright output
-    
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit 91b86efedd70e6b83232057fbf2b089a47b76333
-Author: Roman Kyrylych <roman@archlinux.org>
-Date:   Thu Mar 6 00:24:20 2008 +0200
-
-    Revert back to not loading defkeymap
-    
-    * There is a patch for the kernel now, so no need to workaround the bug
-    * Add a missing check for an empty KEYMAP
-    
-    Signed-off-by: Roman Kyrylych <roman@archlinux.org>
-
-commit 56fffa9954db654c1731e07f753c3de105896455
-Author: Roman Kyrylych <roman@archlinux.org>
-Date:   Sun Mar 2 16:31:34 2008 +0200
-
-    Always load defkeymap
-    
-    It seems that there's a bug in the kernel 2.6.24,
-    which makes the built-in defkeymap to produce incorrect composite chars.
-    Thus keymaps that don't have 'include "compose.latin1"' have issues (FS#9593).
-    While it is better to fix this bug in kernel and all affected keymaps
-    loading defkeymaps before other keymaps seems to not hurt anyway.
-    
-    Signed-off-by: Roman Kyrylych <roman@archlinux.org>
-
-commit f94f52e5ab877ffc3160d0bf20c70be9865d45b2
-Author: Roman Kyrylych <roman@archlinux.org>
-Date:   Sat Mar 1 00:40:02 2008 +0200
-
-    Set up vc/0 as well
-    
-    Signed-off-by: Roman Kyrylych <roman@archlinux.org>
-
-commit 1b5eeefa5a859a9c26a717603bd4c0e9fb74de82
-Author: Roman Kyrylych <roman@archlinux.org>
-Date:   Sat Mar 1 00:04:01 2008 +0200
-
-    Do not mount /proc/bus/usb if commented in fstab
-    
-    Fixes FS#9451
-    
-    Signed-off-by: Roman Kyrylych <roman@archlinux.org>
-
-commit 4d0920ede7ce9c3d67e03c67b9ee584cf1a3fe9d
-Author: Roman Kyrylych <roman@archlinux.org>
-Date:   Thu Feb 28 13:55:41 2008 +0200
-
-    Make non-UTF-8 consoles work correctly in .24+ kernels
-    
-    * Since 2.6.24 the virtual terminal is in UTF-8 mode
-    and the keyboard is in Unicode mode by default,
-    and configurable only at run-time.
-    
-    * To make non-UTF-8 consoles work correctly:
-    - the non-UTF-8 mode is set for the virtual terminal,
-    - the XLATE mode is set for the keyboard.
-    
-    * UTF-8 mode is still set explicitly (not relying on default),
-    so console works correctly even in a case when user set vt.default_utf8=0
-    in kernel commandline, but LOCALE in rc.conf is *.UTF-8.
-    
-    * % is a special symbol for printf, so it should be written twice.
-    
-    Signed-off-by: Roman Kyrylych <roman@archlinux.org>
-
-commit ef86e38e9fd750db35e23aa949aa60e4c9f60f0c
-Author: Roman Kyrylych <roman@archlinux.org>
-Date:   Thu Feb 21 18:07:44 2008 +0200
-
-    Remove trailing whitespaces and do some little reformatting
-    
-    Signed-off-by: Roman Kyrylych <roman@archlinux.org>
-
-commit bb639b33167e13602aacf34bab6032992e7b3d6a
-Author: Aaron Griffin <aaronmgriffin@gmail.com>
-Date:   Wed Feb 20 23:46:57 2008 -0600
-
-    Add some udev stats output
-    
-    So we can see timing and all that jazz
-    
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit e658f681e1d36a75b527d182ce28ee0781ed4492
-Author: Dan McGee <dan@archlinux.org>
-Date:   Thu Feb 14 20:16:49 2008 -0600
-
-    rc.shutdown: Fix hwclock double calls
-    
-    Commit 9673449ac0af77751eab62423114f27e7dbc497c added --directisa
-    configuration to rc.shutdown, but didn't remove the old hwclock calls and
-    instead just added a second call. Remove the original calls.
-    
-    Signed-off-by: Dan McGee <dan@archlinux.org>
-
-commit e16e2d17c97f91cdb9eda0ad3525ee7977ad40a6
-Merge: 626037f fbb8d26
-Author: Dan McGee <dan@archlinux.org>
-Date:   Thu Feb 14 19:56:02 2008 -0600
-
-    Merge branch 'posix' into working
-
-commit 626037f6043596f21511b76b088dca86fc079f42
-Author: Dan McGee <dan@archlinux.org>
-Date:   Thu Feb 14 19:53:03 2008 -0600
-
-    functions:source_functions(): don't fail on empty dir
-    
-    Instead of using globbing which will fail on an empty directory, use an ls
-    call similar to other places in the initscripts which is not prone to
-    failure. (See rc.single in the daemon shutdown for example.)
-    
-    Signed-off-by: Dan McGee <dan@archlinux.org>
-
-commit fbb8d26a81dc220d7795be871e09c89fd0e03a76
-Author: Dan McGee <dan@archlinux.org>
-Date:   Fri Nov 30 09:30:05 2007 -0600
-
-    Remove echo -e usage from rc.sysinit
-    
-    Use the always available (in sh) printf method instead.
-    
-    Signed-off-by: Dan McGee <dan@archlinux.org>
-
-commit 7b6fddfb12106c9485a9ceb8fa1876a501d1f181
-Author: Dan McGee <dan@archlinux.org>
-Date:   Fri Nov 30 09:23:02 2007 -0600
-
-    Remove some bashisms from network, even though we cannot convert it
-    
-    Since netfs and network source rc.conf, we cannot fully convert it to an sh
-    script. However, we can get rid of a few things that are not sh compatible.
-    
-    Signed-off-by: Dan McGee <dan@archlinux.org>
-
-commit e3985084056bb80c886ea649674c3da5b906ccab
-Author: Dan McGee <dan@archlinux.org>
-Date:   Fri Nov 30 09:18:26 2007 -0600
-
-    Make install.sh sh compatible
-    
-    Signed-off-by: Dan McGee <dan@archlinux.org>
-
-commit 980791fd888b6efff6319c77363aab473166ca6b
-Author: Dan McGee <dan@archlinux.org>
-Date:   Fri Nov 30 09:17:15 2007 -0600
-
-    Make functions sh compatible
-    
-    There is no reason to use bashisms in functions, so eliminate any and use
-    printf instead of echo options which are not guaranteed to be implemented in
-    a POSIX sh.
-    
-    Signed-off-by: Dan McGee <dan@archlinux.org>
-
-commit dc4cee8f5987098a07a8b272573424b599a52598
-Author: Dan McGee <dan@archlinux.org>
-Date:   Sat Nov 17 12:03:59 2007 -0600
-
-    Don't assume sh == bash
-    
-    Signed-off-by: Dan McGee <dan@archlinux.org>
-
-commit ccc90d4d211a61a21c835c1e51c807ddd485a136
-Author: Roman Kyrylych <roman@archlinux.org>
-Date:   Thu Feb 14 14:51:40 2008 -0600
-
-    Add support for (un)mounting nfs4
-    
-    Signed-off-by: Roman Kyrylych <roman@archlinux.org>
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit 9673449ac0af77751eab62423114f27e7dbc497c
-Author: Roman Kyrylych <roman@archlinux.org>
-Date:   Wed Jan 23 17:46:03 2008 -0600
-
-    Use --directisa configuration in rc.shutdown as well
-    
-    Signed-off-by: Roman Kyrylych <roman@archlinux.org>
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit f589387f0b9ef56de8ab30f50a3c562e010baeeb
-Author: Loic Nageleisen <lloeki@gmail.com>
-Date:   Tue Jan 8 09:14:42 2008 -0600
-
-    Enhance interface 'up' state checking
-    
-    Using the 'UP' state to imply operational status is wrong and even if a
-    device is 'UP' we may still need to run ifconfig/dhcp
-    
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit 9e341d31cd15172941268412d258c38591ff4988
-Author: Aaron Griffin <aaronmgriffin@gmail.com>
-Date:   Tue Jan 8 09:09:46 2008 -0600
-
-    network script logic cleanups/enhancements
-    
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit 7719cd7c0ac6d3f316ed8595becf29ef418d9af9
-Author: Aaron Griffin <aaronmgriffin@gmail.com>
-Date:   Tue Jan 8 09:07:05 2008 -0600
-
-    Remove the hotplug functionality from the network script
-    
-    Hotplug hasn't been supported in Arch for ages
-    
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit c2d7f40b2e0837f5544e6e2bfc22dc12e994ed16
-Author: Aaron Griffin <aaronmgriffin@gmail.com>
-Date:   Tue Jan 8 03:35:05 2008 -0600
-
-    Create some basic device nodes on initialization
-    
-    We need, at the very least, these three device nodes
-    (null, console, and zero) created before we get udev
-    up and running
-    
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit cd0b3911131ee0eddc32c5e3992036c2e769948f
-Author: Jonathan Frazier <eyeswide@gmail.com>
-Date:   Tue Jan 8 03:26:12 2008 -0600
-
-    minilogd cleanup and warning fixes
-    
-    gcc gives a warning about signed/unsigned ints, and it tries to write to
-    syslog's /dev/log with a dgram socket which gives an EPROTOCOL error.
-    
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit 9bf2014b750579d9720c13c9dfb9d358e0c27665
-Author: Aaron Griffin <aaronmgriffin@gmail.com>
-Date:   Tue Jan 8 03:06:56 2008 -0600
-
-    Allow --directisa configuration for hwclock calls
-    
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit ab5595c4f8cdea8e6b1813701828576cbfee2fc2
-Author: Aaron Griffin <aaronmgriffin@gmail.com>
-Date:   Thu Dec 20 12:32:12 2007 -0600
-
-    Deprecate MOD_BLACKLIST via some comments
-    
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit 2694f1224dfb5b5c734a781fc813e639139feb39
-Author: Aaron Griffin <aaronmgriffin@gmail.com>
-Date:   Thu Dec 20 12:19:56 2007 -0600
-
-    Mount our ram /dev as soon as possible
-    
-    On readonly root systems, lots of fdup calls fail on device nodes, for
-    instance in minilogd. So we'll mount /dev as early as we can
-    
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit 25811badce84cd157a8b66c84e78f931cad1d129
-Author: Aaron Griffin <aaronmgriffin@gmail.com>
-Date:   Thu Dec 20 12:15:26 2007 -0600
-
-    Set hwclock *before* udev is loaded
-    
-    This prevents /dev/ timestamps from being 'in the future' when the hwclock
-    is not in UTC.
-    
-    Closes FS#8665
-    
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit b82f9d580d1ab70e78de4c81c180c5a308bd1238
-Author: James Rayner <james@archlinux.org>
-Date:   Thu Dec 20 10:53:25 2007 -0600
-
-    Tidy up rc.conf
-    
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit a4a35bda6ef3fd3e444e90ab362369f0b1f511dc
-Author: Simo Leone <simo@archlinux.org>
-Date:   Thu Dec 20 01:30:59 2007 -0600
-
-    Make the background black on all status text
-    
-    This is the easiest way to cleanup the script output on white terminals
-    without resorting to shutting off color.
-    
-    It won't make everyone happy, though.
-    
-    Ref: FS#1186
-    
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit 5ccb8edb591213e03fc3909aa7db7242b9f54b30
-Author: Aaron Griffin <aaronmgriffin@gmail.com>
-Date:   Mon Dec 17 16:16:38 2007 -0600
-
-    Modify comment above MOD_AUTOLOAD to indicate that it autoloads
-    
-    Some people thought the comment was unclear
-    
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit 20d6e1081ec7105207c01e9d8d2a58bb4a145331
-Author: Aaron Griffin <aaronmgriffin@gmail.com>
-Date:   Mon Dec 17 16:08:05 2007 -0600
-
-    Save dmesg output at the end of the boot process
-    
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit 9d86b8814583509069ad6707688e2b41fc0d292f
-Author: Roman Kyrylych <roman@archlinux.org>
-Date:   Wed Dec 12 10:28:37 2007 -0600
-
-    Fix FS#8843 (no colors in rc.sysinit output with separate /usr)
-    
-      when tput returns exit code 3 - assume it output '8'
-      (as written in the /usr/share/terminfo/l/linux file)
-    
-    Signed-off-by: Roman Kyrylych <roman@archlinux.org>
-    
-    Converted to if/elsif form
-    
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit 662a52c15343338e9d843c6f70d39acefd3a2c4c
-Author: Dan McGee <dan@archlinux.org>
-Date:   Sun Nov 18 11:47:54 2007 -0600
-
-    Move start_udev actions to rc.sysinit
-    
-    start_udev has been deprecated upstream for some time. We shouldn't use
-    some hacked up version of it either.
-    
-    Signed-off-by: Dan McGee <dan@archlinux.org>
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit b1d0ec7cb6e8cea9f2fd7b0c11a0b607467615bd
-Author: James Rayner <james@archlinux.org>
-Date:   Sat Nov 10 13:26:39 2007 +1100
-
-    Removing netcfg from initscripts
-    
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit b8e558d5784c8054a91dcefd8495b739a664dbae
-Author: Aaron Griffin <aaronmgriffin@gmail.com>
-Date:   Wed Nov 28 14:47:09 2007 -0600
-
-    Source /etc/rc.d/functions.d/ for additional initscript functions
-    
-    Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>
-
-commit 57879c6d6c51918b8106142e70643b53a9a8c7da
-Author: Roman Kyrylych <roman@archlinux.org>
-Date:   Fri Nov 9 16:47:44 2007 +0200
-
-    Improve error handling and allow multiple keymaps to be loaded
-    
-    Signed-off-by: Roman Kyrylych <roman@archlinux.org>
-
-commit 9af6022b841c84283a061d6a7a5be943057ac3ae
-Author: Dan McGee <dan@archlinux.org>
-Date:   Sun Oct 21 20:29:16 2007 -0500
-
-    Add a few more comments and examples to inittab
-    
-    Signed-off-by: Dan McGee <dan@archlinux.org>
-
-commit c5cffb501763c355299e593d16089fa5e56097b2
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Sun Oct 21 18:51:51 2007 +0200
-
-    Fix broken terminal detection, disable colors when the terminal is unknown.
-
-commit e3f7fc94d40e13f65e00adb3d7c48fb6f790c7d7
-Author: Roman Kyrylych <roman@archlinux.org>
-Date:   Sun Oct 21 16:39:24 2007 +0300
-
-    make non-ASCII chars work before login too
-    
-    Signed-off-by: Roman Kyrylych <roman@archlinux.org>
-
-commit bbc2f945cb5df2ff103759ccb6de5183a87487b7
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Sun Oct 21 15:11:20 2007 +0200
-
-    yes, I fixed a trailing whitespace
-
-commit 59f89b4a25fbc100551a814f5bcf81aa05b6c2e7
-Author: Roman Kyrylych <roman@archlinux.org>
-Date:   Sun Oct 21 15:24:57 2007 +0300
-
-    Fix locale handling
-    
-    Signed-off-by: Roman Kyrylych <roman@archlinux.org>
-
-commit 956e12f7f57a38ed382032d361ac22196d015170
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Sun Oct 21 11:45:43 2007 +0200
-
-    change install.sh to exit on failure with return code 1
-
-commit 7d018e6ba90b1b006068502f443b69e258795061
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Sun Oct 21 11:40:50 2007 +0200
-
-    Added install script
-
-commit affd2bf9f3f84d507ab4c4a9998b4d1c2697300c
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Sun Oct 21 11:31:45 2007 +0200
-
-    Make daemon shutdown fix more consistent with the other init scripts and simplify it a bit
-
-commit 1b8636ed76e4bf5ef23c3b357e991c66e18714c5
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Sun Oct 21 11:06:07 2007 +0200
-
-    fixing second part of #6959
-
-commit bc1b5289228e74641a61cff3bb8b3751713dcf54
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Sun Oct 21 10:53:28 2007 +0200
-
-    replace all remaining backticks with $(...)
-
-commit 1828938d4406d5a95b7c89828f61600f9e6975a6
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Sun Oct 21 10:41:21 2007 +0200
-
-    fix the utf8 activating code: there are 63 virtual terminals, not 12
-
-commit c8030f33082229530ef2f0ed699eddea4465dad9
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Sun Oct 21 10:18:36 2007 +0200
-
-    Release name: "Don't Panic" -> "Core Dump"
-
-commit e064575e7842d55371db39991593f3ea0bf03b9b
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Sun Oct 21 10:15:47 2007 +0200
-
-    Remove hwdetect as it is maintained as a separate package and this version isn't up to date anyway.
-
-commit cfab94bc71dc2e072c691122df82f4b6f2bdef29
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Sun Oct 21 10:05:28 2007 +0200
-
-    disable colors on stupid terminals
-    (fixes #7369)
-
-commit bb0984ad899ab3ae85ef8bf2c0e178a2b485885c
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Fri Oct 19 22:22:52 2007 +0000
-
-    added (barely tested) improvement of ASK keyword in crypttab
-
-commit 39a8c53bd8c2b82e824d9299a4a18d81c9e530bd
-Author: Tobias Powalowski <tpowa@archlinux.org>
-Date:   Fri Oct 19 07:02:14 2007 +0000
-
-    'upgpkg: removed double entry of ifconfig lo'
-
-commit 31dbcc786457dd92d9f56618e7c946b94ec04646
-Author: Tobias Powalowski <tpowa@archlinux.org>
-Date:   Fri Oct 19 06:08:19 2007 +0000
-
-    'upgpkg: added /sys/class/net/lo check'
-
-commit 24e468641b51e5e0a05e631d62ad706b5c0a2dd7
-Author: Tobias Powalowski <tpowa@archlinux.org>
-Date:   Thu Oct 18 16:50:26 2007 +0000
-
-    'upgpkg: added loopbackhardcoded to rc.sysinit and remove it from rc.conf'
-
-commit 6f35411f5ee1db8db1e27faf91c7b03e900c5bee
-Author: Dan McGee <dan@archlinux.org>
-Date:   Thu Oct 18 16:15:58 2007 +0000
-
-    removing unnecessary isatty.c, replaced by shell test -t option
-
-commit a7c1404def678e27e0ac808397f46f81a1d2c8d4
-Author: Tobias Powalowski <tpowa@archlinux.org>
-Date:   Thu Oct 18 14:27:56 2007 +0000
-
-    'upgpkg: fixed utf typo'
-
-commit fa4866f0adce9c3e0bfc09fb878eebb99797c338
-Author: Tobias Powalowski <tpowa@archlinux.org>
-Date:   Thu Oct 18 08:43:28 2007 +0000
-
-    'upgpkg: trying to fix #6237,7554,7165,7641,5740'
-
-commit 8649f79e8e0027bd46da8b13f6d8ac5465471c35
-Author: Dan McGee <dan@archlinux.org>
-Date:   Wed Aug 15 04:01:59 2007 +0000
-
-    upgpkg: initscripts 2007.08-2
-
-commit e3c06e981af869d6a00ec8cde34bde1e15cb53ad
-Author: Tobias Powalowski <tpowa@archlinux.org>
-Date:   Mon Jul 30 20:24:42 2007 +0000
-
-    'upgpgk: fixed nocpfs netfs bug and bump to don't panic release'
-
-commit 6852a33372052c1374248f6727e6f7755aeadd30
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Sun May 13 13:40:40 2007 +0000
-
-    upgpkg: initscripts 0.8-11
-
-commit aca95b25037ee1085c70a2e73b609a5d8cdff44b
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Sun May 13 12:01:11 2007 +0000
-
-    upgpkg: initscripts 0.8-10
-
-commit cc2c8b1fa2a709b405e3efc65222b984a63e13c6
-Author: Tobias Powalowski <tpowa@archlinux.org>
-Date:   Sat May 12 12:55:37 2007 +0000
-
-    'upgpkg: bump to Duke and cleanup rc.sysinit and netds'
-
-commit 352dda7e7ba2c62686579e2c58b519ebb961b8be
-Author: James Rayner <james@archlinux.org>
-Date:   Thu May 10 00:18:05 2007 +0000
-
-    upgpkg: initscripts 0.8-8
-    fixing flyspray #7004 #6859, change in dhcpcd state directory.
-
-commit 3fc84b485213763335a5b820f8a4b4d6483be20d
-Author: Tobias Powalowski <tpowa@archlinux.org>
-Date:   Sun Apr 22 13:37:53 2007 +0000
-
-    'upgpkg: added autoloading of standard acpi modules during boot, with the possibility to blacklist by default methods'
-
-commit b04f18c15cef8f6d48aa0aa63fa8104b551fe1db
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Sat Feb 10 09:14:34 2007 +0000
-
-    fixed typo, fixed verbose booting
-
-commit fff26e7f1fecaec1bf4c07cc07d1a426b160168b
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Tue Jan 30 18:56:37 2007 +0000
-
-    forgot to add rc.local.shutdown
-
-commit 36e129004f1dfb2e890edc55f99c8eb0df89c668
-Author: Tobias Powalowski <tpowa@archlinux.org>
-Date:   Mon Jan 29 21:51:35 2007 +0000
-
-    'upgpkg: added network listing help to rc.conf'
-
-commit 78b5f6beee0453dd938f1a3c6a6ab5776e6d78f3
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Mon Jan 29 20:45:25 2007 +0000
-
-    fix 6038
-
-commit 1bad30cc17f6cec15668f2bae9d6b72dd44788ee
-Author: Tobias Powalowski <tpowa@archlinux.org>
-Date:   Mon Jan 22 21:52:41 2007 +0000
-
-    'upgpkg: fixed verbose boot option'
-
-commit bced30e91fea71c05e3e521aa7cf04583f0dadbb
-Author: Tobias Powalowski <tpowa@archlinux.org>
-Date:   Thu Jan 18 19:21:26 2007 +0000
-
-    'upgpkg: fixed usb removal'
-
-commit 221f3c66ca47ccf283f8ebbe7f8799cc24176def
-Author: Tobias Powalowski <tpowa@archlinux.org>
-Date:   Sun Dec 31 16:11:52 2006 +0000
-
-    'added a bunch of new options'
-
-commit c323a4ae268d20d293351dc5e195e34d19ed28e7
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Mon Dec 18 21:54:53 2006 +0000
-
-    upgpkg: initscripts 0.8-2
-    finally fixed 5445
-
-commit f9b90969a7669044f098b90babe203b145bf55a9
-Author: Tobias Powalowski <tpowa@archlinux.org>
-Date:   Mon Dec 18 19:24:54 2006 +0000
-
-    'upgpkg: added --keymap option'
-
-commit 4b00503d2d25e40b0e962df08005d749cf3a4c87
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Sun Dec 17 12:53:22 2006 +0000
-
-    added stat_append to functions, fixed fsck bugs when clock is not set
-
-commit 779bd2abb1b67431b6e353eaba569779fb718833
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Sat Dec 16 23:49:35 2006 +0000
-
-    let lvm start quietly
-
-commit 9b58da29d7ce93bf3dc258a28d2fae00eb181f7e
-Author: Thomas Bächler <thomas@archlinux.org>
-Date:   Sat Dec 16 22:03:29 2006 +0000
-
-    rc.sysinit, rc.shutdown:
-    - Code cleanup
-    - Added "verbose" commandline option for debugging
-    - Fixed #5968
-    - Fixed #4648
-
-commit 567edd5aa95d5728b50f9fff6d71c368a7f3966a
-Author: Tobias Powalowski <tpowa@archlinux.org>
-Date:   Sat Dec 16 13:31:00 2006 +0000
-
-    'upgpkg: readded rc.sysinit and hwdetect for 0.8 package'
-
-commit 9a73b01bb6ea96b81b9ed887f8808b47b4fc5f19
-Author: Andreas Radke <andyrtr@archlinux.org>
-Date:   Sun Dec 10 21:21:20 2006 +0000
-
-    cuurent x86_64 updated
-
-commit 3fcefcf13b87883216dd5331b2aed84db473de04
-Author: Tobias Powalowski <tpowa@archlinux.org>
-Date:   Sun Dec 10 14:34:46 2006 +0000
-
-    'upgpkg: added voodoo tag and new hwdetect'
-
-commit 6b671f7901477d36fca5f8901731e4c0d5e7948f
-Author: Aaron Griffin <aaron@archlinux.org>
-Date:   Thu Nov 16 01:01:16 2006 +0000
-
-    upgpkg: initscripts 0.7.3-1
-    Bugfix #5529: Set timezone before hwclock calls
-
-commit c632bec83a37945e5bb4e7cedf4f4d96f0a955ec
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Mon Nov 13 00:00:27 2006 +0000
-
-    FS#5385: Fixed RAID setup code
-
-commit ef6a41ebd7e2ab216e4b950df2a6d0826aef39b7
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Wed Nov 8 20:01:06 2006 +0000
-
-    patch from Paul to disable NIS domainname before shutting down (syslog-ng was hanging).  Also added a 2>/dev/null to fsck during startup
-
-commit 01f15f89c1cf4cdb77c7d0a8ddb37ddabd7df012
-Author: Tobias Powalowski <tpowa@archlinux.org>
-Date:   Mon Oct 2 14:50:41 2006 +0000
-
-    'upgpkg: added psmouse workaround for new broken lappies'
-
-commit 9c34c7c5c8c525ce17a5bf447e40d78741ee15ba
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Thu Sep 28 19:25:16 2006 +0000
-
-    added CONSOLE check to UTF-8/Locale stuff to avoid doing it when running scripts from cron
-
-commit 00081d09b7ab18b8672a299d61a1281819904890
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Tue Sep 26 06:34:35 2006 +0000
-
-    Added --directisa switch to hwclock in rc.shutdown
-
-commit 2f49e1bb285fc9ad7259caf5edb957d7c891c974
-Author: Tobias Powalowski <tpowa@archlinux.org>
-Date:   Wed Sep 20 10:36:16 2006 +0000
-
-    'upgpkg: added udev persistent rules check'
-
-commit 8d399cf84d6d6192a13286e33258aaa369eee1bb
-Author: Tobias Powalowski <tpowa@archlinux.org>
-Date:   Fri Aug 4 07:54:32 2006 +0000
-
-    'upgpkg: added kexec support to rc.shutdown'
-
-commit 977797d7a67033d03c4be04dba5b789ecdf2a36f
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Tue Jul 25 22:36:42 2006 +0000
-
-    set a default for LOCALE so it's no longer needed in /etc/profile
-
-commit 87132356080924e00822a4b24d593e94bb18e24a
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Fri Jul 21 19:40:00 2006 +0000
-
-    added --directisa to hwclock calls, support for additional options in crypttab for non-LUKS partitions, fixed the WPA_OPTS varname typo in netcfg
-
-commit 8d214daab85c043f87ed21912b68172cc0e33635
-Author: Tobias Powalowski <tpowa@archlinux.org>
-Date:   Fri Jul 7 15:17:34 2006 +0000
-
-    'upgpkg: fixed usbfs mounting again'
-
-commit 93ba858cb8f3684506bcc5854ce32b637e108d00
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Fri Jun 30 19:40:10 2006 +0000
-
-    various fixes -- netcfg fixes, md device node creation fixes w/ mkinitcpio, 2.4 kernel support removed
-
-commit 4d91b544b6f666a12b84f82576b4309622806e83
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Fri Jun 30 15:54:33 2006 +0000
-
-    Fixed --menu when using gpm (#4916)
-
-commit 09bb556bf07b89130d27dc137190ff354beadecc
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Wed Jun 28 17:27:47 2006 +0000
-
-    handle ESSID fields that contain spaces
-
-commit 6cc15eeb857f9a01e7199c4c665866c7728244aa
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Thu Jun 15 21:54:12 2006 +0000
-
-    added patch from James Rayner to auto-configure WPA through netcfg
-
-commit 96971f91453600f1d94d3e333dfb8773d1e4f596
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Mon Jun 12 17:36:12 2006 +0000
-
-    fixed the path to the console maps in the comment area of rc.conf
-
-commit 5d708a122229e99d1f09f9cfd8297370e1778732
-Author: Tobias Powalowski <tpowa@archlinux.org>
-Date:   Wed Jun 7 17:12:17 2006 +0000
-
-    'upgpkg: removed the rest of 2.4 kernel'
-
-commit b4306a3ede324f6bdbfa5c7b80d0cff15f22c1be
-Author: Tobias Powalowski <tpowa@archlinux.org>
-Date:   Wed Jun 7 16:49:32 2006 +0000
-
-    'upgpkg: removed kernel24 stuff eg. devfsd support and lvm1'
-
-commit ddac836cdbb67ba5b89d21aa3b25a67919efeb88
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Tue May 9 18:23:41 2006 +0000
-
-    upgpkg: initscripts 0.7.2
-
-commit dfb74ab60c8bb84f3e02d89cfe8127e55aeb7984
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Mon Mar 27 18:13:56 2006 +0000
-
-    fix for #4296
-
-commit 7cc268dcf5d2e64a3f10b808e8b1b90a8f6fec4a
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Sun Feb 26 19:15:58 2006 +0000
-
-    Additional fix for locale stuff, re-enabled the depmod -A call at bootup
-
-commit befe253687d69267cac5e5953e0ca55d18bef000
-Author: Tobias Powalowski <tpowa@archlinux.org>
-Date:   Fri Feb 24 06:57:54 2006 +0000
-
-    'upgpkg: added depmod -A again'
-
-commit 7ad516d1a7bf6fb5eed4e43669a7fb2a0832a552
-Author: Tobias Powalowski <tpowa@archlinux.org>
-Date:   Tue Feb 21 07:35:10 2006 +0000
-
-    'upgpkg: fixed module loading and udev startup'
-
-commit e0074ab78392be117c4cc63b4e0832fef95f2009
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Mon Feb 20 05:33:27 2006 +0000
-
-    default LOCALE is now en_US.utf8
-
-commit d4bd7c245c018d9de3f25eca580515cfc3048217
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Mon Feb 20 05:26:07 2006 +0000
-
-    fix for terminal/locale bug (3996)
-
-commit a33f5477d845f3919cd746ab2be1180cb025b415
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Thu Feb 16 17:56:33 2006 +0000
-
-    hwdetect->udev, removed default usbserial blacklist
-
-commit 655d3db463145facd994e5e3cfd0c0a911b30297
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Thu Feb 16 17:12:06 2006 +0000
-
-    added note about disallowed hyphens in bash variable names
-
-commit 207256890573ce867d4391c362b34f31a1a60865
-Author: Tobias Powalowski <tpowa@archlinux.org>
-Date:   Thu Feb 16 10:23:38 2006 +0000
-
-    'upgpkg: put loading modules in front of udev and disabled depmod -A during boot'
-
-commit 9058c034c77ab62b91f2cd7d3637a2cb04f7c7d7
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Mon Feb 13 04:47:51 2006 +0000
-
-    removed unnecessary line from netfs
-
-commit 6411dc721549d99335367f5643c0887095fc7818
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Thu Feb 9 18:48:17 2006 +0000
-
-    added note about dialog package required for netcfg menus
-
-commit 0d286b02f2c425d28c1908a82d99f266d3549919
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Mon Feb 6 19:38:45 2006 +0000
-
-    moved swap activation after local filesystem mounting, so people can use swap files
-
-commit 8172dd9403fa216479c458e222c9d01c5b293437
-Author: Tobias Powalowski <tpowa@archlinux.org>
-Date:   Mon Feb 6 18:13:03 2006 +0000
-
-    'upgpkg: fixed weird scsi raid controllers'
-
-commit f137bbe79f4249a296c0e9064a29f5c76f38273d
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Wed Feb 1 21:24:08 2006 +0000
-
-    utf8 little fix
-
-commit affcb39fd921774f48b79fb9d48d68f3a917fd4f
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Tue Jan 31 01:30:55 2006 +0000
-
-    added --mknodes switch to the vgscan call (LVM)
-
-commit bd6701616508c5bb21de9166e9b1daa6fe1de769
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Sat Jan 21 20:58:24 2006 +0000
-
-    fixed random-seed restoration
-
-commit e4af7e36ba40ab49993fcc4232dcebdedc1763b9
-Author: Tobias Powalowski <tpowa@archlinux.org>
-Date:   Thu Jan 19 16:25:38 2006 +0000
-
-    'upgpkg: update to new udev module loading'
-
-commit 8f67fcb5f1fb15d67f024f16bf3249da85375418
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Sat Jan 14 08:34:09 2006 +0000
-
-    added hook for rc.local.shutdown
-
-commit cef7bab5145b923577aeea7431d7b19f2dd3946b
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Tue Jan 3 09:06:09 2006 +0000
-
-    changed xdm path in inittab
-
-commit 33d5e65a50fa302f6863277c52c061af721a3c44
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Mon Dec 19 18:43:03 2005 +0000
-
-    final touches for utf8 stuff (Thanks Roman\!)
-
-commit e4439a61bca626d05d3c6073ac94740db5c446c4
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Sat Dec 17 18:33:46 2005 +0000
-
-    re-fixed my utf fix (yea, that's right, i fell down a lot when i was a kid)
-
-commit 00b620075a21e293db4b55a8d451ecd2930dbce1
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Sat Dec 17 02:16:47 2005 +0000
-
-    added sr link to makedevs
-
-commit 0d08cad43172cc04df237a4a4271525ad1d527b3
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Sat Dec 17 00:59:04 2005 +0000
-
-    final utf8 fixes, a couple small fixes for hwdetect and netcfg
-
-commit cee3cbb3a261ce0ba812618493e9bd253424ea3f
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Thu Dec 15 18:56:19 2005 +0000
-
-    added scsi CD nodes
-
-commit f14a9cc609ce341ef2327c3ae93aa2695b58b392
-Author: Tobias Powalowski <tpowa@archlinux.org>
-Date:   Tue Dec 13 21:43:08 2005 +0000
-
-    'upgpkg: added kernel_verion=, cleaned up some parts added --modules for MODULES= generation for rc.conf use'
-
-commit c4c551a2f870f579438ae38b07ff9c14008cd6c9
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Tue Dec 13 04:12:28 2005 +0000
-
-    makedevs fix
-
-commit a8db77d46d74fa3a8a0e13870b94c916a60358b8
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Tue Dec 13 04:06:46 2005 +0000
-
-    latest utf fixes
-
-commit fcdcb21e2c33b1d3e359dc847638b936caf2aeee
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Tue Dec 13 01:55:31 2005 +0000
-
-    makedevs: added ternary and quaternary ide/scsi devices
-
-commit 675e9d69d02233e0079672f6c10cbe07da3027ad
-Author: Tobias Powalowski <tpowa@archlinux.org>
-Date:   Mon Dec 12 10:40:15 2005 +0000
-
-    'upgpkg: removed unneeded utf stuff, umlauts in user names do not work, you even cannot create them,
-    added quiet option to filsystem check, fixed garbeled fonts if no framebuffer is used'
-
-commit d768a9c95a254e09a34c39aa86840c01cb6d97dd
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Wed Dec 7 00:21:45 2005 +0000
-
-    changed both network scripts to use good ol' /bin/kill instead of dhcpcd's -k switch (I forgot about #2942)
-
-commit f45c3abd5697fa89d1a6431d8dbf5e96e6804ca8
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Tue Dec 6 06:45:42 2005 +0000
-
-    Added interface param to dhcpcd -k calls in network and netcfg
-
-commit cfaa5552fcbe964a172138e5e6c87e54abb6ce4c
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Mon Dec 5 18:59:11 2005 +0000
-
-    dhcpcd fix in rc.d/network
-
-commit cec2d46513c7cd557f219fa2ede3c7a816a526dc
-Author: Tobias Powalowski <tpowa@archlinux.org>
-Date:   Sat Dec 3 13:25:37 2005 +0000
-
-    'upgpkg: fixed ide check'
-
-commit 7e18ec8806c28d52c771cacda045aa3bd81ba0b2
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Thu Dec 1 21:04:15 2005 +0000
-
-    fixed wpa_cli path in netcfg
-
-commit 78365fe57d61645c1b8282784d863a0cd8537eb5
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Tue Nov 29 01:26:11 2005 +0000
-
-    finished crypttab work, fixed a bug in hwdetect related to custom kernels
-
-commit 0d7cb77c48fc6232a8342fba9056a1896898b066
-Author: Tobias Powalowski <tpowa@archlinux.org>
-Date:   Mon Nov 28 22:32:00 2005 +0000
-
-    'upgpkg: fixed custom kernels'
-
-commit 2c90c8af7bee4f06cf05c481e658406df35fe401
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Mon Nov 28 19:36:56 2005 +0000
-
-    added USEWPA to template to enable/disable wpa_supplicant
-
-commit 15c49deac15f97e647afc081c7b5e210ad4bdcd3
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Mon Nov 28 19:14:53 2005 +0000
-
-    moved sysctl config stuff to precede daemon startup (#3530)
-
-commit fb8a47586d0c5c5833a6bee2adc162a22b646d5a
-Author: Tobias Powalowski <tpowa@archlinux.org>
-Date:   Sun Nov 27 18:55:30 2005 +0000
-
-    'upgpkg: fixed lock on kernels <= 2.6.12'
-
-commit 66779d909c3a08f2c3fa0811de12f0e3b5c54bc0
-Author: Tobias Powalowski <tpowa@archlinux.org>
-Date:   Sat Nov 26 15:55:36 2005 +0000
-
-    'upgpkg: fixed non ide systems, fixed usb modules'
-
-commit b087f41b86014ba5dfc0b23ea79d6897573fb562
-Author: Tobias Powalowski <tpowa@archlinux.org>
-Date:   Wed Nov 23 12:54:55 2005 +0000
-
-    'upgpkg: fixed hwdetect syntax for rc.sysinit'
-
-commit a03faeb98fbe82a01977a9900b0d1b6974aac3c6
-Author: Tobias Powalowski <tpowa@archlinux.org>
-Date:   Wed Nov 23 12:45:41 2005 +0000
-
-    'upgpkg: fixed mtp modules, added modules-order option, changes options to -- syntax'
-
-commit d8df29152b8401e4c56a07b8920f34fdf9252bc1
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Wed Nov 23 01:58:50 2005 +0000
-
-    added check for /sys/devices
-
-commit fca87ebae05b19c0da51c1b996f4bddad82c3115
-Author: Tobias Powalowski <tpowa@archlinux.org>
-Date:   Mon Nov 21 08:52:49 2005 +0000
-
-    'upgpkg: hwdetect fixed module order, added load_modules=off to rc.sysinit'
-
-commit d7695ef38916be8e806b84f8e195a45a7b2ec217
-Author: Tobias Powalowski <tpowa@archlinux.org>
-Date:   Sat Nov 19 15:44:02 2005 +0000
-
-    'upgpkg: added more modules'
-
-commit 561ff8a3abbda0a86cc2a479d8e1a9e1b965b0d1
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Sat Nov 19 01:47:31 2005 +0000
-
-    added crypttab stuff
-
-commit 23f08df5cb31d38347582e4d62f9279385c612ba
-Author: Tobias Powalowski <tpowa@archlinux.org>
-Date:   Fri Nov 18 19:00:25 2005 +0000
-
-    'upgpkg : added full ide,scsi detection to hwdetect'
-
-commit 6931feb5463b3ce9119753bda74279ec87ed447a
-Author: Tobias Powalowski <tpowa@archlinux.org>
-Date:   Thu Nov 17 07:52:21 2005 +0000
-
-    'upgpkg: added new PNP software and some workarounds'
-
-commit 0cddbac760aa1b38e5fb68d54b315cb01c67b7b6
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Tue Nov 15 09:07:13 2005 +0000
-
-    cosmetics
-
-commit 2dc0038155b978eb70be482313cc8535dadc436d
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Tue Nov 15 02:51:52 2005 +0000
-
-    added variables for autoloading modules, cleaned up rc.conf a bit
-
-commit abdeaf8051aaadb9f5270a14e45481a8d61e0b95
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Tue Nov 15 01:18:14 2005 +0000
-
-    added tpowa's changes, cleaned up output and removed redundant code
-
-commit 684a99329e37924e84344cb340e5022628d6777c
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Mon Nov 14 17:46:46 2005 +0000
-
-    more thorough cleaning of /var/run at bootup
-
-commit e3315ad97c60b8cbad31aff8500d269d9176a9b5
-Author: Tobias Powalowski <tpowa@archlinux.org>
-Date:   Sat Nov 12 15:00:08 2005 +0000
-
-    'upgpkg: added more text to show modules, to make it more readable :) "
-
-commit 9e02c37ccd310844c919f27af64c901979c4105d
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Fri Nov 11 18:49:54 2005 +0000
-
-    updated hwdetect
-
-commit 9683aeadd86569b69ad44d270e006284e565dfd5
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Fri Nov 11 18:46:12 2005 +0000
-
-    changed ifup() to skip interfaces that are already up
-
-commit 78ce45a497753e2be061e29a6464fcd969041895
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Thu Nov 10 21:56:55 2005 +0000
-
-    added nocifs to pre-network mounts, fixed mdadm.conf missing errors
-
-commit 0daa0d11302e16ba26d7518c1edf0e4887aade9c
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Thu Nov 10 19:21:59 2005 +0000
-
-    little bugfix
-
-commit d87c9749651741249b4c7cbf5f18b7ab1b3300fb
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Thu Nov 10 19:06:51 2005 +0000
-
-    tpowa's hardware detection script
-
-commit d7e23b7ef7c92f7c9529c65a255b524b26648cc3
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Thu Nov 10 02:34:20 2005 +0000
-
-    added more intelligence for RAID/LVM setups from the initrd
-
-commit 0e992c0464125a0cb0207171a053dbf64c593833
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Wed Nov 9 21:22:44 2005 +0000
-
-    added logic to free up initrd memory once it's not needed anymore
-
-commit 71468248567e6bf1e794094d9b5f87ac61de033a
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Wed Nov 9 21:21:17 2005 +0000
-
-    added logic to free up initrd memory once it's not needed anymore
-
-commit f947ecffc4a9109d0790e5b2853e2a835b4cf81b
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Fri Nov 4 18:29:25 2005 +0000
-
-    fixed a syntax bug in locale setting
-
-commit 826e8af03cdfc3edec0dfc382a4f4308748a08f7
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Fri Nov 4 09:50:36 2005 +0000
-
-    added support for encrypted root filesystems through the initrd
-
-commit e00744e1d385f80f44618baea869136dcf64c88c
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Fri Nov 4 01:44:56 2005 +0000
-
-    dm changes
-
-commit 3f2fb1767eb2c8167a4f78999e431da73b9c8e8d
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Fri Nov 4 00:54:22 2005 +0000
-
-    makedevs helper script -- not added to package yet
-
-commit c8a4f09b7943a7fe9a875d9fc7af7decd29db6a2
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Sat Oct 22 21:23:47 2005 +0000
-
-    added patch for wpa_supplicant support
-
-commit f22d7a53b09ad0e28911117412c1cd0ab5c7bb68
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Fri Oct 21 23:35:39 2005 +0000
-
-    upgpkg: initscripts 0.7.1
-
-commit fa6d682d8bb1d95525e9f6540917446ad1247ea6
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Wed Oct 12 16:53:43 2005 +0000
-
-    another quick fix for netcfg stuff (no rebuild yet)
-
-commit 14886e1bf20897e2efbc677d6bd1846db0201cbb
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Thu Oct 6 17:00:31 2005 +0000
-
-    added WIFI_WAIT parameter (no rebuild yet)
-
-commit 79142a38d91eaf27a6c677e0a6511f855e57e30d
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Mon Oct 3 17:58:51 2005 +0000
-
-    added ability to use the netcfg menu from the NET env var
-
-commit 39f5db6e89fd04da3979c11c3b2761ea031cd94d
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Thu Sep 29 07:22:25 2005 +0000
-
-    added tpowa's fix for locale stuff
-
-commit e772aeae76f2ad704a834dc17df02dbc137a6573
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Thu Sep 15 20:05:07 2005 +0000
-
-    modified netcfg/network scripts -- you can list multiple entries in NET_PROFILES that use the same INTERFACE.  They will be started one at a time, and the first successful one will be kept.
-
-commit 0be8f5b2d33fc6160e2a62d33fc1f828218fa90a
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Mon Jul 18 19:17:14 2005 +0000
-
-    fixed netcfg to remove stale dhcpcd .pid files (#2973)
-
-commit 00945333dc1dd08d893a6c42f395e7d3c81dad0d
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Wed Jul 6 05:15:37 2005 +0000
-
-    fixed a netcfg bug where disabled profiles were being started
-
-commit 0fa1f0eeb3422ba0e84a346a20437172f26859da
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Fri Jul 1 02:54:50 2005 +0000
-
-    fixed a --stopall bug in netcfg
-
-commit a440a006d7dc42ad072b13986f1f737e8f7e1719
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Fri Jul 1 00:13:38 2005 +0000
-
-    fixed some spacing in rc.multi -- cosmetic
-
-commit 863e8311cfc2ec7dc98fdb43abaa8499dd3414a4
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Thu Jun 30 23:57:54 2005 +0000
-
-    added new netcfg stuff for roaming network profiles
-
-commit 47ca58301f0bf0680baf59465202c4209b1ac112
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Sun Jun 5 20:30:12 2005 +0000
-
-    rc.sysinit now sets the NIS domain name, if configured.  Also fixed a /var/locks typo
-
-commit 0ad54a5ba99d95c9b5dfe02f567e1f349de6a720
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Wed Jun 1 17:36:42 2005 +0000
-
-    added -q switch to sysctl
-
-commit b5d692b639b9e4a47cd6ba920b91a6d2ff50dc3d
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Tue May 31 18:31:01 2005 +0000
-
-    moved usb setup above the Loading Modules stage, so sane and other usb things will work correctly (#2770)
-
-commit cc6648d06dba085b903db820ad581dd94eb669ef
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Sun May 22 17:40:33 2005 +0000
-
-    added sysctl call from rc.sysinit
-
-commit 41e115b5973f6498ce4bfce6fe772b8d0b459700
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Mon Apr 18 06:59:02 2005 +0000
-
-    added a /proc/modules check before running modprobe, just in case the user is running a non-modular kernel
-
-commit c4a367e15b1bf0c9814a674c0a55084aa714245a
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Thu Mar 24 18:53:37 2005 +0000
-
-    added CIFS to netfs script
-
-commit 8b862a2073ad6fe7303a4dbbe7d7316a60db1147
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Wed Mar 16 17:31:30 2005 +0000
-
-    updated copyright year in rc.sysinit
-
-commit 8aff6add70fd50b3febe363a0002098f21e2679b
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Fri Mar 11 20:02:08 2005 +0000
-
-    added support for backgrounding daemons at startup with a '@' prefix, commented out the ldconfig call at startup, added support for unicode console maps, added a hotplug_ifup() function rc.d/network for hotplug's net.agent to use
-
-commit 22805e822d4e9fee9c1f4331dee31bccd1db45d2
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Sun Mar 6 20:08:29 2005 +0000
-
-    added logic to handle shutdown -F (forcefsck)
-
-commit 92d43c54f0bd5142a2a844b1910d15c808d86992
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Fri Feb 11 01:21:43 2005 +0000
-
-    added ethernet bonding support (still untested)
-
-commit e8a2e4663543d16fcafa4c62c75f42fdab32ff28
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Sun Jan 2 23:52:40 2005 +0000
-
-    fixed a typo in the rc.conf comments
-
-commit 45d3c546ee36b28c6808fb4330669b1c23437c26
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Tue Nov 30 07:33:19 2004 +0000
-
-    fixed the missing /dev/initctl problem with udev in runlevel 1
-
-commit 4c1c59be80c29f73655913ff139717268ff1f50f
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Tue Nov 23 22:58:25 2004 +0000
-
-    made rc.d/network pay attention to the new conf.d files (dhcpcd and wireless).  also modified rc.sysinit to wait til after modules are loaded before attempting to mount /proc/bus/usb.  If the user uses hotplug, then the usb host modules may not be loaded yet, but that's okay -- hotplug will mount /proc/bus/usb for them
-
-commit 2822ea48f2e7609232d4e4b47285d60097de2828
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Tue Sep 28 06:24:03 2004 +0000
-
-    used depmod -A in rc.sysinit to update module deps
-
-commit 85c899a1ca88c088aaeb679dc009687670e30ac7
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Fri Sep 24 17:22:34 2004 +0000
-
-    updated rc.single to pay attention to udev and syslog-ng
-
-commit 8784d3a487b1613759e871c8f8b4a4530509bdd3
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Sun Sep 12 19:40:51 2004 +0000
-
-    added fix for xorg temp directories (bug #1408)
-
-commit 20dceb289f61b69a98c6377921ee2a009aeefd98
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Fri Jul 23 01:03:08 2004 +0000
-
-    re-mounted / after removing /etc/mtab, so it's written to mtab properly
-
-commit 9f5d7b15d7b58b7a3d80a8923a2ff1952c90966a
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Wed Jul 21 22:15:59 2004 +0000
-
-    re-mount /sys and /proc once / is rw so the entries can be written to /etc/mtab
-
-commit ef0a365fc88fd1b02883dd42e0afb0929fbfa3f4
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Sun Jul 18 21:28:41 2004 +0000
-
-    fixed the sysfs problem with 2.4
-
-commit 5ef7c1839eed06599d615380dae4447fe43dfb34
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Fri Jul 16 03:03:26 2004 +0000
-
-    modified ifdown to bring a dhcp'd eth0 down even if the .pid file is not found (#756)
-
-commit 2881e158d80e1203d2fae41ff2ce0f122b132e45
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Fri Jul 16 01:03:51 2004 +0000
-
-    made syslog-ng Arch's new default logger
-
-commit 3280eeff177ecf79c32213303c9eb320b579d040
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Fri Jul 16 00:27:57 2004 +0000
-
-    updated version header to 0.7, added support for udev and static /dev trees
-
-commit 2c20f4d5637da88e983b65db9c97373aa79d8a37
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Sat Jul 3 19:40:02 2004 +0000
-
-    added iflist and rtlist functions and made ifup,ifdown,rtup,rtdown accessible from outside the script
-
-commit cd0e2c63acc50d080edba54b797f7f1c58da1312
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Thu May 27 00:30:15 2004 +0000
-
-    fixed the lvm2 segfault on shutdown
-
-commit f396331a675e17ef282b56ea228e66383d401400
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Wed May 19 16:56:48 2004 +0000
-
-    added sysfs mounting to fix LVM2 segfaults
-
-commit 446e095bdfb1d4d9c31f729d4169aa4a9f44797f
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Tue May 18 23:40:53 2004 +0000
-
-    added better LVM handling
-
-commit e555d5efc43f7e8597dd90482e145f6d1936faf8
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Tue May 11 21:34:59 2004 +0000
-
-    added hotplug to the DAEMONS array (disabled by default)
-
-commit 262af2251dd4675e3664435068d4a96b21ab7d74
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Fri Mar 26 20:01:07 2004 +0000
-
-    added -h arg to poweroff to park the hard drives
-
-commit abbe7921517e87dcf3fa61036d26d72bc714257a
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Sun Feb 29 23:09:37 2004 +0000
-
-    added --ignorelockingfailure during startup vgchange (LVM2)
-
-commit 0d76f45bffddced00c83b0c06f1be796a780366b
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Sun Feb 29 07:03:00 2004 +0000
-
-    updated for LVM2
-
-commit d9f8f3c07bcf1ab349fa6484980a04ef57c7212c
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Mon Feb 23 03:32:36 2004 +0000
-
-    added setup commands for LVM2
-
-commit d4a5c5ef402ca7315e5429eaccb0748e38b964af
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Thu Feb 19 18:50:09 2004 +0000
-
-    added cleanups by Leif Askeland
-
-commit 45ede7cf9dd872c580e9c2a57a00b0350f035371
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Wed Feb 18 19:35:17 2004 +0000
-
-    updated copyright
-
-commit b6fab06a33cb0c829731c3123ef35444c6909d72
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Fri Jan 30 18:30:06 2004 +0000
-
-    added a rc.d/netfs script to mount network-based filesystems from DAEMONS
-
-commit 4abccbdf439817f1328547f1f22db969fe6d8591
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Sat Jan 10 00:46:13 2004 +0000
-
-    fixed a kernel 2.6 bug re: console fonts
-
-commit a7768b2ae842c55413b1dce8a3f19e7c730885fa
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Tue Dec 30 22:42:18 2003 +0000
-
-    network-based mounts are not mounted til rc.multi runs
-
-commit 9009002d949745ec8824662680c06cf34040dba8
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Tue Dec 30 22:37:50 2003 +0000
-
-    removed a debug comment
-
-commit 4fa550ea84f951b4afe5c2e4af4aad32b7a901f6
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Tue Dec 30 22:23:36 2003 +0000
-
-    added a cosmetic fix to ifdown() in rc.d/network
-
-commit e9b62e0418df5ce6db98de36837bab2922154229
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Sun Dec 21 08:58:37 2003 +0000
-
-    removed a leftover debugging statement
-
-commit a71e42c461da1672582143a829654049399616e7
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Sun Dec 21 00:48:23 2003 +0000
-
-    upgpkg: initscripts 0.6
-
-commit 53ae13821436183990e40cffefa8c9cff4b4f2ae
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Fri Oct 10 22:24:34 2003 +0000
-
-    fixed the licensing line
-
-commit 93dd5710cf2273c228135959c22f9e4f33d78477
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Fri Oct 10 01:26:53 2003 +0000
-
-    added a missing space
-
-commit 065e944539ec9b527fa163317c0a633c872c809b
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Fri Oct 10 01:16:08 2003 +0000
-
-    a little formatting improvement
-
-commit 7f4117b05f9e4730657779ec7d4b3b08ba12616c
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Fri Oct 10 01:10:18 2003 +0000
-
-    added color to rc messages and fixed bug #168
-
-commit be8b6f59470b8779c3d4e10b3045507920931896
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Sat Oct 4 07:41:42 2003 +0000
-
-    added -x check to /sbin/fsck, so reiserfs users can uninstall e2fsprogs without script errors
-
-commit 3a161b0240eb8eedcc8affb5e0c5b92d058619d9
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Fri Sep 19 05:16:21 2003 +0000
-
-    added consolefont setting to rc.conf
-
-commit 6ea51dec01002c6b392c374fa70a62020edffd84
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Fri Sep 19 04:57:20 2003 +0000
-
-    added timeout to dhcp startup
-
-commit 2a48c5bd8db694cfe3a26cc3ef92e36050859b31
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Fri Sep 19 04:29:34 2003 +0000
-
-    modified network script to not bail out on error
-
-commit 25223b3c0c1be7d320299af4e31062295694098a
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Mon Aug 25 19:15:49 2003 +0000
-
-    improved lvm detection/activation
-
-commit da04ddf1b88b62ad77db29b8efa33649a0871b58
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Sat Jul 12 19:21:26 2003 +0000
-
-    added a check for lvmtab before activating LVM groups
-
-commit e39affb13f412f21a93205431c2abc625b4238a4
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Wed Jul 9 02:13:45 2003 +0000
-
-    removed the conf.d stuff -- conf.d files will be parsed individually by the rc.d scripts to avoid name collisions
-
-commit d69b11e73a70c9c0ed6cd888ff4ac4eb3e877ec2
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Wed Jun 4 00:22:45 2003 +0000
-
-    fixed a rc.sysinit bug and moved conf.d parsing to the top of rc.conf
-
-commit 18c7679d90ca5c1c9508548c35c0a4ea14ca4d6f
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Tue May 27 18:29:39 2003 +0000
-
-    fixed a small typo
-
-commit 2e25861ad03003273707fa604522e3390c24f895
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Tue May 27 17:14:50 2003 +0000
-
-    moved nfsmount to nfs-utils
-
-commit ba769985bf38b1eb4e54f0e19d8b3502216646d6
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Mon May 26 22:22:04 2003 +0000
-
-    added lvm handling
-
-commit df91d849d2c19bd070473da49dd8befc7aae978c
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Fri May 23 23:58:57 2003 +0000
-
-    upgpkg: initscripts 0.5
-
-commit ead9f8db5fe817f019512681d5169dffad705357
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Thu May 8 18:12:46 2003 +0000
-
-    added -D, -H, and -h to the dhcp line
-
-commit a85df6abb081d7a7d51b00e7e301d1497fede30a
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Fri Feb 7 17:05:02 2003 +0000
-
-    updated PKGBUILD release
-
-commit e4398c2e693441b8844645ee69fd3b7e483b3530
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Fri Feb 7 16:58:42 2003 +0000
-
-    added the MODULES=() line to rc.conf, with loading in rc.sysinit
-
-commit f6081f262419c2a4880d372636e391a52e148782
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Tue Jan 7 01:48:51 2003 +0000
-
-    updated rc.single to shutdown daemons correctly
-
-commit 6c4a6fc1938f12ee85b4f593de64a8776e5c1ba0
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Mon Jan 6 23:23:41 2003 +0000
-
-    kill dhcpcd pid files before running the client daemon
-
-commit 19c04471ce76a3f803fdf47b964880266b529070
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Sat Dec 14 00:13:55 2002 +0000
-
-    fixed the location of adjtime
-
-commit 96cb8c51e0ddb57f382c958ebb7808baaa258765
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Thu Dec 12 22:27:36 2002 +0000
-
-    modified to stat_fail to return a $retval
-
-commit 81da8c411f590b436e0cffcae9dd4c30598d35b2
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Fri Nov 29 09:06:45 2002 +0000
-
-    fixed a syntax bug in rc.sysinit
-
-commit c5f67416f3250e0d16eb2e588fc2b62435727d3c
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Wed Nov 27 00:36:14 2002 +0000
-
-    fix
-
-commit 43cda626dbc05e92dffc0027ef19db9d3cc44d37
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Tue Nov 26 23:26:48 2002 +0000
-
-    added nfsmount (from jk)
-
-commit c8cd508809408a0be9f1fbeb65775ab7fb083f3b
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Tue Nov 26 18:17:31 2002 +0000
-
-    Added utf hwclock support (from user patch)
-
-commit 914b0b3b572a3d5d311682a88424d165589798f1
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Sat Nov 23 20:37:55 2002 +0000
-
-    added jk's changes:  system clock is set earlier on, and modules.dep is only
-    updated if new modules are present.
-
-commit dd4248ed74b9adce32910ee95274719249220757
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Wed Aug 28 21:43:10 2002 +0000
-
-    removed PROFILES array
-
-commit eb2f42cba2d8134e83321810dcad897cc88e4716
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Sat Aug 24 20:54:22 2002 +0000
-
-    rc.sysinit removes /var/run/daemons/* on bootup
-
-commit fd8fde036ab46b593590b362bc94b051e432a295
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Wed Jul 24 02:57:16 2002 +0000
-
-    Upgraded initscripts to 0.3
-
-commit 2b503065569fa2ffedf5eafc76158c74062ac49b
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Tue Jun 11 05:07:54 2002 +0000
-
-    nada
-
-commit efa9a6d681b87fa4b8e321173690144b17a08d35
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Sat Apr 27 21:04:15 2002 +0000
-
-    Added DHCP handling to initscripts
-
-commit 30277f5e1ce30a10ed08ae2529282718c86ac826
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Fri Apr 19 17:16:37 2002 +0000
-
-    *** empty log message ***
-
-commit f7a1c1ba6c35069ed6086e41146471fe97856325
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Fri Apr 19 17:15:35 2002 +0000
-
-    *** empty log message ***
-
-commit 3a3db1e368443447d7eaec461110bb122d026d83
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Fri Apr 19 17:13:21 2002 +0000
-
-    Cleaned up networking in initscripts
-
-commit cd5a839558fa3e5b10423fa33e621be2f27acf12
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Fri Apr 19 07:28:04 2002 +0000
-
-    Updated for /etc/profile.d
-
-commit f5e0fa814e1f31279509645a25057dcefa5eaadc
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Tue Apr 16 03:59:06 2002 +0000
-
-    Updated network rc script with jproctor's disable-eth changes
-
-commit 8bc78f134bf719b16a3b3b2a7cea947fbf526e3b
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Mon Apr 15 16:45:38 2002 +0000
-
-    Added arch-release to filesystem
-    Fixed initscripts (again)
-
-commit b840b6f59bfa39bceb663ad1b40f4c0ff5984366
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Mon Apr 15 07:00:55 2002 +0000
-
-    *** empty log message ***
-
-commit 9a59bb9539dacac884b9c3b0088e22ba762f2b9b
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Mon Apr 15 06:53:10 2002 +0000
-
-    Updated initscripts
-
-commit 2f4936aec49df2c681ae0862103cee8376c5ab57
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Mon Apr 15 06:47:05 2002 +0000
-
-    Bugfix for initscripts
-
-commit 5b61b6c2bf49d75df992a4dc39757e66a536dbcd
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Mon Apr 15 06:41:16 2002 +0000
-
-    Updated initscripts for multiple ethernet interfaces
-
-commit 91fd2beff99c9e623a201c8221964353c8669044
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Thu Apr 11 05:06:15 2002 +0000
-
-    Updated installer script
-    Added package dhcpcd
-    Took ash job control out of busybox for bootdisk
-
-commit 2cb34b31712bf72ae6c30e5029572463152a082f
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Sun Mar 24 08:50:48 2002 +0000
-
-    Fixed a runlevel bug in initscripts
-
-commit 65405267704892a9bcb42186c95adcf4566cbf8c
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Sun Mar 24 08:40:40 2002 +0000
-
-    Added rc.d network script to initscripts
-
-commit eea6fee11ad792708d6b8fbf0cb5b42b00ea1c91
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Thu Mar 14 08:34:49 2002 +0000
-
-    Removed all filelist files from repository
-
-commit 57d51e9a853fc21be0e733253ac56f2d9756d3a7
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Wed Mar 13 08:05:47 2002 +0000
-
-    Updated inittab for X11
-
-commit d0ea35d522f7e68b198afe01bf369463af56259f
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Tue Mar 12 05:37:01 2002 +0000
-
-    Rebuild package pcmcia-cs for 2.4.18
-    Tweaked initscripts/filesystem
-    Added doc/install.txt and misc/cdboot/etc/issue and scripts/makerelease
-
-commit 14e3f9480a7364200b999477fa4ab9da16884831
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Mon Mar 11 00:58:34 2002 +0000
-
-    Removed rc.proto, updated rc.single
-
-commit 325b46a6b02aee695658eafe6b714d0e02810e1a
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Sat Mar 9 10:07:16 2002 +0000
-
-    Added some rudimentary networking stuff
-
-commit 897380f9b8071b8df0dcdb85cc9e1424640762b9
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Tue Mar 5 04:59:03 2002 +0000
-
-    Changed name to Arch Linux
-
-commit 98c76a453222169f12b0e95f8a7ed0175e182598
-Author: Judd Vinet <judd@archlinux.org>
-Date:   Mon Mar 4 07:28:25 2002 +0000
-
-    Initial revision
diff --git a/abs/mv-core/initscripts/PKGBUILD b/abs/mv-core/initscripts/PKGBUILD
deleted file mode 100644
index c568c38..0000000
--- a/abs/mv-core/initscripts/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-# $Id: PKGBUILD 25007 2009-01-22 17:10:39Z aaron $
-# Maintainer: Thomas Baechler <thomas@archlinux.org>
-# Maintainer: Aaron Griffin <aaron@archlinux.org>
-
-pkgname=initscripts
-pkgver=2009.01
-pkgrel=7
-pkgdesc="System initialization/bootup scripts"
-arch=('i686' 'x86_64')
-url="http://www.archlinux.org"
-license=('GPL')
-groups=('base')
-backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown)
-depends=('glibc' 'bash' 'awk' 'grep' 'coreutils' 'sed' 'udev>=118' 'net-tools' 'ncurses' 'kbd' 'findutils')
-source=(ftp://ftp.archlinux.org/other/initscripts/${pkgname}-${pkgver}.tar.gz rc.sysinit.patch rc.shutdown.patch)
-md5sums=('b947f3efd5d4681459fe8073d610f1b5')
-
-build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}/
-   patch -p0 < $startdir/src/rc.sysinit.patch  || exit 1
-   patch -p0 < $startdir/src/rc.shutdown.patch || exit 1
-  DESTDIR=$startdir/pkg ./install.sh
-}
diff --git a/abs/mv-core/initscripts/__changelog b/abs/mv-core/initscripts/__changelog
deleted file mode 100644
index 8d03d24..0000000
--- a/abs/mv-core/initscripts/__changelog
+++ /dev/null
@@ -1 +0,0 @@
-Patch init scripts
diff --git a/abs/mv-core/initscripts/initscripts.install b/abs/mv-core/initscripts/initscripts.install
deleted file mode 100644
index 360101c..0000000
--- a/abs/mv-core/initscripts/initscripts.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_upgrade() {
-  if [ "$(vercmp $2 2009.07)" -lt 0 ]; then
-    echo "==> Adjusting /etc/inittab for transition to /dev/tty standard."
-    echo "==> Original file saved as /etc/inittab.pacsave"
-    sed -i'.pacsave' 's#vc/\([0-9]\)#tty\1#' /etc/inittab
-  fi
-}
diff --git a/abs/mv-core/initscripts/rc.shutdown.patch b/abs/mv-core/initscripts/rc.shutdown.patch
deleted file mode 100644
index 187d1b7..0000000
--- a/abs/mv-core/initscripts/rc.shutdown.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- rc.shutdown.orig	2009-02-06 15:32:04.000000000 +0000
-+++ rc.shutdown	2009-02-06 15:45:05.000000000 +0000
-@@ -22,6 +22,12 @@
- 	/etc/rc.local.shutdown
- fi
- 
-+#unmount network filesystems for runit
-+if [ -e /var/service/netfs ]
-+then
-+    /etc/rc.d/netfs stop
-+fi
-+
- if [ "$PREVLEVEL" = "3" -o "$PREVLEVEL" = "5" ]; then
- 	# Shutdown daemons
- 	let i=${#DAEMONS[@]}
-@@ -39,6 +45,7 @@
- 	fi
- fi
- 
-+
- # Terminate all processes
- stat_busy "Sending SIGTERM To Processes"
- /sbin/killall5 -15 &> /dev/null
diff --git a/abs/mv-core/initscripts/rc.sysinit.patch b/abs/mv-core/initscripts/rc.sysinit.patch
deleted file mode 100644
index e34f11f..0000000
--- a/abs/mv-core/initscripts/rc.sysinit.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- /tmp/rc.sysinit.orig	2009-04-02 16:40:47.000000000 +0000
-+++ rc.sysinit	2009-04-02 16:44:20.000000000 +0000
-@@ -7,10 +7,9 @@
- . /etc/rc.d/functions
- 
- echo " "
--printhl "Arch Linux\n"
--printhl "${C_H2}http://www.archlinux.org"
--printhl "Copyright 2002-2007 Judd Vinet"
--printhl "Copyright 2007-2009 Aaron Griffin"
-+printhl "MythVantage"
-+printhl "Experience it!"
-+printhl "${C_H2}http://www.mythvantage.org"
- printhl "Distributed under the GNU General Public License (GPL)"
- printsep
- 
-@@ -85,6 +84,7 @@
- if ! [ "$load_modules" = "off" ]; then
- 	if [ -f /proc/modules ]; then
- 		stat_busy "Loading Modules"
-+		/usr/MythVantage/bin/load-modules-mythvantage.sh
- 		for mod in "${MODULES[@]}"; do
- 			if [ "$mod" = "${mod#!}" ]; then
- 				/sbin/modprobe $mod
diff --git a/abs/mv-core/keylaunch/PKGBUILD b/abs/mv-core/keylaunch/PKGBUILD
deleted file mode 100644
index 56b1808..0000000
--- a/abs/mv-core/keylaunch/PKGBUILD
+++ /dev/null
@@ -1,17 +0,0 @@
-pkgname=keylaunch
-pkgver=1.3.3
-pkgrel=13
-arch=('i686')
-pkgdesc="KeyLaunch is a small utility for binding commands to a hot key. "
-url="http://www.oroborus.org/"
-depends=(glibc)
-source=(http://www.oroborus.org/debian/dists/sid/main/source/x11/keylaunch_1.3.3.tar.gz example_rc)
-install=keylaunch.install
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
-  make DESTDIR=$startdir/pkg install
-  install -D -m0755 ../example_rc $startdir/pkg/etc/keylaunchrc
-}
diff --git a/abs/mv-core/keylaunch/example_rc b/abs/mv-core/keylaunch/example_rc
deleted file mode 100644
index 8357a11..0000000
--- a/abs/mv-core/keylaunch/example_rc
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copy to $HOME/.keylaunchrc
-#
-# Format:
-# key=...KeyName:Command
-#
-# ... No modifier
-# *.. Shift
-# .*. Ctrl
-# ..* Alt
-
-key=*..Return:xterm -fn *-18-*
-key=..*x xterm -fn *-18-*
-key=..*S:sudo /usr/bin/mythtv-setup
-key=.**U:killall -9 unclutter
-key=..*h:/usr/MythVantage/bin/mythinstall -h
-key=..*1:/usr/MythVantage/bin/mythbeselect -stop
-key=..*2:/usr/MythVantage/bin/mythbeselect -start
-key=..*3:/usr/MythVantage/bin/mythbeselect -restart
diff --git a/abs/mv-core/keylaunch/keylaunch.install b/abs/mv-core/keylaunch/keylaunch.install
deleted file mode 100755
index ade2c7b..0000000
--- a/abs/mv-core/keylaunch/keylaunch.install
+++ /dev/null
@@ -1,40 +0,0 @@
-# This is a default template for a post-install scriptlet.  You can
-# remove any functions you don't need (and this header).
-
-# arg 1:  the new package version
-pre_install() {
-  /bin/true
-}
-
-# arg 1:  the new package version
-post_install() {
- ln -s /etc/keylaunchrc /data/home/mythtv/.keylaunchrc
-
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-pre_upgrade() {
-  /bin/true
- 
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  /bin/true
-}
-
-# arg 1:  the old package version
-post_remove() {
-  /bin/true
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/mv-core/lcdproc/PKGBUILD b/abs/mv-core/lcdproc/PKGBUILD
deleted file mode 100755
index cb536e9..0000000
--- a/abs/mv-core/lcdproc/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-pkgname=lcdproc
-#pkgver=0.5.2
-pkgver=20080326
-pkgrel=7
-pkgdesc="LCDproc is a utility to drive one or more LCD (and LCD-like) devices attached to a host."
-url="http://lcdproc.omnipotent.net/"
-license="GPL"
-depends=(libusb xosd)
-backup=(etc/LCDd.conf)
-arch=('i686')
-#source=(http://switch.dl.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz lcdd mythvantage.patch)
-source=(lcdproc-CVS-current.tar.gz  lcdd mythvantage.patch)
-
-build() {
- #cd $startdir/src/$pkgname-$pkgver
- cd $startdir/src/$pkgname-CVS-current-$pkgver
-# lcdproc-CVS-current-20080326
-  patch -p0 < ../mythvantage.patch
-  ./configure --prefix=/usr --sysconfdir=/etc --enable-libusb --enable-drivers=all
-  make
-  make DESTDIR=$startdir/pkg install
-  sed -e "s/server\/drivers\//\/usr\/lib\/lcdproc\//g" LCDd.conf > $startdir/pkg/etc/LCDd.conf
-  mkdir -p $startdir/pkg/etc/rc.d
-  install -m 755 $startdir/src/lcdd $startdir/pkg/etc/rc.d
-}
diff --git a/abs/mv-core/lcdproc/lcdd b/abs/mv-core/lcdproc/lcdd
deleted file mode 100755
index fa3547a..0000000
--- a/abs/mv-core/lcdproc/lcdd
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/LCDd`
-case "$1" in
-  start)
-    stat_busy "Starting LCDd daemon"
-    [ -z "$PID" ] && /usr/sbin/LCDd -c /etc/LCDd.conf
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      echo $PID > /var/run/lcdd.pid
-      add_daemon lcdd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping ProFTPd daemon"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm /var/run/lcdd.pid
-      rm_daemon lcdd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/abs/mv-core/lcdproc/lcdproc-CVS-current.tar.gz b/abs/mv-core/lcdproc/lcdproc-CVS-current.tar.gz
deleted file mode 100644
index e0f6df4..0000000
--- a/abs/mv-core/lcdproc/lcdproc-CVS-current.tar.gz
+++ /dev/null
diff --git a/abs/mv-core/lcdproc/mythvantage.patch b/abs/mv-core/lcdproc/mythvantage.patch
deleted file mode 100644
index 70feff7..0000000
--- a/abs/mv-core/lcdproc/mythvantage.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- server/serverscreens.c.orig	2007-09-17 18:35:57.000000000 +0000
-+++ server/serverscreens.c	2007-09-17 18:36:32.000000000 +0000
-@@ -167,9 +167,9 @@
- 
- 			char *top = "Thanks for using";
- #ifdef LINUX
--			char *low = "LCDproc & Linux!";
-+			char *low = "MythVantage";
- #else
--			char *low = "    LCDproc!    ";
-+			char *low = "    MythVantage    ";
- #endif
- 
- 			drivers_string(1+xoffs, 1+yoffs, top);
diff --git a/abs/mv-core/lighttpd/PKGBUILD b/abs/mv-core/lighttpd/PKGBUILD
deleted file mode 100755
index 1f2d7df..0000000
--- a/abs/mv-core/lighttpd/PKGBUILD
+++ /dev/null
@@ -1,49 +0,0 @@
-pkgname=lighttpd
-pkgver=1.4.19
-pkgrel=25
-pkgdesc="lighttpd is a secure, fast, compliant and very flexible web-server"
-arch=(i686 x86_64)
-url="http://www.lighttpd.net/"
-depends=('pcre' 'openssl' 'zlib' 'bzip2' 'attr')
-makedepends=('fcgi' 'libmysqlclient'  'lua' 'gdbm'  \
-             'libxml2' 'vim' 'pkgconfig' 'sqlite3')
-backup=('etc/lighttpd/lighttpd.conf' 'etc/logrotate.d/lighttpd' \
-        'etc/conf.d/lighttpd' 'etc/conf.d/spawn-php' \
-        'home/lighttpd/html/index.html')
-options=('!libtool')
-install=$pkgname.install
-source=(http://www.lighttpd.net/download/$pkgname-$pkgver.tar.gz \
-        index.html $pkgname.rc.d $pkgname.conf.d $pkgname.logrotate.d \
-        spawn-php.rc.d spawn-php.conf.d tweakconf.vim lighttpd.conf)
-md5sums=('8f6756452138f5da384251f849b329f2' '85593eb67b928fec79b1efb3fa3cce84'\
-         '6d05e499e47425e99bf809c88bd4969d' '14565fa5d30c60941190ceb32b1b551f'\
-         'a8c31344b90328c5b751d965d79c5047' 'df940132363030eafcf7009a5322048f'\
-         '1ba657b113b7e473fb301631a7e2e1a4' 'e799c48f7cee46db089f90030cec935a')
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr --libdir=/usr/lib/lighttpd \
-     --with-gdbm --with-lua --with-memcache \
-    --with-openssl=/usr/include/openssl \
-    --with-mysql=/usr/bin/mysql_config \
-    --with-webdav-props --with-attr \
-    --without-fam 
-  make || return 1
-  make DESTDIR=$startdir/pkg install || return 1
-
-   # install configuration scripts and daemons
-  #install -Dm644 ../index.html $startdir/pkg/data/srv/httpd/htdocs/index.html
-  install -Dm755 ../lighttpd.rc.d $startdir/pkg/etc/rc.d/lighttpd
-  install -Dm644 ../lighttpd.conf.d $startdir/pkg/etc/conf.d/lighttpd
-  install -Dm644 ../lighttpd.logrotate.d $startdir/pkg/etc/logrotate.d/lighttpd
-  install -Dm755 ../spawn-php.rc.d $startdir/pkg/etc/rc.d/spawn-php
-  install -Dm644 ../spawn-php.conf.d $startdir/pkg/etc/conf.d/spawn-php
-
-   # show some mercy on docfiles
-#  mkdir -p $startdir/pkg/usr/share/lighttpd
-#  install -m644 doc/*.txt $startdir/pkg/usr/share/lighttpd
-
-  install -Dm644 doc/lighttpd.conf $startdir/pkg/etc/lighttpd/lighttpd.conf
-  ex $startdir/pkg/etc/lighttpd/lighttpd.conf < $startdir/src/tweakconf.vim
-  install -Dm644 $startdir/src/lighttpd.conf $startdir/pkg/etc/lighttpd/lighttpd.conf
-}
diff --git a/abs/mv-core/lighttpd/index.html b/abs/mv-core/lighttpd/index.html
deleted file mode 100644
index 22ea5d1..0000000
--- a/abs/mv-core/lighttpd/index.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<html>
-<head><title>lighttpd Test Page</title></head>
- 
-<body>
-  <div style="text-align:center; font: 12px sans-serif;">
-    <span style="font-weight: bold; font-size: 20px;">
-      Arch Linux
-    </span>
-    <br><br>
-    This is a test page for the lighttpd Web Server.<br>
-  </div>
-</body>
- 
-</html>
-
diff --git a/abs/mv-core/lighttpd/lighttpd.conf b/abs/mv-core/lighttpd/lighttpd.conf
deleted file mode 100755
index 45fccf6..0000000
--- a/abs/mv-core/lighttpd/lighttpd.conf
+++ /dev/null
@@ -1,369 +0,0 @@
-# lighttpd configuration file
-#
-# use a it as base for lighttpd 1.0.0 and above
-#
-# i'm th enew file
-
-############ Options you really have to take care of ####################
-
-## modules to load
-# at least mod_access and mod_accesslog should be loaded
-# all other module should only be loaded if really neccesary
-# - saves some time
-# - saves memory
-server.modules              = (
-                                "mod_rewrite",
-#                               "mod_redirect",
-                                "mod_alias",
-                                "mod_access",
-#                               "mod_cml",
-#                               "mod_trigger_b4_dl",
-#                               "mod_auth",
-                                "mod_status",
-                                "mod_setenv",
-                               "mod_fastcgi",
-#                               "mod_proxy",
-#                               "mod_simple_vhost",
-#                               "mod_evhost",
-#                               "mod_userdir",
-                                "mod_cgi",
-#                               "mod_compress",
-                                "mod_ssi",
-#                               "mod_usertrack",
-#                               "mod_expire",
-#                               "mod_secdownload",
-#                               "mod_rrdtool",
-                                "mod_accesslog" )
-
-## a static document-root, for virtual-hosting take look at the
-## server.virtual-* options
-server.document-root        = "/data/srv/httpd/htdocs"
-
-## where to send error-messages to
-#server.errorlog             = "/var/log/lighttpd/error.log"
-server.errorlog-use-syslog      = "enable"
-#do not log images
-$HTTP["url"] !~ "\.(jpe?g|png|gif|css)" { accesslog.use-syslog = "enable" }
-
-
-
-
-# files to check for if .../ is requested
-index-file.names            = ( "index.php", "index.html",
-                                "index.htm", "default.htm","mythweb.php")
-
-# mimetype mapping
-mimetype.assign             = (
-  ".pdf"          =>      "application/pdf",
-  ".sig"          =>      "application/pgp-signature",
-  ".spl"          =>      "application/futuresplash",
-  ".class"        =>      "application/octet-stream",
-  ".ps"           =>      "application/postscript",
-  ".torrent"      =>      "application/x-bittorrent",
-  ".dvi"          =>      "application/x-dvi",
-  ".gz"           =>      "application/x-gzip",
-  ".pac"          =>      "application/x-ns-proxy-autoconfig",
-  ".swf"          =>      "application/x-shockwave-flash",
-  ".tar.gz"       =>      "application/x-tgz",
-  ".tgz"          =>      "application/x-tgz",
-  ".tar"          =>      "application/x-tar",
-  ".zip"          =>      "application/zip",
-  ".mp3"          =>      "audio/mpeg",
-  ".m3u"          =>      "audio/x-mpegurl",
-  ".wma"          =>      "audio/x-ms-wma",
-  ".wax"          =>      "audio/x-ms-wax",
-  ".ogg"          =>      "application/ogg",
-  ".wav"          =>      "audio/x-wav",
-  ".gif"          =>      "image/gif",
-  ".jpg"          =>      "image/jpeg",
-  ".jpeg"         =>      "image/jpeg",
-  ".png"          =>      "image/png",
-  ".xbm"          =>      "image/x-xbitmap",
-  ".xpm"          =>      "image/x-xpixmap",
-  ".xwd"          =>      "image/x-xwindowdump",
-  ".css"          =>      "text/css",
-  ".html"         =>      "text/html",
-  ".htm"          =>      "text/html",
-  ".js"           =>      "text/javascript",
-  ".asc"          =>      "text/plain",
-  ".c"            =>      "text/plain",
-  ".cpp"          =>      "text/plain",
-  ".log"          =>      "text/plain",
-  ".conf"         =>      "text/plain",
-  ".text"         =>      "text/plain",
-  ".txt"          =>      "text/plain",
-  ".dtd"          =>      "text/xml",
-  ".xml"          =>      "text/xml",
-  ".mpeg"         =>      "video/mpeg",
-  ".mpg"          =>      "video/mpeg",
-  ".mov"          =>      "video/quicktime",
-  ".qt"           =>      "video/quicktime",
-  ".avi"          =>      "video/x-msvideo",
-  ".asf"          =>      "video/x-ms-asf",
-  ".asx"          =>      "video/x-ms-asf",
-  ".wmv"          =>      "video/x-ms-wmv",
-  ".bz2"          =>      "application/x-bzip",
-  ".tbz"          =>      "application/x-bzip-compressed-tar",
-  ".tar.bz2"      =>      "application/x-bzip-compressed-tar",
-  ".nuv"	  =>	  "video/nuppelvideo"
- )
-
-
-# Use the "Content-Type" extended attribute to obtain mime type if possible
-mimetype.use-xattr        = "enable"
-
-
-## send a different Server: header
-## be nice and keep it at lighttpd
-#server.tag                 = "lighttpd"
-
-#### accesslog module
-#accesslog.filename          = "/var/log/lighttpd/access.log"
-
-## deny access the file-extensions
-#
-# ~    is for backupfiles from vi, emacs, joe, ...
-# .inc is often used for code includes which should in general not be part
-#      of the document-root
-url.access-deny             = ( "~", ".inc" )
-
-$HTTP["url"] =~ "\.pdf$" {
-
-
-  server.range-requests = "disable"
-}
-
-######### Options that are good to be but not neccesary to be changed #######
-
-## bind to port (default: 80)
-#server.port                = 80
-
-## bind to localhost (default: all interfaces)
-#server.bind                = "grisu.home.kneschke.de"
-
-#custom handlers for mythweb and phpmyadmin
-$HTTP["url"] =~ "(mythweb)" {
-server.error-handler-404   = "/error/mythweb.html"
-}
-
-$HTTP["url"] =~ "(phpMyAdmin)" {
-server.error-handler-404   = "/error/phpadmin.html"
-}
-
-$HTTP["url"] =~ "(hobbit)" {
-server.error-handler-404   = "/error/hobbit.html"
-}
-
-## error-handler for status 404
-server.error-handler-404   = "/error-handler.html"
-server.errorfile-prefix = "/data/srv/httpd/htdocs/error/status-"
-#server.error-handler-404   = "/error-handler.php"
-
-## to help the rc.scripts
-server.pid-file            = "/var/run/lighttpd.pid"
-
-alias.url = ( "/logs/" => "/var/log/" )
-
-
-$HTTP["url"] =~ "^/logs($|/)" {
-dir-listing.activate= "enable"
-dir-listing.hide-dotfiles = "enable"
-dir-listing.external-css = "/frame.css"
-}
-
-
-
-
-###### virtual hosts
-##
-##  If you want name-based virtual hosting add the next three settings and load
-##  mod_simple_vhost
-##
-## document-root =
-##   virtual-server-root + virtual-server-default-host + virtual-server-docroot
-## or
-##   virtual-server-root + http-host + virtual-server-docroot
-##
-#simple-vhost.server-root   = "/home/lighttpd/vhosts/"
-#simple-vhost.default-host  = "lighttpd.localhost"
-#simple-vhost.document-root = "/pages/"
-##
-## Format: <errorfile-prefix><status-code>.html
-## -> ..../status-404.html for 'File not found'
-#server.errorfile-prefix    = "/home/weigon/projects/lighttpd/doc/status-"
-
-## virtual directory listings
-#server.dir-listing         = "enable"
-
-## enable debugging
-#debug.log-request-header   = "enable"
-#debug.log-response-header  = "enable"
-#debug.log-request-handling = "enable"
-#debug.log-file-not-found   = "enable"
-
-### only root can use these options
-#
-# chroot() to directory (default: no chroot() )
-#server.chroot              = "/"
-
-## change uid to <uid> (default: don't care)
-server.username             = "nobody"
-
-## change uid to <uid> (default: don't care)
-server.groupname            = "nobody"
-
-#### compress module
-#compress.cache-dir         = "/home/lighttpd/cache/"
-#compress.filetype          = ("text/plain", "text/html")
-
-#### proxy module
-## read proxy.txt for more info
-#proxy.server               = ( ".php" =>
-#                               ( "localhost" =>
-#                                 (
-#                                   "host" => "192.168.0.101",
-#                                   "port" => 80
-#                                 )
-#                               )
-#                             )
-
-#### fastcgi module
-## read fastcgi.txt for more info
-fastcgi.server = ( ".php" =>
- ( "localhost" =>
-   (
-     "socket" => "/tmp/php-fastcgi.socket",
-     "bin-path" => "/usr/bin/php-cgi",
-     "min-procs" => 0,
-     "max-procs" => 1,
-     "max-load-per-proc" => 1,
-     "idle-timeout" => 10,
-     # Fix PATH_INFO for PHP scripts that rely on it (like Wordpress).
-      "broken-scriptfilename" => "enable"
-    )
- )
-)
-
-
-#the rewrite rule for mythweb
-
- url.rewrite = (
-   "^/mythweb(/tv.*|/music.*|/stats.*|/remote.*|/video.*|/weather.*|/settings.*|/status.*|/backend_log.*)$" =>   "mythweb/mythweb.php/$1"
- )
-
-
-#### CGI module
-cgi.assign                 = ( ".pl"  => "/usr/bin/perl",
-				".sh" => "/bin/bash" ,
-				".py" => "/usr/bin/python" ,
-                               ".cgi" => "/bin/bash" )
-
-
-
-#### SSL engine
-#$SERVER["socket"] == "0.0.0.0:443" {
-#  ssl.engine                  = "enable"
-#  ssl.pemfile                 = "/home/lighttpd/ssl/server.pem"
-#  server.errorlog             = "/var/log/lighttpd/error-ssl.log"
-#  accesslog.filename          = "/var/log/lighttpd/access-ssl.log"
-#  server.document-root        = "/home/lighttpd/html-ssl"
-#}
-
-
-$SERVER["socket"] == ":1337" {
-  server.document-root = "/data/srv/httpd/cgi/"
-  alias.url = ( "/templates/" => "/data/home/mythtv/templates/" )
-
-}
-
-
-#### status module
-status.status-url          = "/server-status"
-status.config-url          = "/server-config"
-
-#### auth module
-## read authentication.txt for more info
-#auth.backend               = "plain"
-#auth.backend.plain.userfile = "lighttpd.user"
-#auth.backend.plain.groupfile = "lighttpd.group"
-
-#auth.backend.ldap.hostname = "localhost"
-#auth.backend.ldap.base-dn  = "dc=my-domain,dc=com"
-#auth.backend.ldap.filter   = "(uid=$)"
-#auth.require               = ( "/server-status" =>
-#                               (
-#                                 "method"  => "digest",
-#                                 "realm"   => "download archiv",
-#                                 "require" => "user=jan"
-#                               ),
-#                               "/server-info" =>
-#                               (
-#                                 "method"  => "digest",
-#                                 "realm"   => "download archiv",
-#                                 "require" => "valid-user"
-#                               )
-#                             )
-
-#### url handling modules (rewrite, redirect, access)
-#url.rewrite                = ( "^/$"             => "/server-status" )
-#url.redirect               = ( "^/wishlist/(.+)" => "http://www.123.org/$1" )
-
-#
-# define a pattern for the host url finding
-# %% => % sign
-# %0 => domain name + tld
-# %1 => tld
-# %2 => domain name without tld
-# %3 => subdomain 1 name
-# %4 => subdomain 2 name
-#
-#evhost.path-pattern        = "/home/storage/dev/www/%3/htdocs/"
-
-#### expire module
-#expire.url                 = ( "/buggy/" => "access 2 hours", "/asdhas/" => "access plus 1 seconds 2 minutes")
-
-#### ssi
-ssi.extension              = ( ".shtml" )
-
-#### rrdtool
-#rrdtool.binary             = "/usr/bin/rrdtool"
-#rrdtool.db-name            = "/var/www/lighttpd.rrd"
-
-#### setenv
-#setenv.add-request-header  = ( "TRAV_ENV" => "mysql://user@host/db" )
-#setenv.add-response-header = ( "X-Secret-Message" => "42" )
-## for mod_trigger_b4_dl
-# trigger-before-download.gdbm-filename = "/home/weigon/testbase/trigger.db"
-# trigger-before-download.memcache-hosts = ( "127.0.0.1:11211" )
-# trigger-before-download.trigger-url = "^/trigger/"
-# trigger-before-download.download-url = "^/download/"
-# trigger-before-download.deny-url = "http://127.0.0.1/index.html"
-# trigger-before-download.trigger-timeout = 10
-
-## for mod_cml
-## don't forget to add index.cml to server.indexfiles
-# cml.extension               = ".cml"
-# cml.memcache-hosts          = ( "127.0.0.1:11211" )
-
-#### variable usage:
-## variable name without "." is auto prefixed by "var." and becomes "var.bar"
-#bar = 1
-#var.mystring = "foo"
-
-## integer add
-#bar += 1
-## string concat, with integer cast as string, result: "www.foo1.com"
-#server.name = "www." + mystring + var.bar + ".com"
-## array merge
-#index-file.names = (foo + ".php") + index-file.names
-#index-file.names += (foo + ".php")
-
-#### include
-#include /etc/lighttpd/lighttpd-inc.conf
-## same as above if you run: "lighttpd -f /etc/lighttpd/lighttpd.conf"
-#include "lighttpd-inc.conf"
-
-#### include_shell
-#include_shell "echo var.a=1"
-## the above is same as:
-#var.a=1
diff --git a/abs/mv-core/lighttpd/lighttpd.conf.d b/abs/mv-core/lighttpd/lighttpd.conf.d
deleted file mode 100644
index 5321598..0000000
--- a/abs/mv-core/lighttpd/lighttpd.conf.d
+++ /dev/null
@@ -1,10 +0,0 @@
-DAEMON_NAME="lighttpd"
-DAEMON_CONF="/etc/lighttpd/lighttpd.conf"
-DAEMON_PATH="/usr/sbin/lighttpd"
- # this greps the error-log which is set in the lighttpd.conf
- # override it by setting it to a fix path
-DAEMON_ERRLOG=`sed -n \
-                -e '/server\.errorlog/p' ${DAEMON_CONF} \
-                | sed -e '/^ *#.*/d' \
-                | sed -e 's/^.*"\(.*\)".*$/\1/'`
-# DAEMON_ERRLOG="/var/log/lighttpd/error.log"
diff --git a/abs/mv-core/lighttpd/lighttpd.install b/abs/mv-core/lighttpd/lighttpd.install
deleted file mode 100644
index 1055e4b..0000000
--- a/abs/mv-core/lighttpd/lighttpd.install
+++ /dev/null
@@ -1,80 +0,0 @@
-post_install() {
-  # set post_install message
-  /bin/cat << EOM
-
- --> This release marks a minor (NOT micro!) version change and is not 100%
- --> compatible with former versions. Have a look at the new lighttpd.conf,
- --> there are some changes in the index files syntax and nested conditions
- --> are possible by now. Also please read the documentation in
- --> /usr/share/lighttpd or on lighttpds's hompage:   http://lighttpd.org
-
- --> for the following OPTIONAL modules (when choosen from lighttpd.conf)
- --> you will need the following dependencies:
-          mod_webdav :         libxml2, sqlite3
-          mod_cml:             libmemcache, lua
-          mod_trigger_b4_dl:   libmemcache, gdbm
-          mod_auth.so:         libldap
-          mod_mysql_vhost:     libmysqlclient
-
-EOM
-
-   # import daemon configuration file to detect lighttpd.conf location
-  [ -f /etc/conf.d/lighttpd ] && . /etc/conf.d/lighttpd
-   # some automagic dealing with the users preferences as marked in
-   # /etc/lighttpd/lighttpd.conf
-   # a simple conf-file parser to isolate the user, logfiles etc.
-  FILES=`sed -n -e '/accesslog\.filename/p;/server\.errorlog/p' \
-          ${DAEMON_CONF} \
-          | sed -e 's/^.*"\(.*\)".*$/\1/'`
-  DAEMON_USER=`sed -n -e '/server\.username/p' ${DAEMON_CONF} \
-                | sed -e 's/^.*"\(.*\)".*$/\1/'`
-  DAEMON_GROUP=`sed -n -e '/server\.groupname/p' ${DAEMON_CONF} \
-                | sed -e 's/^.*"\(.*\)".*$/\1/'`
-  DIRECTORIES=`sed -n -e '/\.cache-dir/p;/\.server-root/p' ${DAEMON_CONF} \
-                | sed -e 's/^.*"\(.*\)".*$/\1/'`
-  DOCROOTDIRS=`sed -n -e '/server.\document-root/p' ${DAEMON_CONF} \
-                | sed -e 's/^.*"\(.*\)".*$/\1/'`
-  CHROOT=`sed -n -e '/server\.chroot/p' ${DAEMON_CONF} \
-                | sed -e '/^ *#.*$/d' \
-                | sed -e 's/^.*"\(.*\)".*$/\1/'`
-
-  touch /tmp/empty
-  # make sure logfiles exist
-  for FILE in $FILES; do
-    [ ! -f ${CHROOT}${FILE}  ] && \
-      install -Dm644 -o $DAEMON_USER -g $DAEMON_GROUP /tmp/empty ${CHROOT}${FILE} && \
-      echo 'Creating file ' ${CHROOT}${FILE}
-  done
-  # make sure the lighttpd.user owns the cache dirs and vhost-root ...
-  for DIR in $DIRECTORIES; do
-    [ ! -d ${CHROOT}${DIR} ] && \
-      install -dm755 -o $DAEMON_USER -g $DAEMON_GROUP ${CHROOT}${DIR} && \
-      echo "Creating directory ${CHROOT}${DIR}" && \
-      chown $DAEMON_USER:$DAEMON_GROUP ${CHROOT}${DIR}
-  done
-  # ... and the document roots
-  for DIR in $DOCROOTDIRS; do
-    [ ! -d ${CHROOT}${DIR} ] && \
-      install -dm755 -o $DAEMON_USER -g $DAEMON_GROUP ${CHROOT}${DIR} && \
-      echo "Creating directory ${CHROOT}${DIR}"
-      chown -R $DAEMON_USER:$DAEMON_GROUP ${CHROOT}${DIR}
-  done
-  rm -f /tmp/empty
-}
-
-post_upgrade() {
-  cp /etc/lighttpd/lighttpd.conf /etc/lighttpd/lighttpd.conf.old
-  cp /etc/lighttpd/lighttpd.conf.pacnew /etc/lighttpd/lighttpd.conf
-  if  [ -f /usr/bin/php ]
-then
-  cp /etc/lighttpd/lighttpd.conf /tmp
-	sed -e "s/# .*  \"mod_fastcgi\",/\"mod_fastcgi\"\,/g" /tmp/lighttpd.conf > /etc/lighttpd/lighttpd.conf
- 
-fi
-  post_install $1
-}
-
-op=$1
-shift
-$op $*
-# vim: ft=sh ts=2
diff --git a/abs/mv-core/lighttpd/lighttpd.logrotate.d b/abs/mv-core/lighttpd/lighttpd.logrotate.d
deleted file mode 100644
index f31cb79..0000000
--- a/abs/mv-core/lighttpd/lighttpd.logrotate.d
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/log/lighttpd/*log {
-  create 644 nobody nobody
-  compress
-  postrotate
-    /bin/kill -HUP `cat /var/run/lighttpd.pid 2>/dev/null` 2> /dev/null || true
-  endscript
-}
-
diff --git a/abs/mv-core/lighttpd/lighttpd.rc.d b/abs/mv-core/lighttpd/lighttpd.rc.d
deleted file mode 100644
index 245ac0a..0000000
--- a/abs/mv-core/lighttpd/lighttpd.rc.d
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/lighttpd ] && . /etc/conf.d/lighttpd
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID ${DAEMON_NAME}`
-case "$1" in
-  start)
-    stat_busy "Starting ${DAEMON_NAME}"
-    [ -z "$PID" ] && ${DAEMON_PATH} -f ${DAEMON_CONF} >> $DAEMON_ERRLOG 2>&1
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon ${DAEMON_NAME}
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping ${DAEMON_NAME}"
-    [ ! -z "$PID" ] && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon ${DAEMON_NAME}
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0 
diff --git a/abs/mv-core/lighttpd/spawn-php.conf.d b/abs/mv-core/lighttpd/spawn-php.conf.d
deleted file mode 100644
index 4a2810d..0000000
--- a/abs/mv-core/lighttpd/spawn-php.conf.d
+++ /dev/null
@@ -1,33 +0,0 @@
-## ABSOLUTE path to the spawn-fcgi binary
-SPAWNFCGI="/usr/bin/spawn-fcgi"
-
-## ABSOLUTE path to the PHP binary
-FCGIPROGRAM="/usr/bin/php-cgi"
-
-## In preparation of a possible python/perl/etc compliance
-SPAWN_DAEMON_NAME="spawn-php"
-
-## bind to tcp-port on localhost
-FCGIPORT="1066"
-
-## If uncommented, socket will be used instead of port
-#FCGISOCKET="/tmp/php-fastcgi.socket"
-
-## number of PHP childs to spawn
-PHP_FCGI_CHILDREN=6
-
-## number of request server by a single php-process until is will be restarted
-PHP_FCGI_MAX_REQUESTS=1000
-
-## IP adresses where PHP should access server connections from
-FCGI_WEB_SERVER_ADDRS="127.0.0.1"
-
-# allowed environment variables sperated by spaces
-ALLOWED_ENV="ORACLE_HOME PATH USER"
-
-## if the daemon script is run as root switch to the following user
-USERID=nobody
-GROUPID=nobody
-
-## cage the php process to the following dir (chrootdir)
-#CHROOTDIR="/home/lighttpd/html"
diff --git a/abs/mv-core/lighttpd/spawn-php.rc.d b/abs/mv-core/lighttpd/spawn-php.rc.d
deleted file mode 100755
index cbda262..0000000
--- a/abs/mv-core/lighttpd/spawn-php.rc.d
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/bin/bash
-
-# source application-specific settings
-[ -f /etc/conf.d/spawn-php ] && . /etc/conf.d/spawn-php
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-
-PID=`pidof -o %PPID ${FCGIPROGRAM}`
-case "$1" in
-  start)
-    stat_busy "Starting ${SPAWN_DAEMON_NAME}"
-    if [ -z "$PID" ]; then
-      ################## no config below this line
-      if test x$PHP_FCGI_CHILDREN = x; then
-        PHP_FCGI_CHILDREN=5
-      fi
-      export PHP_FCGI_MAX_REQUESTS
-      export FCGI_WEB_SERVER_ADDRS
-      
-      ALLOWED_ENV="$ALLOWED_ENV PHP_FCGI_MAX_REQUESTS FCGI_WEB_SERVER_ADDRS"
-
-      # negotiate the parameters for the php-cgi spawn program
-      EX="$SPAWNFCGI -f $FCGIPROGRAM -C $PHP_FCGI_CHILDREN"
-      if [ -z "$FCGISOCKET" ]; then
-        EX="$EX -p $FCGIPORT"
-      else
-        EX="$EX -s $FCGISOCKET"
-      fi
-      if test x$UID = x0; then
-        EX="$EX -u $USERID -g $GROUPID"
-      fi
-      if [ ! -z "$CHROOTDIR" ]; then
-        EX="$EX -c $CHROOTDIR"
-      fi
-
-      # copy the allowed environment variables
-      E=
-      for i in $ALLOWED_ENV; do
-        E="$E $i=${!i}"
-      done
-      # clean environment and set up a new one
-      env - $E $EX > /dev/null
-      add_daemon ${SPAWN_DAEMON_NAME}
-      stat_done
-    fi
-    ;;
-   stop)
-     stat_busy "Stopping ${SPAWN_DAEMON_NAME}"
-     if [ ! -z "$PID" ]; then
-       killall ${FCGIPROGRAM}
-       rm_daemon ${SPAWN_DAEMON_NAME}
-       stat_done
-     fi
-     ;;
-   restart)
-     $0 stop
-     sleep 2
-     $0 start
-     ;;
-   *)
-     echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
-
-  
diff --git a/abs/mv-core/lighttpd/ssl_fix.diff b/abs/mv-core/lighttpd/ssl_fix.diff
deleted file mode 100644
index 7031a48..0000000
--- a/abs/mv-core/lighttpd/ssl_fix.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- lighttpd-1.3.13/src/connections.c	2005-03-03 15:36:51.000000000 -0800
-+++ lighttpd-1.3.13fix/src/connections.c	2005-05-12 02:33:37.124740872 -0700
-@@ -1141,6 +1141,7 @@
- 				return NULL;
- 			} else {
- 				SSL_set_accept_state(con->ssl);
-+				con->conf.is_ssl=1;
- 			}
- 			
- 			if (1 != (SSL_set_fd(con->ssl, cnt))) {
diff --git a/abs/mv-core/lighttpd/tweakconf.vim b/abs/mv-core/lighttpd/tweakconf.vim
deleted file mode 100644
index 7e55ee3..0000000
--- a/abs/mv-core/lighttpd/tweakconf.vim
+++ /dev/null
@@ -1,22 +0,0 @@
-%s/\/www\/logs\//\/var\/log\/lighttpd\/
-%s/lighttpd\.error/error/
-%s/\/www\/pages\//\/home\/lighttpd\/html\//
-%s/#server\.pid\-file/server.pid-file/
-%s/\/tmp\/lighttpd\/cache\/compress\//\/home\/lighttpd\/cache\/
-%s/^#server\.username.*$/server.username            = "nobody"/
-%s/^#server\.groupname.*$/server.groupname            = "nobody"/
-%s/\/usr\/local\/bin\/php/\/usr\/bin\/php-cgi/
-%s/\(vhost\.server-root.*=\).*$/\1 "\/home\/lighttpd\/vhosts\/"/
-/SSL engine/,/pem/d
-i
-#### SSL engine
-#$SERVER["socket"] == "0.0.0.0:443" {
-#  ssl.engine                  = "enable"
-#  ssl.pemfile                 = "/home/lighttpd/ssl/server.pem"
-#  server.errorlog             = "/var/log/lighttpd/error-ssl.log"
-#  accesslog.filename          = "/var/log/lighttpd/access-ssl.log"
-#  server.document-root        = "/home/lighttpd/html-ssl"
-#}
-.
-w
-q
diff --git a/abs/mv-core/local-website/PKGBUILD b/abs/mv-core/local-website/PKGBUILD
deleted file mode 100755
index e0b2380..0000000
--- a/abs/mv-core/local-website/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-pkgname=local-website
-pkgver=3
-pkgrel=85
-pkgdesc="Local website for MythVantage "
-arch=(i686 x86_64)
-#depends=('lighttpd')
-depends=('lighttpd'  'php' 'fcgi' 'python' )
-source=()
-
-
-build() {
-   cd $startdir/src/
-
-   mkdir -p $startdir/pkg/data/srv/httpd/htdocs
-   cp -rp $startdir/contents/* $startdir/pkg/data/srv/httpd/htdocs
-   chmod -R 755 $startdir/pkg/data/srv/httpd/htdocs
-	cd $startdir
-	mkdir -p $startdir/pkg/data/srv/httpd/
-	cp -rp cgi $startdir/pkg/data/srv/httpd/
-
-}
-
diff --git a/abs/mv-core/local-website/cgi/beclear.cgi b/abs/mv-core/local-website/cgi/beclear.cgi
deleted file mode 100755
index 40c0cec..0000000
--- a/abs/mv-core/local-website/cgi/beclear.cgi
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-/usr/local/bin/mythbackend --clearcache
-MESSAGE="settings cache is cleared "
-#/usr/bin/notify.py SYS  "$MESSAGE" 2>/dev/null
diff --git a/abs/mv-core/local-website/cgi/bestop.cgi b/abs/mv-core/local-website/cgi/bestop.cgi
deleted file mode 100755
index e45e74d..0000000
--- a/abs/mv-core/local-website/cgi/bestop.cgi
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-sudo /sbin/sv stop mythbackend > /dev/null
-MESSAGE="`hostname` B.E. stopped"
-
-#echo $MESSAGE
-/usr/bin/notify.py NFO  "$MESSAGE" 2>/dev/null
diff --git a/abs/mv-core/local-website/cgi/diskless.py b/abs/mv-core/local-website/cgi/diskless.py
deleted file mode 100755
index d8d960b..0000000
--- a/abs/mv-core/local-website/cgi/diskless.py
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/python
-import cgi
-import os
-#http://192.168.1.200:1337/diskless.py?HOSTNAME=Envynetfe&MAC=00:0C:29:2D:08:82
-
-The_Form = cgi.FieldStorage()
-print "name:" + The_Form["HOSTNAME"].value
-print "mac:" + The_Form["MAC"].value
-cmd="sudo /usr/MythVantage/bin/build_diskless.sh " + The_Form["HOSTNAME"].value + "  " + The_Form["MAC"].value 
-print cmd
-os.popen(cmd + " >/dev/null 2>&1 &" )
diff --git a/abs/mv-core/local-website/cgi/serverkey.cgi b/abs/mv-core/local-website/cgi/serverkey.cgi
deleted file mode 100755
index ee54480..0000000
--- a/abs/mv-core/local-website/cgi/serverkey.cgi
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-#cat /data/srv/httpd/dsa.pub
-cat /data/srv/.nobody_ssh/id_dsa.pub
diff --git a/abs/mv-core/local-website/contents/calllog.py b/abs/mv-core/local-website/contents/calllog.py
deleted file mode 100755
index a96813e..0000000
--- a/abs/mv-core/local-website/contents/calllog.py
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/usr/bin/python
-# import MySQL module
-
-import MySQLdb
-import sys
-import getopt
-import socket
-
-
-def main(argv):
-    grandtotal=0
-    grandtotal_current=0
-    db = MySQLdb.connect(host="localhost", user="mythtv", passwd="mythtv", db="ncid")
-    # create a cursor
-    cursor = db.cursor()
-   # execute SQL statement
-    cursor.execute("select  name,number,count(number) as '# calls'  from cid group by number,name  order by '# calls' DESC  limit 20;")
-    result = cursor.fetchall()
-
-    
-#Top shows  
-    #print '<div id="content"> <p></p>'
-    print '<div> <p></p>'
-    print '<table class="calllog">'
-    print "Top 20 callers"
-    searchstring='''<td> <a href="http://www.google.com/search?q=%s" >  %s  </a> </td> '''
-    cursor.execute("select  name,number,count(number) as '# calls'  from cid group by number,name  order by '# calls' DESC  limit 20;")
-    result = cursor.fetchall()
-    for row in result:
-        print "	<tr>"
-        #print "		<td>",row[0],"</td>"
-        print  searchstring  % (row[0], row [0]) 	
-        print "		<td>",row[2],"</td>"
-        #print "		<td>",row[1],"</td>"
-        print  searchstring  % (row[1], row [1]) 	
-        print "	</tr>"
-        #print "%40s %26s %10s" %(row[0],row[2],row[1])
-    print "</table>"
-    print "</div>"
-#Top categorys
-
-    
-    print '<br>'
-    print '<br>'
-    #print '<div id="content"> <p></p>'
-    print '<div>  <p></p>'
-    print '<table class="calllog">'
-    print "Last 20 calls"
-    print '<br>'
-    cursor.execute("select date,time,name,number from cid order by date(ts) DESC ,time DESC  limit 20 ;" )
-    result = cursor.fetchall()
-    for row in result:
-        print "	<tr>"
-        print "		<td>  %s  </td>" %(row[0])
-        print "		<td>",row[1],"</td>"
-        #print "		<td>",row[2],"</td>"
-        print  searchstring  % (row[2], row [2]) 	
-        #print "		<td>",row[3],"</td>"
-        print  searchstring  % (row[3], row [3]) 	
-        print "	</tr>"
-#        print "%26s %26s %26s %26s " %(row[0],row[1],row[2],row[3])
-    print "</table>"
-    print "</div>"
-
-if __name__ == "__main__":
-    main(sys.argv[1:])
diff --git a/abs/mv-core/local-website/contents/calllog.shtml b/abs/mv-core/local-website/contents/calllog.shtml
deleted file mode 100755
index ddf3d88..0000000
--- a/abs/mv-core/local-website/contents/calllog.shtml
+++ /dev/null
@@ -1,20 +0,0 @@
-<html>
-<head>
-<style type="text/css">@import "/frame.css";</style>
-</head>
-
-<body>
-<div id="mainContainer">
-<!--		<div id="header"><p></p></div>
-		<div id="content">
-		<p></p>-->
-
-	<!--#exec cmd="/data/srv/httpd/htdocs/calllog.py" -->
-
-
-</br>
-</br>
-
-</body>
-</html>
-
diff --git a/abs/mv-core/local-website/contents/count.py b/abs/mv-core/local-website/contents/count.py
deleted file mode 100755
index 6d813c1..0000000
--- a/abs/mv-core/local-website/contents/count.py
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/usr/bin/python
-# import MySQL module
-
-import MySQLdb
-import sys
-import getopt
-import socket
-
-
-def main(argv):
-    grandtotal=0
-    grandtotal_current=0
-    db = MySQLdb.connect(host="localhost", user="mythtv", passwd="mythtv", db="mythconverg")
-    # create a cursor
-    cursor = db.cursor()
-   # execute SQL statement
-    cursor.execute("SELECT unix_timestamp(starttime),unix_timestamp(endtime),title FROM oldrecorded ORDER by starttime;")
-    result = cursor.fetchall()
-
-    for row in result:
-      #  print row[0], row[1] ,row [2]
-        start=row[0]
-        end=row[1]
-        if ( end  > start ):
-            total = (end - start) /60
-            grandtotal+=total
-    hours = grandtotal / 60.0
-    days = hours / 24.0
-
-    cursor.execute("SELECT unix_timestamp(starttime),unix_timestamp(endtime),title FROM recorded where not (recgroup=(%s))  ORDER by starttime",("LiveTV"))
-    result_current = cursor.fetchall()
-    for row in result_current:
-        start=row[0]
-        end=row[1]
-        if ( end  > start ):
-            total = (end - start) /60
-            grandtotal_current+=total
-    hours_current = grandtotal_current / 60.0
-    days_current = hours_current / 24.0
-
-    print '<div id="header">'
-
-    print "<table>"
-    print "    <tr>"
-    print "	  <td> Currently there are " ,  len(result_current) , " recorded programs.  With a viewing time of  %.2f days or  %.2f  hours. </td>" %(days_current,hours_current)
-    print "    </tr>"
-    print "</table>"
-    print "</br> "
-
-    print "<table>"
-    print "	<tr>"
-    print "  		<td> Overall there have been " ,  len(result) , "shows recorded. With viewing time of %.2f days or %.2f hours </td>"%(days,hours)
-    print "	</tr>"
-    print "</table>"
-    print '</div>'
-    print "</br> </br> "
-#Top shows
-    print '<div id="content"> <p></p>'
-    print '<table class="sample">'
-    print "Top 20 Shows"
-    cursor.execute("select title,count(title),category as numtitle from oldrecorded group by title having (COUNT(title) > 1) order by (COUNT(title)) DESC  limit 20;" )
-    result = cursor.fetchall()
-    for row in result:
-        print "	<tr>"
-        print "		<td>",row[0],"</td>"
-        print "		<td>",row[2],"</td>"
-        print "		<td>",row[1],"</td>"
-        print "	</tr>"
-       # print "%40s %26s %10s" %(row[0],row[2],row[1])
-    print "</table>"
-    print "</div>"
-#Top categorys
-
-    print '<div id="column"></div>'
-    print '<table class="sample">'
-    print "Top 20 Categories"
-    cursor.execute("select category,count(category) as numtitle from oldrecorded group by category having (COUNT(category) > 1) order by (COUNT(category)) DESC  limit 20; " )
-    result = cursor.fetchall()
-    for row in result:
-        print "	<tr>"
-        print "		<td>",row[0],"</td>"
-        print "		<td>",row[1],"</td>"
-        print "	</tr>"
-        #print "%16s %16s" %(row[0],row[1])
-    print "</table>"
-    print "</div>"
-
-if __name__ == "__main__":
-    main(sys.argv[1:])
\ No newline at end of file
diff --git a/abs/mv-core/local-website/contents/docs.html b/abs/mv-core/local-website/contents/docs.html
deleted file mode 100755
index c4a934b..0000000
--- a/abs/mv-core/local-website/contents/docs.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<html>
-<head>
-<style type="text/css">@import "frame.css";</style>
-</head>
-
-<body>
-Package Management
-</br>
-
-<div id="navcontainer">
-<ul id="navlist">
-        <li>pacman -Sy  to refresh  pkg database</li>
-        <li>pacman -Ss  $keyword   to search pkg database</li>
-        <li>pacman -Su  to update all install packages</li>
-        <li>pacman -S   $pkg   to update one pkg</li>
-        <li>pacman -h   for a list of pacman operations .</li>
-        <li>pacman -S --help   for a full list of options associated with the -S command.</li>
-</ul>
-</div>
-<br>
-Starting and stopping services.
-<br>
-
-<div id="navcontainer">
-<ul id="navlist">
-	<li>sv {stop,start,restart} frontend. This will start/stop the entire X proccess that runs mythfrontend</li>
-	<li>sv {stop,start,restart} mysql</li>
-	<li>sv {stop,start,restart} mythbackend</li>
-	<li>sv {stop,start,restart} lircd</li>
-</ul>
-<br>
-</div>
-<div id="navcontainer">
-	Other Random notes
-<br>
-<ul id="navlist">
-	<li>The root password is blank.  You will not be able to remotely access this account until the password is set.</li>
-	<li>The mythtv account is locked, reset the password if you wish login with this account.</li>
-	<li>The mythtv account has full sudo privileges. </li>
-	<li>All access from public ip address are blocked.  Edit /etc/hosts.deny  /etc/hosts.allow to change this.</li>
-	<li>Mythfilldatabase will automaticlly run when mythbackend is started.  If the last attempt was successful then it will skip this step and mythfilldatabase will run normally.</li>
-	<li>To keep a host from showing up in the network map, add it to:
-       	/data/srv/hobbit/server/ext/ignoreclient.py
-	</li>
-	<li>remove  "func" from bb-hosts to stop hobbit from running a func check on it </li>
-	<li>if /tmp/nomfe is present then mythfrontend will not restart </li>
-	<li>if /tmp/debug is present then mythfrontend and mythbackend will run with gdb.  Debug packages will need to be installed for this to be useful </li>
-
-	<li>create_master.sh will copy the contents of the cdrive to a "Gold" image for network/diskless  installation. Dhcp server must be enabled for netboot to work, please turn off any other dhcp servers on your network. </li>
-    <li>On the misc screen the nfsmap section will accept entries pointing to different servers.   For instance 192.168.1.5:nfsmap will pull the nfsmap file from the ip 192.168.1.5 (hostnames may also be used) </li>
-    <li>adding pkg names to /etc/pkgname.blacklist will stop MythVantage from autoinstalling a package.</li>
-</div>
-<br>
-<div id="navcontainer">
-    Menu Navigation
-<br>
-
-<ul id="navlist">
-    <li> <A HREF="images/classic-menugraph.png">Classic menu</A> </li>
-    <li> <A HREF="images/menu_diagram_color.png">Standard menu</A> </li>
-    <li> <A HREF="images/dvr_menugraph.png">DVR menu</A> </li>
-
-</body>
-</html>
-
diff --git a/abs/mv-core/local-website/contents/error-handler.html b/abs/mv-core/local-website/contents/error-handler.html
deleted file mode 100755
index 49e406f..0000000
--- a/abs/mv-core/local-website/contents/error-handler.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
-<head>
-<style type="text/css">@import "/frame.css";</style>
-</head>
-
-<body>
-Module or page not found
-</body>
-</html>
\ No newline at end of file
diff --git a/abs/mv-core/local-website/contents/error/hobbit.html b/abs/mv-core/local-website/contents/error/hobbit.html
deleted file mode 100755
index 18450f2..0000000
--- a/abs/mv-core/local-website/contents/error/hobbit.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<html>
-<head>
-<style type="text/css">@import "/frame.css";</style>
-</head>
-
-<body>
-Hobbit does not appear to be installed.
-</br>
-Please visit the MythVantage advanced screen to enable Hobbit.
-</body>
-</html>
diff --git a/abs/mv-core/local-website/contents/error/mythweb.html b/abs/mv-core/local-website/contents/error/mythweb.html
deleted file mode 100755
index fe76a9a..0000000
--- a/abs/mv-core/local-website/contents/error/mythweb.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<html>
-<head>
-<style type="text/css">@import "/frame.css";</style>
-</head>
-
-<body>
-MythWeb does not appear to be installed.
-</br>
-To install MythWeb either
-</br>
-1) Visit the MythVantage advanced screen to enable mythweb. </br>
-2) type "pacman -S mythweb-release-fixes" at the console.
-
-
-</body>
-</html>
diff --git a/abs/mv-core/local-website/contents/error/phpadmin.html b/abs/mv-core/local-website/contents/error/phpadmin.html
deleted file mode 100755
index dbdd4d3..0000000
--- a/abs/mv-core/local-website/contents/error/phpadmin.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<html>
-<head>
-<style type="text/css">@import "/frame.css";</style>
-</head>
-
-<body>
-phpMyAdmin is a tool written in PHP intended to handle the administration of MySQL over the Web. 
-</br>
-Currently it's not installed,but if you wish to install phpmyadmin, type the following at a command prompt
-</br>
-</br>
-
-pacman -S phpmyadmin
-
-</br>
-</br>
-PHP must be enabled for phpMyAdmin.
-</br>
-The easiest way to enable php is to enable Mythweb under the advanced settings for MythVantage.
-</br>
-</br>
-</br>
-
-Please be carefull, phpMyAdmin is a powerful tool and can easily mess with your settings.
-		
-
-</body>
-</html>
diff --git a/abs/mv-core/local-website/contents/error/status-404.html b/abs/mv-core/local-website/contents/error/status-404.html
deleted file mode 100755
index 49e406f..0000000
--- a/abs/mv-core/local-website/contents/error/status-404.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<html>
-<head>
-<style type="text/css">@import "/frame.css";</style>
-</head>
-
-<body>
-Module or page not found
-</body>
-</html>
\ No newline at end of file
diff --git a/abs/mv-core/local-website/contents/frame.css b/abs/mv-core/local-website/contents/frame.css
deleted file mode 100755
index 3ade4ee..0000000
--- a/abs/mv-core/local-website/contents/frame.css
+++ /dev/null
@@ -1,176 +0,0 @@
-* /* Our "universal rule" */
-{
-	padding: 0;
-	margin: 0;
-	border: 0;
-}
-body {
-    background: url("page_background.jpg") repeat-y #9FA9B3;
-    margin: 10;
-    margin-left:40px;
-    padding: 10;
-    border: 10;
-    min-width: 770px;
-    font-family: Arial, Tahoma, Helvetica, sans-serif;
-    font-size: 11px;
-    color: #FFFFFF;
-    text-align: center;
-    font-size: 18px;
-    font-family: tahoma, verdana, geneva, arial, helvetica, sans-serif;
-
-
-}
-
-
-
-#mainContainer {
-	width: 770px;
-	margin: 0 auto; /* We are going to center this design */
-	text-align: left; /* Since we used text-align: center in the body to be sure some older IE versions are going to center our design, we now align the text left */
-}
-#header {
-	background: #000;
-	color: #fff;
-}
-#content {
-	float: left; /* Our content is going to be left aligned */
-	width: 320px; /* And it's going to have a 500px width */
-	/*background: #D9D9D9;*/
-	margin-left:60px;
-}
-#column {
-	float: right; /* Our column is going to be right aligned */
-	width: 320px; /* Our total width - content width is 260px */
-	/*background: #8A8AE6;*/
-}
-#footer {
-	clear: both; /* We have to clear our floats */
-	width: 760px; /* We need to set the width on the footer since it's outside the mainContainer, and therefor isn't controlled by it */
-	margin: 0 auto; /* We need to center the footer also */
-	background: black;
-	color: gold;
-    	text-align: center;
-    	font-size: 10px;
-}
-
-#navlist {
-    margin-left: 50;
-    padding-left: 0;
-    list-style-type: square;
-    text-align: left;
-}
-
-#navlist li {
-
-}
-#navlist a:link
-{
-	color: #fff;
-#	background-color: #FDB14F;
-	text-decoration: underline ;
-
-
-}
-
-#navlist a:visited
-{
-#	color: #FDB14F;
-	color: gold;
-	text-decoration: underline;
-}
-
-table.sample {
-	border-width: 4px;
-	border-spacing: 2px;
-	border-style: outset;
-	border-color: #808080;
-	border-collapse: separate;
-	width:300px;
-}
-
-table.sample td {
-	border-width: 1px;
-	padding: 1px;
-	border-style: inset;
-	border-color: #808080;
-	/*width:300px;*/
-	-moz-border-radius: ;
-}
-
-
-table.calllog {
-	border-width: 4px;
-	border-spacing: 2px;
-	border-style: outset;
-	border-color: #808080;
-	border-collapse: separate;
-	width:500px;
-}
-
-table.calllog td {
-	border-width: 1px;
-	padding: 1px;
-	border-style: inset;
-	border-color: #808080;
-	/*width:300px;*/
-	-moz-border-radius: ;
-}
-
-
-.n {
-    font-weight: normal;
-    text-align: left;
-    width: 250px;
-    color: white;
-}
-
-.s {
-    font-weight: normal;
-    text-align: left;
-    width: 150px;
-    color: white;
-    text-decoration: none;
-}
-
-.m {
-    font-weight: normal;
-    text-align: left;
-    width: 350px;
-    color: white;
-    text-decoration: none;
-}
-
-.t {
-    font-weight: normal;
-    text-align: left;
-    width: 350px;
-    color: white;
-    text-decoration: none;
-    visibility:hidden
-}
-
-
-a:link
-{
-	color: #fff;
-#	background-color: #FDB14F;
-	text-decoration: underline ;
-
-    	 margin-left:10px;
-
-}
-
-a:visited
-{
-#	color: #FDB14F;
-	color: gold;
-	text-decoration: underline;
-    	 margin-left:10px;
-}
-
-#submitbutton {
-    background-color: #010101;
-    font-size: 100%;
-    color: gold;
-    text-decoration: underline;margin-left:150px;
-    padding: 10px; font-weight: bold; }
diff --git a/abs/mv-core/local-website/contents/header.html b/abs/mv-core/local-website/contents/header.html
deleted file mode 100755
index 686cf78..0000000
--- a/abs/mv-core/local-website/contents/header.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<html>

-<style type="text/css">@import "mv.css";</style>

-<head>

-

-<script type="text/javascript">

-function r() 

-{

-	top.frames["content"].location.href = ( "http://" + parent.location.hostname + ":6544" ) ;

- 

-}	

-</script>	

-</head>

-

-<BODY BGCOLOR=#000011>

-

-<div id='header'>

- </div>

-

-<base target="content" />

-<div id="navcontainer">

-	<ul id="navlist">

-		<li id="active"><a href="home.shtml" TARGET="content" id="current">Home</a></li>

-		<li><a href="docs.html"  >Documentation</a></li>

-		<li><a href="links.html"  >Links</a></li>

-		<li><a href="webcal/"  >Calendar</a></li>

-		<li><a href="hobbit"  >Hobbit</a></li>

-		<li><a   onClick=r() >MBE_Status</a></li>

-		<li><a href="mythweb/" >MythWeb</a></li>

-		<li><a href="phpMyAdmin/"  >phpMyAdmin</a></li>

-	</ul>

-</div>

-</body>

-</html>

diff --git a/abs/mv-core/local-website/contents/header.jpg b/abs/mv-core/local-website/contents/header.jpg
deleted file mode 100644
index 3bf128e..0000000
--- a/abs/mv-core/local-website/contents/header.jpg
+++ /dev/null
diff --git a/abs/mv-core/local-website/contents/home.shtml b/abs/mv-core/local-website/contents/home.shtml
deleted file mode 100755
index 593fa48..0000000
--- a/abs/mv-core/local-website/contents/home.shtml
+++ /dev/null
@@ -1,23 +0,0 @@
-<html>
-<head>
-<style type="text/css">@import "frame.css";</style>
-</head>
-
-<body>
-<div id="mainContainer">
-<!--		<div id="header"><p></p></div>
-		<div id="content">
-		<p></p>-->
-
-	<!--#exec cmd="/data/srv/httpd/htdocs/count.py" -->
-
-
-</br>
-</br>
- <img src="/hobbit/gifs/network.png" >
-
-<div id="footer"><p>Thank you for choosing MythVantage</p></div>
-
-</body>
-</html>
-
diff --git a/abs/mv-core/local-website/contents/images/classic-menugraph.png b/abs/mv-core/local-website/contents/images/classic-menugraph.png
deleted file mode 100755
index bedbd93..0000000
--- a/abs/mv-core/local-website/contents/images/classic-menugraph.png
+++ /dev/null
diff --git a/abs/mv-core/local-website/contents/images/dvr_menugraph.png b/abs/mv-core/local-website/contents/images/dvr_menugraph.png
deleted file mode 100755
index 712ab36..0000000
--- a/abs/mv-core/local-website/contents/images/dvr_menugraph.png
+++ /dev/null
diff --git a/abs/mv-core/local-website/contents/images/menu_diagram_color.png b/abs/mv-core/local-website/contents/images/menu_diagram_color.png
deleted file mode 100755
index d364d94..0000000
--- a/abs/mv-core/local-website/contents/images/menu_diagram_color.png
+++ /dev/null
diff --git a/abs/mv-core/local-website/contents/index.html b/abs/mv-core/local-website/contents/index.html
deleted file mode 100755
index e77c22d..0000000
--- a/abs/mv-core/local-website/contents/index.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
-<html>
-	<head><title>MythVantage</title>
-	</head>
-	<frameset rows="170, 80%" frameborder="no" border="3" bordercolor="#000000">
-		   <frame src="header.html" name="menuframe" />
-		      <frame src="home.shtml" name="content" />
-		      <noframes>
-			      <body>
-				      There is no frame support on your browser.
-			      </body>
-		      </noframes>
-	      </frameset>
-      </html>
diff --git a/abs/mv-core/local-website/contents/links.html b/abs/mv-core/local-website/contents/links.html
deleted file mode 100755
index 1f0f34b..0000000
--- a/abs/mv-core/local-website/contents/links.html
+++ /dev/null
@@ -1,26 +0,0 @@
-<html>
-<head>
-<style type="text/css">@import "frame.css";</style>
-<script type="text/javascript">
-
-</head>
-</head>
-
-<body>
-Other links
-
-
-<div id="navcontainer">
-<ul id="navlist">
-        <li><a href="/logs/"  >System log files</a> </li>
-        <li><a href="/calllog.shtml"  >Phone call log</a> </li>
-        <li><a href="/mvpmc.shtml"  >Media MVP setup</a> (dhcp server must be enabled) </li>
-<!--        <li><a href="/ipodfeed/feed.php"  >Subscribe to ipodfeed</a> (mythweb must be enabled for this to work)</li> -->
-        <li><a href="http://www.mythvantage.com"  >mythvantage.com</a></li>
-        <li><a href="http://www.mythtv.com"  >mythtv.com</a></li>
-</ul>
-</div>
-
-
-</body>
-</html>
diff --git a/abs/mv-core/local-website/contents/mv.css b/abs/mv-core/local-website/contents/mv.css
deleted file mode 100755
index 70f0764..0000000
--- a/abs/mv-core/local-website/contents/mv.css
+++ /dev/null
@@ -1,82 +0,0 @@
-#header {
-       // width: 820px;
-        position: relative;
-        height: 120px;
-        background: #000011 url(header.jpg) no-repeat center top;
-//	background:black;
-        padding: 0;
-        font-size: 14px;
-        color: #FFF;
-}
-
-#header h1#logo-text {
-      //  position: absolute;
-        margin: 0; padding: 0;
-        font: bolder 3.3em 'Trebuchet MS', Arial, Sans-serif;
-        letter-spacing: -2px;
-        color: #FFFFFF;
-        text-transform: none;
-	text-align: center;
-        /* change the values of top and left to adjust the position of the logo*/
-        top: 28px; left: 50px;
-}
-
-#content
-{
-        color: #FFFFFF;
-        text-transform: none;
-	text-align: center;
-
-}
-
-#navcontainer
-{
-	width: 100%;
-	float: left;
-	background-color: black;
-}
-
-#navcontainer ul { padding: 0; }
-#navcontainer ul li { display: inline; }
-
-#navcontainer ul
-{
-	margin: 0;
-	padding: 0 0 0 7%;
-	color: #FFFFFF;
-	font-family: tahoma, verdana, geneva, arial, helvetica, sans-serif;
-	//font-size: .65em;
-	letter-spacing: 2px;
-	font-weight: bold;
-        float: right;
-background:black;
-}
-
-
-#navcontainer ul li a
-{
-	padding: 0.2em 12px;
-	background-color: black;
-	color: #FFFFFF;
-	text-decoration: none;
-	float: left;
-	//border-right: 1px solid #94B473;
-}
-
-#navcontainer ul li a:hover
-{
-	background-color: #ECECEC;
-        color: #333;
-}
-
-#navlist li a:hover, #navlist li a:active
-{
-	color: #FFFFFF;
-	text-decoration: none;
-	background:black;
-	text-align: right;
-        font-family: tahoma, verdana, geneva, arial, helvetica, sans-serif;
-
-}
-
-
diff --git a/abs/mv-core/local-website/contents/mvp_process.py b/abs/mv-core/local-website/contents/mvp_process.py
deleted file mode 100755
index b01ed8b..0000000
--- a/abs/mv-core/local-website/contents/mvp_process.py
+++ /dev/null
@@ -1,195 +0,0 @@
-#!/usr/bin/python
-import sys
-import cgi
-import os
-import socket
-import time
-import shutil
-try:
-    import cgitb
-    cgitb.enable()
-except ImportError:
-    sys.stderr = sys.stdout
-def cgiprint(inline=''):
-    sys.stdout.write(inline)
-    sys.stdout.write('\r\n')
-    sys.stdout.flush()
-contentheader = 'Content-Type: text/html'
-
-thepage = '''<html><head>
-<title>%s</title>
-</head><body>
-%s
-</body></html>
-'''
-h1 = '<h1>%s</h1>'
-
-def getform(theform, valuelist, notpresent='', nolist=False):
-    """
-    This function, given a CGI form as a
-    FieldStorage instance, extracts the
-    data from it, based on valuelist
-    passed in. Any non-present values are
-    set to '' - although this can be
-    changed. (e.g. to return None so you
-    can test for missing keywords - where
-    '' is a valid answer but to have the
-    field missing isn't.) It also takes a
-    keyword argument 'nolist'. If this is
-    True list values only return their
-    first value.
-    """
-    data = {}
-    for field in valuelist:
-
-
-        if not theform.has_key(field):
-        #  if the field is not present (or was empty)
-            data[field] = notpresent
-        else:
-        # the field is present
-            data[field] = theform.getlist(field)
-
-#	    print type(theform[field])
-    return data
-
-def getall(theform, nolist=False):
-    """
-    Passed a form (cgi.FieldStorage
-    instance) return *all* the values.
-    This doesn't take into account
-    multipart form data (file uploads).
-    It also takes a keyword argument
-    'nolist'. If this is True list values
-    only return their first value.
-    """
-    data = {}
-    for field in theform.keys():
-    # we can't just iterate over it, but must use the keys() method
-        if type(theform[field]) ==  type([]):
-            if not nolist:
-                data[field] = theform.getlist(field)
-
-            else:
-                data[field] = theform.getfirst(field)
-        else:
-            data[field] = theform[field].value
-
-
-    return data
-
-def isblank(indict):
-    """
-    Passed an indict of values it checks
-    if any of the values are set. Returns
-    True if the indict is empty, else
-    returns False. I use it on the a form
-    processed with getform to tell if my
-    CGI has been activated without any
-    form values.
-    """
-    for key in indict.keys():
-        if indict[key]:
-            return False
-    return True
-
-
-def update_mvp_list(maclist):
-    outfile = open("/etc/dnsmasq.mvpmc.conf","w")
-    mvpline="dhcp-boot=net:mvp,dongle.bin"
-    mvpmacline='dhcp-host=net:mvp,%s'
-    results="The following media mvp devices have been added:"
-    results+='</br>'
-    havemvp = "false"
-    #print maclist
-    for i in range(len(maclist)):
-        if maclist[i] != '':
-#             print mvpmacline % maclist[i]
-    	     outfile.write(mvpmacline % maclist[i] + '\n' )
-             havemvp="true"
-             results+=maclist[i]
-             results+='</br>'
-    if havemvp == "true":
-#        print mvpline
-    	outfile.write(mvpline + '\n' )
-        outfile.flush
-    	outfile.close
-        #time.sleep(5)
-
-    else:
-        outfile.close
-    return  results
-
-
-mainpage = '''
- <html><head>
- <style type="text/css">@import "/frame.css";</style>
- <!--<meta http-equiv="refresh" content="6">-->
- <title>Receiving a Form</title>
- </head><body>%s</body></html>'''
-
-error = '''
-
-    <h2>Removed all media mvp devices</h2>'''
-
-result = '''
-    <h1>%s</h1>
-'''
-possible_parameters = ['activemvp', 'othermac','hiddenparam']
-
-if __name__ == '__main__':
-    cgiprint(contentheader)   # content header
-    cgiprint()                # finish headers with blank line
-
-    theform = cgi.FieldStorage()
-    #print theform
-    formdict = getform(theform, possible_parameters)
-    #print possible_parameters
-    #print formdict
-    oldurl = '/mvpmc.shtml'
-    if isblank(formdict):
-        body = error
-        all_active=[]
-    else:
-        all_active=[]
-        activemac_checkbox = formdict['activemvp']
-        for i in range(len(activemac_checkbox)):
-             active_string=activemac_checkbox[i]
-             active_string=active_string.strip()
-             all_active.append(active_string)
-        body = result % ("MVP mac address")
-
-
-
-    print mainpage % body
- #   mylogfile=update_mvp_list(all_active)
-
-
-    box='''
-     <div style="border: 1px solid #aaa; width:600px; height:500px; overflow:auto; color:#FFF;text-align:left;">
-         <code id="box" style="display: block; height: 500px; width: 600px; overflow: auto;">
-    '''
-
-    endbox='''
-         </code>
-     </div>
-    '''
-    javascript='''
-    <script type="text/javascript">
-        var objDiv = document.getElementById("box");
-        objDiv.scrollTop = objDiv.scrollHeight;
-    </script>
-     '''
-    if all_active != []:
-        mylogfile=update_mvp_list(all_active)
-        command="sudo /sbin/sv stop dnsmasq"
-        os.system(command)
-        command="sudo /sbin/sv start dnsmasq"
-        os.system(command)
-        print box
-        print mylogfile
-        print endbox
-    print '<a href=',  oldurl,     '  > Back </a> '
-    #print oldurl
-    print javascript
-
diff --git a/abs/mv-core/local-website/contents/mvp_select.py b/abs/mv-core/local-website/contents/mvp_select.py
deleted file mode 100755
index 8283d68..0000000
--- a/abs/mv-core/local-website/contents/mvp_select.py
+++ /dev/null
@@ -1,146 +0,0 @@
-#!/usr/bin/python
-#
-
-import urllib2
-import string
-import sys
-import time
-import datetime
-import socket
-
-def read_accepted():
-
-    global dhcp_accepted
-    dhcp_accepted = []
-    try:
-        infile = open('/tmp/dhcp.leases', 'r')
-    except(IOError), e:
-        print "couldn't open accepted"
-    else:
-        filelist = infile.readlines()
-        infile.close()
-        for item in filelist:
-            item=item.strip()
-            macaddress=item.split(" ")[1]
-            if macaddress not in dhcp_accepted:
-                    dhcp_accepted.append(macaddress)
-                    #print macaddress
-
-def read_offered():
-    global dhcp_offered
-    dhcp_offered = []
-    try:
-        today = datetime.date.today()
-
-        host = socket.gethostname()
-        filename='/var/log/'
-        filename+=str(today)
-        filename+='/'
-        filename+=host
-        filename+='/dnsmasq'
-        infile = open(filename, 'r')
-    except(IOError), e:
-        print "couldn't open offered"
-    else:
-        filelist = infile.readlines()
-        infile.close()
-        for item in filelist:
-            item=item.strip()
-            if item.find("DHCPOFFER") != -1 :
-                macaddress=item.rpartition(" ")[2]
-                if macaddress not in dhcp_offered:
-                    dhcp_offered.append(macaddress)
-                    #print macaddress
-
-
-
-def read_current():
-    global dhcp_current
-    dhcp_current = []
-    try:
-        infile = open('/etc/dnsmasq.mvpmc.conf', 'r')
-    except(IOError), e:
-        print "couldn't open current"
-    else:
-        filelist = infile.readlines()
-        infile.close()
-        for item in filelist:
-            item=item.strip()
-            if item.find("dhcp-host") != -1 :
-                macaddress=item.partition(",")[2]
-
-                if macaddress not in dhcp_current :
-                    dhcp_current.append(macaddress)
-                   # print macaddress
-
-
-
-
-
-
-
-def make_html():
-    global dhcp_accepted
-    global dhcp_offered
-    buttonform_top='''
-        <div class="content" style="solid #aaa; width:500px; height:300px; overflow:auto; color:#FFF;text-align:left;">
-         <form action="/mvp_process.py" method="get">
-         '''
-
-
-    buttonform_bottom='''
-            Mac Address:
-            <input type="text" name="activemvp">
-
-            </br>
-            <input id="submitbutton" type="submit" />
-        </form>
-        </div>
-        '''
-    checkboxline = '''
-     <input type="checkbox"  name="activemvp" value="%s"  %s  />  %s <br />
-    '''
-    print '<br />'
-    da = set(dhcp_accepted)
-    dof = set(dhcp_offered)
-    dc = set(dhcp_current)
-    possible_mac= dof  -dc
-    #possible_mac= dof  -da - dc
-
-    print buttonform_top
-    for mac in dhcp_current:
-        print checkboxline % (mac ,' checked="yes"' , mac)
-    for mac in possible_mac:
-        print checkboxline % (mac , " " ,mac)
-    print buttonform_bottom
-
-
-#-------------------
-global dhcp_accepted
-global dhcp_offered
-global dhcp_current
-
-
-
-
-read_offered()
-#print "--"
-#print '</br>'
-read_accepted()
-#print "--"
-#print '</br>'
-read_current()
-#print "--"
-#print '</br>'
-
-
-
-#possible_mac= (dof - da)
-#possible_mac = dof
-#print "should be unchecked:"
-#print possible_mac
-
-
-make_html()
-
-
diff --git a/abs/mv-core/local-website/contents/mvpmc.shtml b/abs/mv-core/local-website/contents/mvpmc.shtml
deleted file mode 100755
index edc27d4..0000000
--- a/abs/mv-core/local-website/contents/mvpmc.shtml
+++ /dev/null
@@ -1,21 +0,0 @@
-<html>
-<head>
-<style type="text/css">@import "/frame.css";</style>
-</head>
-<h1>Media MVP page</h1>
-<body>
-<div id="mainContainer">
-<!--		<div id="header"><p></p></div>
-		<div id="content">
-		<p></p>-->
-
-	<!--#exec cmd="/data/srv/httpd/htdocs/mvp_select.py" -->
-
-
-</br>
-</br>
-<div id="footer"><p>Thank you for choosing MythVantage</p></div>
-
-</body>
-</html>
-
diff --git a/abs/mv-core/local-website/contents/page_background.jpg b/abs/mv-core/local-website/contents/page_background.jpg
deleted file mode 100644
index 4819c9a..0000000
--- a/abs/mv-core/local-website/contents/page_background.jpg
+++ /dev/null
diff --git a/abs/mv-core/local-website/contents/process.py b/abs/mv-core/local-website/contents/process.py
deleted file mode 100755
index 99404a4..0000000
--- a/abs/mv-core/local-website/contents/process.py
+++ /dev/null
@@ -1,329 +0,0 @@
-#!/usr/bin/python
-import sys
-import cgi
-import os
-import socket
-import time
-try:
-    import cgitb
-    cgitb.enable()
-except ImportError:
-    sys.stderr = sys.stdout
-def cgiprint(inline=''):
-    sys.stdout.write(inline)
-    sys.stdout.write('\r\n')
-    sys.stdout.flush()
-contentheader = 'Content-Type: text/html'
-
-thepage = '''<html><head>
-<title>%s</title>
-</head><body>
-%s
-</body></html>
-'''
-h1 = '<h1>%s</h1>'
-
-def getform(theform, valuelist, notpresent='', nolist=False):
-    """
-    This function, given a CGI form as a
-    FieldStorage instance, extracts the
-    data from it, based on valuelist
-    passed in. Any non-present values are
-    set to '' - although this can be
-    changed. (e.g. to return None so you
-    can test for missing keywords - where
-    '' is a valid answer but to have the
-    field missing isn't.) It also takes a
-    keyword argument 'nolist'. If this is
-    True list values only return their
-    first value.
-    """
-    data = {}
-    for field in valuelist:
-        if not theform.has_key(field):
-        #  if the field is not present (or was empty)
-            data[field] = notpresent
-        else:
-        # the field is present
-            print type(theform[field])
-            if  type(theform[field]) != type([]):
-            # is it a list or a single item
-                print type(theform[field])
-                data[field] = theform[field].value
-            else:
-                if not nolist:
-                # do we want a list ?
-                    data[field] = theform.getlist(field)
-                else:
-                    data[field] = theform.getfirst(field)
-                    # just fetch the first item
-    return data
-
-def getall(theform, nolist=False):
-    """
-    Passed a form (cgi.FieldStorage
-    instance) return *all* the values.
-    This doesn't take into account
-    multipart form data (file uploads).
-    It also takes a keyword argument
-    'nolist'. If this is True list values
-    only return their first value.
-    """
-    data = {}
-    for field in theform.keys():
-    # we can't just iterate over it, but must use the keys() method
-        if type(theform[field]) ==  type([]):
-            if not nolist:
-                data[field] = theform.getlist(field)
-            else:
-                data[field] = theform.getfirst(field)
-        else:
-            data[field] = theform[field].value
-    return data
-
-def isblank(indict):
-    """
-    Passed an indict of values it checks
-    if any of the values are set. Returns
-    True if the indict is empty, else
-    returns False. I use it on the a form
-    processed with getform to tell if my
-    CGI has been activated without any
-    form values.
-    """
-    for key in indict.keys():
-        if indict[key]:
-            return False
-    return True
-
-def go_backup(myhost):
-    myhostname = socket.gethostname()
-    if myhostname.strip() == myhost.strip():
-        command= "sudo /usr/bin/backup_job  "
-        command2="sleep 2; /data/srv/hobbit/server/ext/hbnotes.py"
-        results=os.popen(command,'r')
-        os.popen(command2,'r')
-    else:
-        sshcmd="ssh -o StrictHostKeyChecking=no -o ConnectTimeout=1 -i /data/srv/.nobody_ssh/id_dsa mythtv@"
-        sshcmd+=myhost.strip()
-        cmd=' "sudo /etc/cron.daily/backup_cron ; sudo su nobody -c /data/srv/hobbit/server/ext/hbnotes.py"'
-        command=sshcmd + cmd + " 2>&1 "
-        results=os.popen(command,'r')
-    return  results
-
-def go_restore(restorefile,myhost):
-    myhostname = socket.gethostname()
-    if myhostname.strip() == myhost.strip():
-        localcommand="sudo /usr/bin/restore_job.sh "
-        command= localcommand + restorefile
-    else:
-        sshcmd="ssh -o StrictHostKeyChecking=no -o ConnectTimeout=1 -i /data/srv/.nobody_ssh/id_dsa mythtv@"
-        sshcmd+=myhost.strip()
-        cmd=' "sudo /usr/bin/restore_job.sh   "   '
-        command=sshcmd + cmd + restorefile + " 2>&1 "
-
-    results=os.popen(command,'r')
-    return  results
-
-def go_optimize(myhost):
-    myhostname = socket.gethostname()
-    if myhostname.strip() == myhost.strip():
-       command="/usr/bin/optimize_mythdb.py"
-       results=os.popen(command,'r')
-    else:
-        results='oops'
-    return  results
-
-def go_update(myhost,update_type):
-    myhostname = socket.gethostname()
-    if myhostname.strip() == myhost.strip():
-         cmd="sudo /usr/bin/update_system "
-         command=cmd + update_type
-
-    else:
-        cmd=" call pacman update_system "
-        cmd+=update_type
-        command="sudo /usr/bin/func \"" + myhost.strip() + "*\"  " + cmd
-        print command
-
-        #print command
-
-    results=os.popen(command,'r')
-    return  results
-
-def go_updateall(allupdate_type):
-
-        cmd=" sudo /usr/bin/update_system_all "
-        cmd+=allupdate_type
-        command= cmd + " 2>&1 "
-        results=os.popen(command,'r')
-        return  results
-
-
-def go_shutdown(myhost):
-    myhostname = socket.gethostname()
-    if myhostname.strip() == myhost.strip():
-        message="Shutdown from MBE:::ALT"
-        os.system("/usr/bin/osdClient.pl  " + myhost.strip() + "  5000 " +  "\"" +  message + "\""   )
-        time.sleep(3)
-        command="sudo  /sbin/poweroff "
-    else:
-        command="sudo /usr/bin/func \"" + myhost.strip() +  "*\" call power poweroff "
-    message="Shutdown from MBE:::ALT"
-    os.system("/usr/bin/osdClient.pl  " + myhost.strip() + "  5000 " +  "\"" +  message + "\""   )
-    time.sleep(3)
-
-    results=os.popen(command,'r')
-    return  results
-
-def go_shutdownall():
-    import MySQLdb
-    #import mysql
-    #find all hosts(minus myself)
-    #loop through results shutdown as we go.
-    db = MySQLdb.connect(host="localhost", user="mythtv", passwd="mythtv", db="mythconverg")
-    # create a cursor
-    cursor = db.cursor()
-   # execute SQL statement
-    myhostname = socket.gethostname()
-    results=["Sent shutdown command to: \n "]
-    cursor.execute("SELECT distinct(hostname) from settings where not  hostname = %s ; ",(myhostname))
-    result = cursor.fetchall()
-
-    for row in result:
-         go_shutdown(row[0])
-         results.append(row[0])
-
-    #shutdown myself.
-    #go_shutdown(myhostname)
-    #results.append(myhostname)
-    return  results
-
-def go_reboot(myhost):
-    myhostname = socket.gethostname()
-    if myhostname.strip() == myhost.strip():
-        message="Reboot from MBE:::ALT"
-        os.system("/usr/bin/osdClient.pl  " + myhost.strip() + "  5000 " +  "\"" +  message + "\""   )
-        time.sleep(3)
-        command="sudo  /sbin/reboot "
-    else:
-        command="sudo /usr/bin/func \"" + myhost.strip() +  "*\ call power reboot "
-        message="Reboot from MBE:::ALT"
-        os.system("/usr/bin/osdClient.pl  " + myhost.strip() + "  5000 " +  "\"" +  message + "\""   )
-        time.sleep(3)
-    results=os.popen(command,'r')
-    return  results
-
-def go_wake(myhost):
-    command="/usr/bin/wakeonlan.sh " + myhost.strip()
-    results=os.popen(command,'r')
-    return  results
-
-def go_kill(myhost,kill_type):
-    myhostname = socket.gethostname()
-    if myhostname.strip() == myhost.strip():
-        if kill_type == "killX":
-            command="sudo /sbin/sv restart frontend"
-        else:
-            command="sudo /usr/bin/killall -9 mythfrontend"
-    else:
-        cmd=" call fe_restart "
-        cmd+=kill_type
-        command="sudo /usr/bin/func \"" + myhost.strip() + "*\"  " + cmd
-    #print command
-    results=os.popen(command,'r')
-    return  results
-
-
-mainpage = '''
- <html><head>
- <style type="text/css">@import "/frame.css";</style>
- <!--<meta http-equiv="refresh" content="6">-->
- <title>Receiving a Form</title>
- </head><body>%s</body></html>'''
-
-error = '''
-    <h1>Error</h1>
-    <h2>No Form Submission Was Received</h2>'''
-
-result = '''
-    <h1>%s of %s</h1>
-'''
-possible_parameters = ['param1', 'param2', 'param3', 'param4','hiddenparam','param5','param6']
-
-if __name__ == '__main__':
-    cgiprint(contentheader)   # content header
-    cgiprint()                # finish headers with blank line
-
-    theform = cgi.FieldStorage()
-    #print theform
-    formdict = getform(theform, possible_parameters)
-    #print possible_parameters
-
-    if isblank(formdict):
-        body = error
-    else:
-        name = formdict['param1']
-        radio = formdict['param2']  # should be 'this' or 'that'
-        if radio != 'Restore' :
-            name = ""
-        update_type = formdict['param3']
-        oldurl = formdict['param4']
-        hidden = formdict['hiddenparam']
-        all_update_type=formdict['param5']
-        kill_type = formdict['param6']
-        body = result % (radio, hidden)
-
-
-
-
-    print mainpage % body
-    selection=radio
-    myhost=hidden
-
-    if selection == "Restore":
-        mylogfile=go_restore(name,myhost)
-    elif selection == "Backup":
-        mylogfile=go_backup(myhost)
-    elif selection == "Update":
-        mylogfile=go_update(myhost,update_type)
-    elif selection == "Shutdown":
-        mylogfile=go_shutdown(myhost)
-    elif selection == "Reboot":
-        mylogfile=go_reboot(myhost)
-    elif selection == "Optimize":
-        mylogfile=go_optimize(myhost)
-    elif selection == "WOL":
-        mylogfile=go_wake(myhost)
-    elif selection == "UpdateAll":
-        mylogfile=go_updateall(all_update_type)
-    elif selection == "ShutdownAll":
-        mylogfile=go_shutdownall()
-    elif selection == "Kill":
-        mylogfile=go_kill(myhost,kill_type)
-
-    box='''
-     <div style="border: 1px solid #aaa; width:600px; height:500px; overflow:auto; color:#FFF;text-align:left;">
-         <code id="box" style="display: block; height: 500px; width: 600px; overflow: auto;">
-    '''
-
-    endbox='''
-         </code>
-     </div>
-    '''
-    javascript='''
-    <script type="text/javascript">
-        var objDiv = document.getElementById("box");
-        objDiv.scrollTop = objDiv.scrollHeight;
-    </script>
-     '''
-
-    print box
-    for line in mylogfile:
-        print line + '</br> \r\n'
-
-    print endbox
-    print '<a href=',  oldurl,     '  > Back </a> '
-    #print oldurl
-    print javascript
-
diff --git a/abs/mv-core/mediadirs/PKGBUILD b/abs/mv-core/mediadirs/PKGBUILD
deleted file mode 100644
index 7dc2dbc..0000000
--- a/abs/mv-core/mediadirs/PKGBUILD
+++ /dev/null
@@ -1,60 +0,0 @@
-pkgname=mediadirsetup
-pkgver=1
-pkgrel=14
-pkgdesc="creates the dir layout for mythtv to use"
-url=""
-license=""
-depends=()
-makedepends=()
-conflicts=()
-replaces=()
-backup=()
-install=mediadir.install
-provides=("mediadirsetup")
-source=()
-md5sums=()
-arch=('i686')
-
-build() {
-cd $startdir/src/
-mkdir -p  data/media/audio
-mkdir -p  data/media/images
-mkdir -p  data/media/games/snes
-mkdir -p  data/media/games/mame
-mkdir -p  data/media/games/nes
-
-mkdir -p  data/media/video/movies
-mkdir -p  data/media/video/recordings
-mkdir -p  data/media/removable/usbdisk
-mkdir -p  data/media/tmp
-mkdir -p  data/media/images/posters
-mkdir -p  data/var/cache/pacman/pkg
-mkdir -p  data/var/mirror
-mkdir -p  data/tmp
-mkdir -p  data/media/video/livetv
-
-
-touch   data/media/audio/.media
-touch    data/media/images/.media
-touch    data/media/video/movies/.media
-touch    data/media/video/recordings/.media
-touch    data/media/removable/usbdisk/.media
-touch    data/media/tmp/.media
-touch    data/media/images/posters/.media
-touch    data/var/cache/pacman/pkg/.media
-touch    data/var/mirror/.media
-touch    data/tmp/.media
-touch    data/media/video/livetv/.media
-touch    data/media/games/snes/.media
-touch    data/media/games/mame/.media
-touch    data/media/games/nes/.media
-
-
-cd data
-chown -R mythtv media
-chmod -R 777 media
-cd ..
-cp -rp data $startdir/pkg/
-cd $startdir/pkg
-ln -s data media 
-}
diff --git a/abs/mv-core/mediadirs/mediadir.install b/abs/mv-core/mediadirs/mediadir.install
deleted file mode 100644
index 009b071..0000000
--- a/abs/mv-core/mediadirs/mediadir.install
+++ /dev/null
@@ -1,43 +0,0 @@
-# This is a default template for a post-install scriptlet.  You can
-# remove any functions you don't need (and this header).
-
-# arg 1:  the new package version
-pre_install() {
-  /bin/true
-}
-
-# arg 1:  the new package version
-post_install() {
-  cd /
-  chown -R mythtv:users /data/media
-  ln -s /data/media  /media
-
-
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-pre_upgrade() {
-  /bin/true
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  depmod -A
-  /bin/true
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  /bin/true
-}
-
-# arg 1:  the old package version
-post_remove() {
-  /bin/true
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/mv-core/mp_all.sh b/abs/mv-core/mp_all.sh
deleted file mode 100644
index dd310fc..0000000
--- a/abs/mv-core/mp_all.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-pkgver=21228
-pkgrel=1
-
-# NOTE: Make sure to build and install mythtv first BEFORE building anything else
-buildlist=('mythtv' 'mytharchive' 'mythbrowser' 'mythflix' 'mythgallery' 'mythgame' 'mythmovies' 'mythmusic' 'mythnews' 'mythvideo' 'mythweather' 'mythzoneminder' 'mythweb' 'myththemes' 'morethemes')
-#buildlist=(mythtv-release-fixes Midnight-blue Midnight-wide MythVanage-mythmenu basic-amber basic-blue basic-green basic-purple basic-red  mytharchive mythbrowser mythcontrols mythflix mythgallery mythgame mythmovietime mythmusic mythnews mythphone mythsmolt mythtv-themes mythvideo mythweather mythweb syth-lacquer-clean syth-lacquer-wide)
-buildlist=(Midnight-blue Midnight-wide MythVanage-mythmenu basic-amber basic-blue basic-green basic-purple basic-red  mytharchive mythbrowser mythcontrols mythflix mythgallery mythgame mythmovietime mythmusic mythnews mythphone mythsmolt mythtv-themes mythvideo mythweather mythweb syth-lacquer-wide)
-buildlist=(MythVantage-config MythVantage-system certmaster confuse dnsmasq e16-myth-settings enlightenment evrouter func ghosd graphviz hobbit-client hobbitmon keylaunch lcdproc lighttpd local-website mediadirs mythdb-initial mythtv-status mythvantage-live ncid openssh runit-scripts-mv syslog-ng tilda webcal)
-# build and install
-for i in `echo ${buildlist[@]:0}`
-do
-	echo "---------- building $i ----------"
-	cd ./$i
-
-	# set svn version in the PKGBUILD
-#	sed -i s/^pkgver=.*/pkgver=$pkgver/ PKGBUILD
-#	sed -i s/^pkgrel=.*/pkgrel=$pkgrel/ PKGBUILD
-
-	# make the package
-	mp -sr --noconfirm  -f  --holdver || exit 1
-	pacman -Sy
-	# clean up afterwards
-	rm -rf pkg
-	rm -f *~
-
-	cd ..
-done
-
-echo ""
-echo "DONE!"
diff --git a/abs/mv-core/myth/stable/Midnight-blue/PKGBUILD b/abs/mv-core/myth/stable/Midnight-blue/PKGBUILD
deleted file mode 100755
index d5fe664..0000000
--- a/abs/mv-core/myth/stable/Midnight-blue/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-pkgname=Midnight-blue
-pkgver=21228
-pkgrel=1
-pkgdesc=""
-url=""
-license=""
-depends=()
-makedepends=()
-conflicts=()
-replaces=()
-backup=()
-source=(http://www.mythvantage.com/src/Midnight-blue.tgz)
-arch=i686
-md5sums=()
-
-build() {
-  cd $startdir/src
-  mkdir -p $startdir/pkg/usr/share/mythtv/themes
-  cp -rp $pkgname $startdir/pkg/usr/share/mythtv/themes/
-
-}
diff --git a/abs/mv-core/myth/stable/Midnight-wide/PKGBUILD b/abs/mv-core/myth/stable/Midnight-wide/PKGBUILD
deleted file mode 100755
index 13b0e6e..0000000
--- a/abs/mv-core/myth/stable/Midnight-wide/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-pkgname=Midnight-wide
-pkgver=21228
-pkgrel=1
-pkgdesc=""
-url=""
-license=""
-depends=()
-makedepends=()
-conflicts=()
-replaces=()
-backup=()
-source=(http://www.mythvantage.com/src/Midnight-wide.tgz)
-arch=i686
-md5sums=()
-
-build() {
-  cd $startdir/src
-  mkdir -p $startdir/pkg/usr/share/mythtv/themes
-  cp -rp $pkgname $startdir/pkg/usr/share/mythtv/themes/
-
-}
diff --git a/abs/mv-core/myth/stable/MythVanage-mythmenu/MythVantage-menu/HOST_SETTINGS.xml b/abs/mv-core/myth/stable/MythVanage-mythmenu/MythVantage-menu/HOST_SETTINGS.xml
deleted file mode 100755
index c9b7e20..0000000
--- a/abs/mv-core/myth/stable/MythVanage-mythmenu/MythVantage-menu/HOST_SETTINGS.xml
+++ /dev/null
@@ -1,71 +0,0 @@
-<mythmenu name="HOST_SETTINGS">
-
-   <button>
-       <type>MV_NETWORK_SETUP_MENU</type>
-      <text>Network Settings</text>
-      <action>EXEC  mythinstall -s network </action>
-   </button>
-
-   <button>
-       <type>MV_SYSTEM_SETUP_MENU</type>
-      <text>System type</text>
-        <action>EXEC  mythinstall -s hostype </action>
-   </button>
-
-   <button>
-       <type>MV_MISC_SETUP_MENU</type>
-      <text>Misc Settings</text>
-       <action>EXEC  mythinstall -s misc </action>
-   </button>
-
-   <button>
-       <type>MV_SOFTWARE_MENU</type>
-      <text>Software</text>
-       <action>EXEC  mythinstall -s  plugins </action>
-   </button>
-
-   <button>
-      <type>MV_SHUTDOWN_SETUP_MENU</type>
-      <text>Shutdown settings</text>
-        <action>EXEC  mythinstall -s sleep </action>
-   </button>
-
-
-<button>
-   <type>MV_ADVANCED_X_SETUP_MENU</type>
-    <text>Display</text>
-    <action>EXEC  mythinstall -s advancedX</action>
-</button>
-
-<button>
-   <type>MV_ADVANCED_SETUP_MENU</type>
-    <text>Advanced settings</text>
-    <action>EXEC  mythinstall -s advanced</action>
-</button>
-
-
-<button>
-       <type>MV_AUDIO_SETUP_MENU</type>
-       <text>Audio settings</text>
-        <action>EXEC  mythinstall -s sound </action>
-</button>
-
-
-<button>
-       <type>MV_ACCESS_SETUP_MENU</type>
-       <text>Access</text>
-       <action>EXEC  mythinstall -s accesscontrol </action>
-</button>
-   <!--
-   <button>
-       <type>SETUP_MENU</type>
-       <text>Settings profile manager</text>
-        <action>EXEC  mythinstall -t </action>
-
-   </button>
-   -->
-
-
-
-
-</mythmenu>
diff --git a/abs/mv-core/myth/stable/MythVanage-mythmenu/MythVantage-menu/util_menu.xml b/abs/mv-core/myth/stable/MythVanage-mythmenu/MythVantage-menu/util_menu.xml
deleted file mode 100644
index aeecbbb..0000000
--- a/abs/mv-core/myth/stable/MythVanage-mythmenu/MythVantage-menu/util_menu.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<mythmenu name="UTIL">
-
-   <button>
-      <type>MUSIC_PLAYLIST</type>
-      <text>Music Tools</text>
-      <text lang="IT">Opzioni Musica</text>
-      <text lang="DE">Musik verwalten</text>
-      <text lang="IS">Tónlistartól</text>
-      <text lang="NL">Muziek Beheren</text>
-      <text lang="SV">Musikverktyg</text>
-      <text lang="FR">Gestion Musiques</text>
-      <text lang="JA">ミュージックツール</text>
-      <text lang="FI">Musiikkityökalut</text>
-      <text lang="ZH_TW">音樂工具</text>
-      <text lang="SI">Glasbena orodja</text>
-      <text lang="ET">Muusikatööriistad</text>
-      <text lang="NB">Musikkverktøy</text>
-      <text lang="DK">Musikværktøjer</text>
-      <text lang="ES">Gestionar Música</text>
-      <text lang="PT">Gerir Música</text>
-      <text lang="CZ">Hudební nástroje</text>
-      <text lang="RU">Работа � музыкой</text>
-      <text lang="PL">Narzędzia muzyczne</text>
-      <text lang="HE">כלי מוסיקה</text>
-      <action>PLUGIN mythmusic</action>
-      <depends>mythmusic</depends>	
-   </button>
-
-   <button>
-      <type>VIDEO_MANAGER</type>
-      <text>Video Manager</text>
-      <text lang="IT">Gestione Video</text>
-      <text lang="ES">Gestionar Videos</text>
-      <text lang="CA">Gestionar vídeos</text>
-      <text lang="DK">Filmopsætning</text>
-      <text lang="DE">Videos verwalten</text>
-      <text lang="IS">Kvikmyndatól</text>
-      <text lang="PT">Gerir Filmes</text>
-      <text lang="SV">Filmhanterare</text>
-      <text lang="FR">Gestion Vidéos</text>
-      <text lang="NL">Films Beheren</text>
-      <text lang="JA">ビデオマ�ージャー</text>
-      <text lang="FI">Videonhallinta</text>
-      <text lang="ZH_TW">電影工具</text>
-      <text lang="SI">Video orodja</text>
-      <text lang="ET">Videohaldus</text>
-      <text lang="NB">Videobehandler</text>
-      <text lang="CZ">Manažer filmů</text>
-      <text lang="RU">Управление фильмами</text>
-      <text lang="PL">Zarządca Filmów</text>
-      <text lang="HE">מנהל ויד�ו</text>
-      <action>JUMP Video Manager</action>
-      <depends>mythvideo</depends>
-   </button>
-    
-   <button>
-      <type>SETUP_KEYS</type>
-      <text>Edit Keys</text>
-      <text lang="IT">Modifica Tasti</text>
-      <text lang="FR">Configurer les touches</text>
-      <text lang="IS">Stilla takka</text>
-      <text lang="DE">Tastenbelegung ändern</text>
-      <text lang="FI">Muokkaa Näppäimiä</text>
-      <text lang="DK">Redigér tasteindstillinger</text>
-      <text lang="SV">Ändra knappar</text>
-      <text lang="ES">Editar Teclas</text>
-      <text lang="PT">Configurar Teclas</text>
-      <text lang="ET">Klahvide muutmine</text>
-      <text lang="NL">Toetsen Aanpassen</text>
-      <text lang="CZ">Editovat klávesy</text>
-      <text lang="JA">キー設定</text>
-      <text lang="RU">Редактировать клавиши</text>
-      <text lang="SI">Urejanje tipk</text>
-      <text lang="PL">Edytuj klawisze</text>
-      <text lang="HE">עריכת מקשי�</text>
-      <action>PLUGIN mythcontrols</action>
-      <depends>mythcontrols</depends>	
-   </button>
-      
-   <button>
-      <type>SETUP_MENU</type>
-      <text>Setup</text>
-      <text lang="IT">Impostazioni</text>
-      <text lang="ES">Configurar</text>
-      <text lang="CA">Configurar</text>
-      <text lang="FR">Paramètres</text>
-      <text lang="DE">Konfiguration</text>
-      <text lang="DK">Indstillinger</text>
-      <text lang="IS">Stillingar</text>
-      <text lang="NL">Configuratie</text>
-      <text lang="PT">Configurações</text>
-      <text lang="SV">Inställningar</text>
-      <text lang="JA">設定</text>
-      <text lang="FI">Asetukset</text>
-      <text lang="ZH_TW">設定</text>
-      <text lang="SI">Nastavitve</text>
-      <text lang="ET">Sätted</text>
-      <text lang="NB">Innstillinger</text>
-      <text lang="CZ">Nastavení</text>
-      <text lang="RU">�а�тройки</text>
-      <text lang="PL">Ustawienia</text>
-      <text lang="HE">הגדרה</text>
-      <action>MENU main_settings.xml</action>
-   </button>
-   <button>
-       <type>MV_SETUP_MENU</type>
-       <text>MythVantage Settings</text>
-       <action>MENU HOST_SETTINGS.xml</action>
-
-   </button>
-
-   <button>
-       <type>MV_TEMPLATE</type>
-       <text>Settings profile manager</text>
-        <action>EXEC  mythinstall -t </action>
-
-   </button>
-
-
-
-</mythmenu>
diff --git a/abs/mv-core/myth/stable/MythVanage-mythmenu/MythVantage-menu/util_menu.xml.mv b/abs/mv-core/myth/stable/MythVanage-mythmenu/MythVantage-menu/util_menu.xml.mv
deleted file mode 100755
index 4a94303..0000000
--- a/abs/mv-core/myth/stable/MythVanage-mythmenu/MythVantage-menu/util_menu.xml.mv
+++ /dev/null
@@ -1,106 +0,0 @@
-<mythmenu name="UTIL">
-
-   <button>
-      <type>MUSIC_PLAYLIST</type>
-      <text>Music Tools</text>
-      <text lang="DE">Musik verwalten</text>
-      <text lang="IS">Tónlistartól</text>
-      <text lang="NL">Muziek Beheren</text>
-      <text lang="SV">Musikverktyg</text>
-      <text lang="FR">Musiques</text>
-      <text lang="JA">ミュージックツール</text>
-      <text lang="FI">Musiikkityökalut</text>
-      <text lang="ZH_TW">音樂工具</text>
-      <text lang="SI">Glasbena orodja</text>
-      <text lang="ET">Muusikatööriistad</text>
-      <text lang="NB">Musikkverktøy</text>
-      <text lang="DK">Musikværktøjer</text>
-      <text lang="ES">Gestionar Música</text>
-      <text lang="PT">Gerir Música</text>
-      <text lang="CZ">Hudební nástroje</text>
-      <text lang="RU">Работа � музыкой</text>
-      <action>PLUGIN mythmusic</action>
-      <depends>mythmusic</depends>	
-   </button>
-
-   <button>
-      <type>VIDEO_MANAGER</type>
-      <text>Video Manager</text>
-      <text lang="ES">Gestionar Videos</text>
-      <text lang="CA">Gestionar vídeos</text>
-      <text lang="DK">Filmopsætning</text>
-      <text lang="DE">Videos verwalten</text>
-      <text lang="IS">Kvikmyndatól</text>
-      <text lang="PT">Gerir Filmes</text>
-      <text lang="SV">Filmhanterare</text>
-      <text lang="FR">Vidéos</text>
-      <text lang="NL">Films Beheren</text>
-      <text lang="JA">ビデオマ�ージャー</text>
-      <text lang="FI">Videonhallinta</text>
-      <text lang="ZH_TW">電影工具</text>
-      <text lang="SI">Video manager</text>
-      <text lang="ET">Videohaldus</text>
-      <text lang="NB">Videobehandler</text>
-      <text lang="CZ">Manažer filmů</text>
-      <text lang="RU">Управление фильмами</text>
-      <action>JUMP Video Manager</action>
-      <depends>mythvideo</depends>
-   </button>
-    
-   <button>
-      <type>SETUP_KEYS</type>
-      <text>Edit Keys</text>
-      <text lang="FR">Configurer les touches</text>
-      <text lang="IS">Stilla takka</text>
-      <text lang="DE">Tastenbelegung ändern</text>
-      <text lang="FI">Muokkaa Näppäimiä</text>
-      <text lang="DK">Redigér tasteindstillinger</text>
-      <text lang="SV">Ändra knappar</text>
-      <text lang="ES">Editar Teclas</text>
-      <text lang="PT">Configurar Teclas</text>
-      <text lang="ET">Klahvide muutmine</text>
-      <text lang="NL">Toetsen Aanpassen</text>
-      <text lang="CZ">Editovat klávesy</text>
-      <text lang="JA">キー設定</text>
-      <text lang="RU">Редактировать клавиши</text>
-      <action>PLUGIN mythcontrols</action>
-      <depends>mythcontrols</depends>	
-   </button>
-      
-   <button>
-      <type>SETUP_MENU</type>
-      <text>Setup</text>
-      <text lang="IT">Impostazioni</text>
-      <text lang="ES">Configurar</text>
-      <text lang="CA">Configurar</text>
-      <text lang="FR">Configuration</text>
-      <text lang="DE">Konfiguration</text>
-      <text lang="DK">Indstillinger</text>
-      <text lang="IS">Stillingar</text>
-      <text lang="NL">Configuratie</text>
-      <text lang="PT">Configurações</text>
-      <text lang="SV">Inställningar</text>
-      <text lang="JA">設定</text>
-      <text lang="FI">Asetukset</text>
-      <text lang="ZH_TW">設定</text>
-      <text lang="SI">Nastavitve</text>
-      <text lang="ET">Sätted</text>
-      <text lang="NB">Innstillinger</text>
-      <text lang="CZ">Nastavení</text>
-      <text lang="RU">�а�тройки</text>
-      <action>MENU main_settings.xml</action>
-   </button>
-   <button>
-       <type>MV_SETUP_MENU</type>
-       <text>MythVantage Settings</text>
-       <action>MENU HOST_SETTINGS.xml</action>
-
-   </button>
-
-   <button>
-       <type>MV_TEMPLATE</type>
-       <text>Settings profile manager</text>
-        <action>EXEC  mythinstall -t </action>
-
-   </button>
-</mythmenu>
diff --git a/abs/mv-core/myth/stable/MythVanage-mythmenu/PKGBUILD b/abs/mv-core/myth/stable/MythVanage-mythmenu/PKGBUILD
deleted file mode 100755
index e03f7a6..0000000
--- a/abs/mv-core/myth/stable/MythVanage-mythmenu/PKGBUILD
+++ /dev/null
@@ -1,15 +0,0 @@
-pkgname=MythVantage-mythmenu
-pkgver=21228
-pkgrel=1
-pkgdesc="Myth menu with MythVantage settings"
-#depends=( mythtv-svn )
-source=()
-arch=('i686')
-build() {
-        cd $startdir/src
-        rsync -a --exclude=.svn $startdir/MythVantage-menu .
-        mkdir -p  -m 755 $startdir/pkg/usr/share/mythtv/themes
-        cp -rp MythVantage-menu $startdir/pkg/usr/share/mythtv/themes
-
-}
-
diff --git a/abs/mv-core/myth/stable/basic-amber/PKGBUILD b/abs/mv-core/myth/stable/basic-amber/PKGBUILD
deleted file mode 100755
index 7568b16..0000000
--- a/abs/mv-core/myth/stable/basic-amber/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-pkgname=basic-amber
-pkgver=21228
-pkgrel=1
-pkgdesc=""
-url=""
-license=""
-depends=()
-makedepends=()
-conflicts=()
-replaces=()
-backup=()
-source=(http://www.mythvantage.com/src/basic-amber.tgz)
-md5sums=()
-arch=('i686')
-build() {
-  cd $startdir/src
-  mkdir -p $startdir/pkg/usr/share/mythtv/themes
-  cp -rp $pkgname $startdir/pkg/usr/share/mythtv/themes/
-
-}
diff --git a/abs/mv-core/myth/stable/basic-blue/PKGBUILD b/abs/mv-core/myth/stable/basic-blue/PKGBUILD
deleted file mode 100755
index 0e1df75..0000000
--- a/abs/mv-core/myth/stable/basic-blue/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-pkgname=basic-blue
-pkgver=21228
-pkgrel=1
-pkgdesc=""
-url=""
-license=""
-depends=()
-makedepends=()
-conflicts=()
-replaces=()
-backup=()
-source=(http://www.mythvantage.com/src/basic-blue.tgz)
-md5sums=()
-arch=('i686')
-build() {
-  cd $startdir/src
-  mkdir -p $startdir/pkg/usr/share/mythtv/themes
-  #cp -rp $pkgname $startdir/pkg/usr/local/share/mythtv/themes/
-  rsync -a --exclude=.svn $pkgname $startdir/pkg/usr/share/mythtv/themes/
-}
diff --git a/abs/mv-core/myth/stable/basic-green/PKGBUILD b/abs/mv-core/myth/stable/basic-green/PKGBUILD
deleted file mode 100755
index e0867f5..0000000
--- a/abs/mv-core/myth/stable/basic-green/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-pkgname=basic-green
-pkgver=21228
-pkgrel=1
-pkgdesc=""
-url=""
-license=""
-depends=()
-makedepends=()
-conflicts=()
-replaces=()
-backup=()
-source=(http://www.mythvantage.com/src/basic-green.tgz)
-md5sums=()
-arch=('i686')
-build() {
-  cd $startdir/src
-  mkdir -p $startdir/pkg/usr/share/mythtv/themes
-  cp -rp $pkgname $startdir/pkg/usr/share/mythtv/themes/
-
-}
diff --git a/abs/mv-core/myth/stable/basic-purple/PKGBUILD b/abs/mv-core/myth/stable/basic-purple/PKGBUILD
deleted file mode 100755
index 8c470d0..0000000
--- a/abs/mv-core/myth/stable/basic-purple/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-pkgname=basic-purple
-pkgver=21228
-pkgrel=1
-pkgdesc=""
-url=""
-license=""
-depends=()
-makedepends=()
-conflicts=()
-replaces=()
-backup=()
-source=(http://www.mythvantage.com/src/basic-purple.tgz)
-md5sums=()
-arch=('i686')
-build() {
-  cd $startdir/src
-  mkdir -p $startdir/pkg/usr/share/mythtv/themes
-  cp -rp $pkgname $startdir/pkg/usr/share/mythtv/themes/
-
-}
diff --git a/abs/mv-core/myth/stable/basic-red/PKGBUILD b/abs/mv-core/myth/stable/basic-red/PKGBUILD
deleted file mode 100755
index 2815672..0000000
--- a/abs/mv-core/myth/stable/basic-red/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-pkgname=basic-red
-pkgver=21228
-pkgrel=1
-pkgdesc=""
-url=""
-license=""
-depends=()
-makedepends=()
-conflicts=()
-replaces=()
-backup=()
-source=(http://www.mythvantage.com/src/basic-red.tgz)
-md5sums=()
-arch=('i686')
-build() {
-  cd $startdir/src
-  mkdir -p $startdir/pkg/usr/share/mythtv/themes
-  cp -rp $pkgname $startdir/pkg/usr/share/mythtv/themes/
-
-}
diff --git a/abs/mv-core/myth/stable/mp_all.sh b/abs/mv-core/myth/stable/mp_all.sh
deleted file mode 100644
index ef6aea8..0000000
--- a/abs/mv-core/myth/stable/mp_all.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-pkgver=21228
-pkgrel=1
-
-# NOTE: Make sure to build and install mythtv first BEFORE building anything else
-buildlist=('mythtv' 'mytharchive' 'mythbrowser' 'mythflix' 'mythgallery' 'mythgame' 'mythmovies' 'mythmusic' 'mythnews' 'mythvideo' 'mythweather' 'mythzoneminder' 'mythweb' 'myththemes' 'morethemes')
-#buildlist=(mythtv-release-fixes Midnight-blue Midnight-wide MythVanage-mythmenu basic-amber basic-blue basic-green basic-purple basic-red  mytharchive mythbrowser mythcontrols mythflix mythgallery mythgame mythmovietime mythmusic mythnews mythphone mythsmolt mythtv-themes mythvideo mythweather mythweb syth-lacquer-clean syth-lacquer-wide)
-buildlist=(Midnight-blue Midnight-wide MythVanage-mythmenu basic-amber basic-blue basic-green basic-purple basic-red  mytharchive mythbrowser mythcontrols mythflix mythgallery mythgame mythmovietime mythmusic mythnews mythphone mythsmolt mythtv-themes mythvideo mythweather mythweb syth-lacquer-wide)
-# build and install
-for i in `echo ${buildlist[@]:0}`
-do
-	echo "---------- building $i ----------"
-	cd ./$i
-
-	# set svn version in the PKGBUILD
-	sed -i s/^pkgver=.*/pkgver=$pkgver/ PKGBUILD
-	sed -i s/^pkgrel=.*/pkgrel=$pkgrel/ PKGBUILD
-
-	# make the package
-	mp -sr --noconfirm  -f -i --holdver || exit 1
-
-	# clean up afterwards
-	rm -rf pkg
-	rm -f *~
-
-	cd ..
-done
-
-echo ""
-echo "DONE!"
diff --git a/abs/mv-core/myth/stable/mytharchive/PKGBUILD b/abs/mv-core/myth/stable/mytharchive/PKGBUILD
deleted file mode 100644
index 16e4ce9..0000000
--- a/abs/mv-core/myth/stable/mytharchive/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-pkgname=mytharchive-release-fixes
-pkgver=21228
-pkgrel=1
-pkgdesc="MythTV plugin that lets you create DVDs from or archive your recorded shows."
-arch=('i686')
-url="http://www.mythtv.org"
-license=('GPL')
-depends=('mythtv-release-fixes' 'libxmu' 'mysql-python' 'pil' 'dvdauthor' 'cdrkit' 'dvd+rw-tools' 'mjpegtools' 'transcode' )
-source=()
-groups=('mythtv-all-plugins-release-fixes')
-#_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins
-_svntrunk=http://svn.mythtv.org/svn/branches/release-0-21-fixes/mythplugins
-_svnmod=mythplugins
-
-
-build() {
-   	PLUGIN=mytharchive
-   	cd $startdir/src/
-   	svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
-   	cd $startdir/src/mythplugins
-
-   	PLUGIN=mytharchive
-   	grep -q  programs-libs.pro  $PLUGIN/$PLUGIN/$PLUGIN.pro
-	if [ $? != 0 ]
-	then
-		echo "include ( ../../programs-libs.pro )" >> $PLUGIN/$PLUGIN/$PLUGIN.pro
-		msg "appending program lib"
-	fi
-	msg "Correcting configure    kde3 to kde"
-	 sed -i 's#kde3#kde#' configure || return 1
-	make distclean
-   	./configure  --prefix=/usr --enable-opengl --disable-all   --enable-create-archive --enable-create-dvd --enable-mytharchive || return 1
-	qmake mythplugins.pro || return 1
-	make qmake || return 1
-	msg "Correcting Makefile    kde3 to kde"
-	sed -i 's#kde3#kde#' ./mytharchive/mytharchive/Makefile || return 1
-   	make -j 2 || return 1
-	make INSTALL_ROOT=$startdir/pkg install
-}
-
-
diff --git a/abs/mv-core/myth/stable/mythbrowser/PKGBUILD b/abs/mv-core/myth/stable/mythbrowser/PKGBUILD
deleted file mode 100644
index 674536e..0000000
--- a/abs/mv-core/myth/stable/mythbrowser/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-
-pkgname=mythbrowser-release-fixes
-pkgver=21228
-pkgrel=1
-pkgdesc="Mini web browser for MythTV"
-url="http://www.mythtv.org"
-arch=('i686')
-depends=('mythtv-release-fixes' 'wget' 'libxvmc' 'kdelibs3')
-conflicts=('mythtv-plugins-release-fixes')
-groups=('mythtv-all-plugins-release-fixes')
-license="GPL"
-source=()
-_svntrunk=http://svn.mythtv.org/svn/branches/release-0-21-fixes/mythplugins
-_svnmod=mythplugins
-build() {
-   cd $startdir/src/
-	echo svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
- 	svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
-   cd $startdir/src/mythplugins
-   pwd
-   PLUGIN=mythbrowser
-   grep -q  programs-libs.pro  $PLUGIN/$PLUGIN/$PLUGIN.pro
-   if [ $? != 0 ]
-   then
-	   	echo "include ( ../../programs-libs.pro )" >> $PLUGIN/$PLUGIN/$PLUGIN.pro
-			msg "appending program lib"
-		fi
-	make distclean
-   ./configure --prefix=/usr  --enable-opengl --disable-all --enable-mythbrowser || return 1
- #  sed -i 's#kde3#kde#' ./mythbrowser/mythbrowser/Makefile || return 1
-   make || return 1
-
-   make INSTALL_ROOT=$startdir/pkg install
-}
diff --git a/abs/mv-core/myth/stable/mythcontrols/PKGBUILD b/abs/mv-core/myth/stable/mythcontrols/PKGBUILD
deleted file mode 100644
index 5fe329b..0000000
--- a/abs/mv-core/myth/stable/mythcontrols/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-pkgname=mythcontrols-release-fixes
-pkgver=21228
-pkgrel=1
-pkgdesc="Experimental controls for MythTV"
-url="http://www.mythtv.org"
-arch=('i686')
-depends=('mythtv'-release-fixes)
-conflicts=('mythtv-plugins-release-fixes')
-groups=('mythtv-all-plugins-release-fixes')
-license="GPL"
-source=()
-_svntrunk=http://svn.mythtv.org/svn/branches/release-0-21-fixes/mythplugins
-_svntrunk=http://svn.mythtv.org/svn/branches/release-0-21-fixes/mythplugins
-_svnmod=mythplugins
-
-
-build() {
-	cd $startdir/src/
-	echo svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
- 	svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
-	cd $startdir/src/mythplugins
-PLUGIN=mythcontrols
-grep -q  programs-libs.pro  $PLUGIN/$PLUGIN/$PLUGIN.pro
-if [ $? != 0 ]
-then
-		echo "include ( ../../programs-libs.pro )" >> $PLUGIN/$PLUGIN/$PLUGIN.pro
-			msg "appending program lib"
-		fi
-	make distclean
-   ./configure  --disable-all --enable-opengl --enable-mythcontrols --prefix=/usr
-
-   make -j 2 || return 1
-
-   make INSTALL_ROOT=$startdir/pkg install
-}
-
diff --git a/abs/mv-core/myth/stable/mythflix/PKGBUILD b/abs/mv-core/myth/stable/mythflix/PKGBUILD
deleted file mode 100644
index a417a28..0000000
--- a/abs/mv-core/myth/stable/mythflix/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-pkgname=mythflix-release-fixes
-pkgver=21228
-pkgrel=1
-pkgdesc="Netflix access plugin for MythTV"
-url="http://www.mythtv.org"
-arch=('i686')
-depends=('mythtv-release-fixes')
-conflicts=('mythtv-plugins-release-fixes')
-groups=('mythtv-all-plugins-release-fixes')
-license="GPL"
-source=()
-#_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins
-_svntrunk=http://svn.mythtv.org/svn/branches/release-0-21-fixes/mythplugins
-
-_svntrunk=http://svn.mythtv.org/svn/branches/release-0-21-fixes/mythplugins
-_svnmod=mythplugins
-
-build() {
-	cd $startdir/src/
-	echo svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
- 	svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
-	cd $startdir/src/mythplugins
-	PLUGIN=mythflix
-	grep -q  programs-libs.pro  $PLUGIN/$PLUGIN/$PLUGIN.pro
-	if [ $? != 0 ]
-	then
-			echo "include ( ../../programs-libs.pro )" >> $PLUGIN/$PLUGIN/$PLUGIN.pro
-				msg "appending program lib"
-			fi
-	make distclean
-   ./configure --prefix=/usr  --disable-all --enable-opengl --enable-mythflix 
-
-   make -j 2 || return 1
-
-   make INSTALL_ROOT=$startdir/pkg install
-}
diff --git a/abs/mv-core/myth/stable/mythgallery/PKGBUILD b/abs/mv-core/myth/stable/mythgallery/PKGBUILD
deleted file mode 100644
index 9ca81ff..0000000
--- a/abs/mv-core/myth/stable/mythgallery/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-pkgname=mythgallery-release-fixes
-pkgver=21228
-pkgrel=1
-pkgdesc="Image gallery plugin for MythTV"
-url="http://www.mythtv.org"
-arch=('i686')
-depends=('mythtv-release-fixes' 'libexif' 'libtiff')
-conflicts=('mythtv-plugins-release-fixes')
-groups=('mythtv-all-plugins-release-fixes')
-license="GPL"
-source=()
-_svntrunk=http://svn.mythtv.org/svn/branches/release-0-21-fixes/mythplugins
-_svntrunk=http://svn.mythtv.org/svn/branches/release-0-21-fixes/mythplugins
-_svnmod=mythplugins
-
-build() {
-	cd $startdir/src/
-	echo svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
- 	svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
-	cd $startdir/src/mythplugins
-	export QMAKESPEC='linux-g++'
-	PLUGIN=mythgallery
-	grep -q  programs-libs.pro  $PLUGIN/$PLUGIN/$PLUGIN.pro
-	if [ $? != 0 ]
-	then
-			echo "include ( ../../programs-libs.pro )" >> $PLUGIN/$PLUGIN/$PLUGIN.pro
-				msg "appending program lib"
-			fi
-	make distclean
-   ./configure  --prefix=/usr --disable-all --enable-opengl --enable-mythgallery --enable-exif
-
-   make -j 2 || return 1
-
-   make INSTALL_ROOT=$startdir/pkg install
-}
-
diff --git a/abs/mv-core/myth/stable/mythgame/PKGBUILD b/abs/mv-core/myth/stable/mythgame/PKGBUILD
deleted file mode 100644
index 2dc412a..0000000
--- a/abs/mv-core/myth/stable/mythgame/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-pkgname=mythgame-release-fixes
-pkgver=21228
-pkgrel=1
-pkgdesc="Emulation plugin for MythTV"
-url="http://www.mythtv.org"
-arch=('i686')
-depends=('mythtv-release-fixes' 'zlib')
-conflicts=('mythtv-plugins-release-fixes')
-groups=('mythtv-all-plugins-release-fixes')
-license="GPL"
-source=()
-_svntrunk=http://svn.mythtv.org/svn/branches/release-0-21-fixes/mythplugins
-_svntrunk=http://svn.mythtv.org/svn/branches/release-0-21-fixes/mythplugins
-_svnmod=mythplugins
-
-build() {
-	cd $startdir/src/
-	echo svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
- 	svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
-	cd $startdir/src/mythplugins
-PLUGIN=mythgame
-grep -q  programs-libs.pro  $PLUGIN/$PLUGIN/$PLUGIN.pro
-if [ $? != 0 ]
-then
-		echo "include ( ../../programs-libs.pro )" >> $PLUGIN/$PLUGIN/$PLUGIN.pro
-		msg	 "appending program lib"
-		fi
-	export QMAKESPEC='linux-g++'
-	make distclean
-   ./configure  --disable-all --enable-opengl --enable-mythgame --prefix=/usr
-
-   make -j 2 || return 1
-
-   make INSTALL_ROOT=$startdir/pkg install
-}
-
diff --git a/abs/mv-core/myth/stable/mythmovietime/PKGBUILD b/abs/mv-core/myth/stable/mythmovietime/PKGBUILD
deleted file mode 100644
index 6a5ae8f..0000000
--- a/abs/mv-core/myth/stable/mythmovietime/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-pkgname=mythmovietime-release-fixes
-pkgver=21228
-pkgrel=1
-pkgdesc="Emulation plugin for MythTV"
-url="http://www.mythtv.org"
-arch=('i686')
-depends=('mythtv-release-fixes' 'zlib')
-conflicts=('mythtv-plugins-release-fixes')
-groups=('mythtv-all-plugins-release-fixes')
-license="GPL"
-source=()
-_svntrunk=http://svn.mythtv.org/svn/branches/release-0-21-fixes/mythplugins
-_svnmod=mythplugins
-
-build() {
-	cd $startdir/src/
-	echo svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
- 	svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
-	cd $startdir/src/mythplugins
-PLUGIN=mythmovietime
-grep -q  programs-libs.pro  $PLUGIN/$PLUGIN/$PLUGIN.pro
-if [ $? != 0 ]
-then
-		echo "include ( ../../programs-libs.pro )" >> $PLUGIN/$PLUGIN/$PLUGIN.pro
-			msg "appending program lib"
-		fi
-	export QMAKESPEC='linux-g++'
-	make distclean
-   ./configure  --prefix=/usr --disable-all --enable-mythmovies 
-
-   make -j 2 || return 1
-
-   make INSTALL_ROOT=$startdir/pkg install
-}
-
diff --git a/abs/mv-core/myth/stable/mythmusic/PKGBUILD b/abs/mv-core/myth/stable/mythmusic/PKGBUILD
deleted file mode 100644
index 0617b0b..0000000
--- a/abs/mv-core/myth/stable/mythmusic/PKGBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-pkgname=mythmusic-release-fixes
-pkgver=21228
-pkgrel=1
-pkgdesc="Music playing plugin for MythTV"
-url="http://www.mythtv.org"
-arch=('i686' 'x86_64')
-
-
-depends=("mythtv-release-fixes>=${pkgver}" 'libid3tag' 'libmad' 'libvorbis' 'flac>=1.1.4' 'libcdaudio' \
-         'cdparanoia' 'fftw2' 'sdl' 'faad2>=2.6.1' 'lame' 'taglib' \
-	 	 'libvisual-plugins' 'libvisual-projectm')
-
-conflicts=('mythtv-plugins-release-fixes')
-groups=('mythtv-all-plugins-release-fixes')
-license="GPL"
-source=()
-_svntrunk=http://svn.mythtv.org/svn/branches/release-0-21-fixes/mythplugins
-_svnmod=mythplugins
-
-build() {
-	cd $startdir/src/
-	make distclean
-	echo svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
- 	svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
-	cd $startdir/src/mythplugins/mythmusic
-#	patch -p1 < ../../gcc4.3.patch
-	cd $startdir/src/mythplugins
-     ./configure  --disable-all --enable-mythmusic --enable-fftw --enable-sdl --disable-aac --enable-opengl --prefix=/usr
-	PLUGIN=mythmusic
-	grep -q  programs-libs.pro  $PLUGIN/$PLUGIN/$PLUGIN.pro
-	if [ $? != 0 ]
-	then
-		echo "include ( ../../programs-libs.pro )" >> $PLUGIN/$PLUGIN/$PLUGIN.pro
-			msg "appending program lib"
-	fi
-
-   make  || return 1
-   make INSTALL_ROOT=$startdir/pkg install
-}
diff --git a/abs/mv-core/myth/stable/mythmusic/music_flac.patch b/abs/mv-core/myth/stable/mythmusic/music_flac.patch
deleted file mode 100644
index b152249..0000000
--- a/abs/mv-core/myth/stable/mythmusic/music_flac.patch
+++ /dev/null
@@ -1,293 +0,0 @@
---- flacdecoder.cpp.old	2007-03-11 18:14:37.000000000 -0400
-+++ flacdecoder.cpp	2007-03-11 18:15:34.000000000 -0400
-@@ -17,7 +17,7 @@
- 
- #include <qtimer.h>
- 
--static FLAC__SeekableStreamDecoderReadStatus flacread(const FLAC__SeekableStreamDecoder *decoder, FLAC__byte bufferp[], unsigned *bytes, void *client_data)
-+static FLAC__StreamDecoderReadStatus flacread(const FLAC__StreamDecoder *decoder, FLAC__byte bufferp[], unsigned *bytes, void *client_data)
- {
-     decoder = decoder;
- 
-@@ -26,27 +26,27 @@
- 
-     if (len == -1)
-     {
--        return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_ERROR;
-+        return FLAC__STREAM_DECODER_READ_STATUS_END_OF_STREAM;
-     }
-    
-     *bytes = len;
--    return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_OK;
-+    return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE;
- }
- 
--static FLAC__SeekableStreamDecoderSeekStatus flacseek(const FLAC__SeekableStreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data) 
-+static FLAC__StreamDecoderSeekStatus flacseek(const FLAC__StreamDecoder *decoder, FLAC__uint64 absolute_byte_offset, void *client_data) 
- {
-     decoder = decoder;
-     FlacDecoder *dflac = (FlacDecoder *)client_data;
- 
-     if (!dflac->input()->isDirectAccess())
--        return FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_ERROR;
-+        return FLAC__STREAM_DECODER_SEEK_STATUS_ERROR;
- 
-     if (dflac->input()->at(absolute_byte_offset))
--        return FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_OK;
--    return FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_ERROR;
-+        return FLAC__STREAM_DECODER_SEEK_STATUS_OK;
-+    return FLAC__STREAM_DECODER_SEEK_STATUS_ERROR;
- }
- 
--static FLAC__SeekableStreamDecoderTellStatus flactell(const FLAC__SeekableStreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data)
-+static FLAC__StreamDecoderTellStatus flactell(const FLAC__StreamDecoder *decoder, FLAC__uint64 *absolute_byte_offset, void *client_data)
- {
-     decoder = decoder;
-     FlacDecoder *dflac = (FlacDecoder *)client_data;
-@@ -54,20 +54,20 @@
-     long t = dflac->input()->at();
-     *absolute_byte_offset = t;
- 
--    return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_OK;
-+    return FLAC__STREAM_DECODER_TELL_STATUS_OK;
- }
- 
--static FLAC__SeekableStreamDecoderLengthStatus flaclength(const FLAC__SeekableStreamDecoder *decoder, FLAC__uint64 *stream_length, void *client_data)
-+static FLAC__StreamDecoderLengthStatus flaclength(const FLAC__StreamDecoder *decoder, FLAC__uint64 *stream_length, void *client_data)
- {
-     decoder = decoder;
- 
-     FlacDecoder *dflac = (FlacDecoder *)client_data;
- 
-     *stream_length = dflac->input()->size();
--    return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_OK;
-+    return FLAC__STREAM_DECODER_LENGTH_STATUS_OK;
- }
- 
--static FLAC__bool flaceof(const FLAC__SeekableStreamDecoder *decoder, void *client_data)
-+static FLAC__bool flaceof(const FLAC__StreamDecoder *decoder, void *client_data)
- {
-     decoder = decoder;
- 
-@@ -76,7 +76,7 @@
-     return dflac->input()->atEnd();
- }
- 
--static FLAC__StreamDecoderWriteStatus flacwrite(const FLAC__SeekableStreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
-+static FLAC__StreamDecoderWriteStatus flacwrite(const FLAC__StreamDecoder *decoder, const FLAC__Frame *frame, const FLAC__int32 * const buffer[], void *client_data)
- {
-     decoder = decoder;
- 
-@@ -132,7 +132,7 @@
-     }
- }
- 
--static void flacmetadata(const FLAC__SeekableStreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
-+static void flacmetadata(const FLAC__StreamDecoder *decoder, const FLAC__StreamMetadata *metadata, void *client_data)
- {
-     decoder = decoder;
- 
-@@ -156,11 +156,11 @@
-     }
- }
- 
--static void flacerror(const FLAC__SeekableStreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
-+static void flacerror(const FLAC__StreamDecoder *decoder, FLAC__StreamDecoderErrorStatus status, void *client_data)
- {
-     decoder = decoder;
- 
--    FLAC__FileDecoder *file_decoder = (FLAC__FileDecoder *)client_data;
-+    FLAC__StreamDecoder *file_decoder = (FLAC__StreamDecoder *)client_data;
- 
-     file_decoder = file_decoder;
-     status = status;
-@@ -262,17 +262,8 @@
-         }
-     }
- 
--    decoder = FLAC__seekable_stream_decoder_new();
--    FLAC__seekable_stream_decoder_set_md5_checking(decoder, false);
--    FLAC__seekable_stream_decoder_set_read_callback(decoder, flacread);
--    FLAC__seekable_stream_decoder_set_seek_callback(decoder, flacseek);
--    FLAC__seekable_stream_decoder_set_tell_callback(decoder, flactell);
--    FLAC__seekable_stream_decoder_set_length_callback(decoder, flaclength);
--    FLAC__seekable_stream_decoder_set_eof_callback(decoder, flaceof);
--    FLAC__seekable_stream_decoder_set_write_callback(decoder, flacwrite);
--    FLAC__seekable_stream_decoder_set_metadata_callback(decoder, flacmetadata);
--    FLAC__seekable_stream_decoder_set_error_callback(decoder, flacerror);
--    FLAC__seekable_stream_decoder_set_client_data(decoder, this);
-+    decoder = FLAC__stream_decoder_new();
-+    FLAC__stream_decoder_set_md5_checking(decoder, false);
- 
-     freq = 0;
-     bitrate = 0;
-@@ -281,8 +272,17 @@
-     totalTime = 0; 
-     totalTime = totalTime < 0 ? 0 : totalTime;
- 
--    FLAC__seekable_stream_decoder_init(decoder);
--    FLAC__seekable_stream_decoder_process_until_end_of_metadata(decoder);
-+    FLAC__stream_decoder_init_stream(decoder,
-+                                     flacread,
-+                                     flacseek,
-+                                     flactell,
-+                                     flaclength,
-+                                     flaceof,
-+                                     flacwrite,
-+                                     flacmetadata,
-+                                     flacerror,
-+                                     this);
-+    FLAC__stream_decoder_process_until_end_of_metadata(decoder);
- 
-     inited = TRUE;
-     return TRUE;
-@@ -295,8 +295,8 @@
- 
- void FlacDecoder::deinit()
- {
--    FLAC__seekable_stream_decoder_finish(decoder);
--    FLAC__seekable_stream_decoder_delete(decoder);
-+    FLAC__stream_decoder_finish(decoder);
-+    FLAC__stream_decoder_delete(decoder);
- 
-     if (input()->isOpen())
-         input()->close();
-@@ -330,7 +330,7 @@
-     }
- 
-     bool flacok = true;
--    FLAC__SeekableStreamDecoderState decoderstate;
-+    FLAC__StreamDecoderState decoderstate;
- 
-     while (! done && ! finish) {
-         lock();
-@@ -340,12 +340,12 @@
-             FLAC__uint64 sample = (FLAC__uint64)(seekTime * 44100.0);
-             if (sample > totalsamples - 50)
-                 sample = totalsamples - 50;
--            FLAC__seekable_stream_decoder_seek_absolute(decoder, sample);
-+            FLAC__stream_decoder_seek_absolute(decoder, sample);
-             seekTime = -1.0;
-         }
- 
--        flacok = FLAC__seekable_stream_decoder_process_single(decoder);
--        decoderstate = FLAC__seekable_stream_decoder_get_state(decoder);
-+        flacok = FLAC__stream_decoder_process_single(decoder);
-+        decoderstate = FLAC__stream_decoder_get_state(decoder);
- 
-         if (decoderstate == 0 || decoderstate == 1)
-         {
---- flacdecoder.h.old	2007-03-11 18:14:37.000000000 -0400
-+++ flacdecoder.h	2007-03-11 18:14:12.000000000 -0400
-@@ -35,7 +35,7 @@
-     char *output_buf;
-     ulong output_bytes, output_at;
- 
--    FLAC__SeekableStreamDecoder *decoder;
-+    FLAC__StreamDecoder *decoder;
- 
-     unsigned int bks;
-     bool done, finish;
---- flacencoder.cpp.old	2007-03-11 18:14:37.000000000 -0400
-+++ flacencoder.cpp	2007-03-11 18:14:12.000000000 -0400
-@@ -9,7 +9,7 @@
- #include "flacencoder.h"
- #include "metaioflacvorbiscomment.h"
- 
--#include <FLAC/file_encoder.h>
-+#include <FLAC/stream_encoder.h>
- #include <FLAC/assert.h>
- #include <mythtv/mythcontext.h>
- 
-@@ -29,32 +29,32 @@
-     int rice_parameter_search_dist = 0;
-     int max_lpc_order = 8;
- 
--    encoder = FLAC__file_encoder_new();
-+    encoder = FLAC__stream_encoder_new();
- 
--    FLAC__file_encoder_set_streamable_subset(encoder, true);
--    FLAC__file_encoder_set_do_mid_side_stereo(encoder, do_mid_side);
--    FLAC__file_encoder_set_loose_mid_side_stereo(encoder, loose_mid_side);
--    FLAC__file_encoder_set_channels(encoder, NUM_CHANNELS);
--    FLAC__file_encoder_set_bits_per_sample(encoder, 16);
--    FLAC__file_encoder_set_sample_rate(encoder, 44100);
--    FLAC__file_encoder_set_blocksize(encoder, blocksize);
--    FLAC__file_encoder_set_max_lpc_order(encoder, max_lpc_order);
--    FLAC__file_encoder_set_qlp_coeff_precision(encoder, qlp_coeff_precision);
--    FLAC__file_encoder_set_do_qlp_coeff_prec_search(encoder, false);
--    FLAC__file_encoder_set_do_escape_coding(encoder, do_escape_coding);
--    FLAC__file_encoder_set_do_exhaustive_model_search(encoder, 
-+    FLAC__stream_encoder_set_streamable_subset(encoder, true);
-+    FLAC__stream_encoder_set_do_mid_side_stereo(encoder, do_mid_side);
-+    FLAC__stream_encoder_set_loose_mid_side_stereo(encoder, loose_mid_side);
-+    FLAC__stream_encoder_set_channels(encoder, NUM_CHANNELS);
-+    FLAC__stream_encoder_set_bits_per_sample(encoder, 16);
-+    FLAC__stream_encoder_set_sample_rate(encoder, 44100);
-+    FLAC__stream_encoder_set_blocksize(encoder, blocksize);
-+    FLAC__stream_encoder_set_max_lpc_order(encoder, max_lpc_order);
-+    FLAC__stream_encoder_set_qlp_coeff_precision(encoder, qlp_coeff_precision);
-+    FLAC__stream_encoder_set_do_qlp_coeff_prec_search(encoder, false);
-+    FLAC__stream_encoder_set_do_escape_coding(encoder, do_escape_coding);
-+    FLAC__stream_encoder_set_do_exhaustive_model_search(encoder, 
-                                                     do_exhaustive_model_search);
--    FLAC__file_encoder_set_min_residual_partition_order(encoder, 
-+    FLAC__stream_encoder_set_min_residual_partition_order(encoder, 
-                                                   min_residual_partition_order);
--    FLAC__file_encoder_set_max_residual_partition_order(encoder, 
-+    FLAC__stream_encoder_set_max_residual_partition_order(encoder, 
-                                                   max_residual_partition_order);
--    FLAC__file_encoder_set_rice_parameter_search_dist(encoder, 
-+    FLAC__stream_encoder_set_rice_parameter_search_dist(encoder, 
-                                                     rice_parameter_search_dist);
- 
--    FLAC__file_encoder_set_filename(encoder, outfile.local8Bit());
-+    
- 
--    int ret = FLAC__file_encoder_init(encoder);
--    if (ret != FLAC__FILE_ENCODER_OK)
-+    int ret = FLAC__stream_encoder_init_file(encoder, outfile.local8Bit(), NULL, NULL);
-+    if (ret != FLAC__STREAM_ENCODER_OK)
-     {
-         VERBOSE(VB_GENERAL, QString("Error initializing FLAC encoder."
-                                     " Got return code: %1").arg(ret));
-@@ -70,8 +70,8 @@
- 
-     if (encoder)
-     {
--        FLAC__file_encoder_finish(encoder);
--        FLAC__file_encoder_delete(encoder);
-+        FLAC__stream_encoder_finish(encoder);
-+        FLAC__stream_encoder_delete(encoder);
-     }
- 
-     if (metadata)
-@@ -102,7 +102,7 @@
- 
-         if(sampleindex == MAX_SAMPLES || (length == 0 && sampleindex > 0) ) 
-         {
--            if (!FLAC__file_encoder_process(encoder,
-+            if (!FLAC__stream_encoder_process(encoder,
-                                             (const FLAC__int32 * const *) input,
-                                             sampleindex))
-             {
---- flacencoder.h.old	2007-03-11 18:14:37.000000000 -0400
-+++ flacencoder.h	2007-03-11 18:14:12.000000000 -0400
-@@ -4,7 +4,7 @@
- #include <qstring.h>
- 
- #define HAVE_INTTYPES_H
--#include <FLAC/file_encoder.h>
-+#include <FLAC/stream_encoder.h>
- 
- #include "encoder.h"
- 
-@@ -21,7 +21,7 @@
-     int addSamples(int16_t *bytes, unsigned int len);
- 
-   private:
--    FLAC__FileEncoder *encoder;
-+    FLAC__StreamEncoder *encoder;
-     unsigned int sampleindex;
-     FLAC__int32 inputin[NUM_CHANNELS][MAX_SAMPLES];
-     FLAC__int32 *input[NUM_CHANNELS];
diff --git a/abs/mv-core/myth/stable/mythnews/PKGBUILD b/abs/mv-core/myth/stable/mythnews/PKGBUILD
deleted file mode 100644
index a5fa26e..0000000
--- a/abs/mv-core/myth/stable/mythnews/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-pkgname=mythnews-release-fixes
-pkgver=21228
-pkgrel=1
-pkgdesc="News checking plugin for MythTV"
-url="http://www.mythtv.org"
-arch=('i686')
-depends=('mythtv-release-fixes')
-conflicts=('mythtv-plugins-release-fixes')
-groups=('mythtv-all-plugins-release-fixes')
-license="GPL"
-source=()
-_svntrunk=http://svn.mythtv.org/svn/branches/release-0-21-fixes/mythplugins
-_svntrunk=http://svn.mythtv.org/svn/branches/release-0-21-fixes/mythplugins
-_svnmod=mythplugins
-build() {
-	cd $startdir/src/
-	echo svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
- 	svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
-	cd $startdir/src/mythplugins
-	PLUGIN=mythnews
-	grep -q  programs-libs.pro  $PLUGIN/$PLUGIN/$PLUGIN.pro
-	if [ $? != 0 ]
-	then
-			echo "include ( ../../programs-libs.pro )" >> $PLUGIN/$PLUGIN/$PLUGIN.pro
-				msg "appending program lib"
-			fi
-	make distclean
-   ./configure --disable-all --enable-mythnews --prefix=/usr
-
-   make -j 2 || return 1
-
-   make INSTALL_ROOT=$startdir/pkg install
-}
-md5sums=('2a9fbf45ae58a3a35857ce8d7c4d12db')
diff --git a/abs/mv-core/myth/stable/mythphone/PKGBUILD b/abs/mv-core/myth/stable/mythphone/PKGBUILD
deleted file mode 100644
index 7fd3b46..0000000
--- a/abs/mv-core/myth/stable/mythphone/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-pkgname=mythphone-release-fixes
-pkgver=21228
-pkgrel=1
-pkgdesc="Plugin that allows phone calls to be made to MythTv"
-url="http://www.mythtv.org"
-arch=('i686')
-depends=('mythtv-release-fixes')
-conflicts=('mythtv-plugins-release-fixes')
-groups=('mythtv-all-plugins-release-fixes')
-license="GPL"
-source=()
-_svntrunk=http://svn.mythtv.org/svn/branches/release-0-21-fixes/mythplugins
-_svntrunk=http://svn.mythtv.org/svn/branches/release-0-21-fixes/mythplugins
-_svnmod=mythplugins
-
-build() {
-	cd $startdir/src/
-	echo svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
- 	svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
-	cd $startdir/src/mythplugins
-	make distclean
-	PLUGIN=mythphone
-	grep -q  programs-libs.pro  $PLUGIN/$PLUGIN/$PLUGIN.pro
-	if [ $? != 0 ]
-	then
-		echo "include ( ../../programs-libs.pro )" >> $PLUGIN/$PLUGIN/$PLUGIN.pro
-		msg  "appending program lib"
-	fi
-	
-	msg "Correcting configure    kde3 to kde"
-   	sed -i 's#kde3#kde#' configure || return 1
-   	./configure  --prefix=/usr --enable-opengl --disable-all --enable-mythphone || return 1
-	qmake mythplugins.pro || return 1
-	make qmake || return 1
-	
-	msg "Correcting Makefile    kde3 to kde"
- 	sed -i 's#kde3#kde#' ./mythphone/mythphone/Makefile || return 1
-   	
-	make -j 2 || return 1
-	make INSTALL_ROOT=$startdir/pkg install
-}
-
diff --git a/abs/mv-core/myth/stable/mythsmolt/PKGBUILD b/abs/mv-core/myth/stable/mythsmolt/PKGBUILD
deleted file mode 100644
index db1b977..0000000
--- a/abs/mv-core/myth/stable/mythsmolt/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-pkgname=mythsmolt-release-fixes
-pkgver=21228
-pkgrel=1
-pkgdesc="mythsmolt, a hardware profileing tool"
-arch=('i686' 'x86_64')
-url="http://www.mythvantage.com"
-license=('GPL')
-depends=("mythtv-release-fixes" urlgrabber hal)
-source=("http://www.mythvantage.com/request.php?4")
-
-groups=('mythtv-extras')
-
-build() {
-   cd $startdir/src/mythsmolt_src/mythsmolt
-   . /etc/profile.d/qt3.sh
-   
-   # use QT3 qmake
-   export PATH=$QTDIR/bin:$PATH
-   echo "INCLUDEPATH += /usr/include/mythtv" >> mythsmolt.pro.usr
-   qmake mythsmolt.pro.usr
-   make qmake || return 1
-   make -j 2 || return 1
-
-   make INSTALL_ROOT=$startdir/pkg install
-}
-
-
diff --git a/abs/mv-core/myth/stable/mythtv-release-fixes/3466-v1.patch b/abs/mv-core/myth/stable/mythtv-release-fixes/3466-v1.patch
deleted file mode 100755
index 912ce27..0000000
--- a/abs/mv-core/myth/stable/mythtv-release-fixes/3466-v1.patch
+++ /dev/null
@@ -1,240 +0,0 @@
-Index: libs/libmythtv/NuppelVideoPlayer.cpp
-===================================================================
---- libs/libmythtv/NuppelVideoPlayer.cpp	(revision 13535)
-+++ libs/libmythtv/NuppelVideoPlayer.cpp	(working copy)
-@@ -1475,6 +1475,12 @@
-     }
- }
- 
-+void NuppelVideoPlayer::DrawUnusedRects(bool sync)
-+{
-+    if (videoOutput)
-+        videoOutput->DrawUnusedRects(sync);
-+}
-+
- void NuppelVideoPlayer::ResetCaptions(uint mode_override)
- {
-     uint origMode   = textDisplayMode;
-Index: libs/libmythtv/guidegrid.h
-===================================================================
---- libs/libmythtv/guidegrid.h	(revision 13535)
-+++ libs/libmythtv/guidegrid.h	(working copy)
-@@ -86,8 +86,9 @@
-     void paintEvent(QPaintEvent *);
- 
-   private slots:
--    void timeout();
--    void jumpToChannelTimeout();
-+    void timeCheckTimeout(void);
-+    void repaintVideoTimeout(void);
-+    void jumpToChannelTimeout(void);
- 
-   private:
-     void keyPressEvent(QKeyEvent *e);
-@@ -174,6 +175,7 @@
-     QString currentTimeColor;
- 
-     QTimer *timeCheck;
-+    QTimer *videoRepaintTimer;
- 
-     bool keyDown;
- 
-Index: libs/libmythtv/tv_play.h
-===================================================================
---- libs/libmythtv/tv_play.h	(revision 13535)
-+++ libs/libmythtv/tv_play.h	(working copy)
-@@ -112,6 +112,7 @@
-     void StopEmbeddingOutput(void);
-     bool IsEmbedding(void);
-     void EPGChannelUpdate(uint chanid, QString channum);
-+    void DrawUnusedRects(bool sync);
-    
-     // Recording commands
-     int  PlayFromRecorder(int recordernum);
-Index: libs/libmythtv/guidegrid.cpp
-===================================================================
---- libs/libmythtv/guidegrid.cpp	(revision 13535)
-+++ libs/libmythtv/guidegrid.cpp	(working copy)
-@@ -261,9 +261,14 @@
- 
-     timeCheck = NULL;
-     timeCheck = new QTimer(this);
--    connect(timeCheck, SIGNAL(timeout()), SLOT(timeout()) );
-+    connect(timeCheck, SIGNAL(timeout()), SLOT(timeCheckTimeout()) );
-     timeCheck->start(200);
- 
-+    videoRepaintTimer = new QTimer(this);
-+    QObject::connect(videoRepaintTimer, SIGNAL(timeout()),
-+                     this,              SLOT(repaintVideoTimeout()));
-+    videoRepaintTimer->start(1000);
-+
-     selectState = false;
- 
-     updateBackground();
-@@ -281,18 +286,46 @@
-     for (int x = 0; x < MAX_DISPLAY_TIMES; x++)
-     {
-         if (m_timeInfos[x])
-+        {
-             delete m_timeInfos[x];
-+            m_timeInfos[x] = NULL;
-+        }
-     }
- 
-     for (int y = 0; y < MAX_DISPLAY_CHANS; y++)
-     {
-         if (m_programs[y])
-+        {
-             delete m_programs[y];
-+            m_programs[y] = NULL;
-+        }
-     }
- 
-     m_channelInfos.clear();
- 
--    delete theme;
-+    if (theme)
-+    {
-+        delete theme;
-+        theme = NULL;
-+    }
-+
-+    if (jumpToChannelTimer)
-+    {
-+        jumpToChannelTimer->deleteLater();
-+        jumpToChannelTimer = NULL;
-+    }
-+
-+    if (timeCheck)
-+    {
-+        timeCheck->deleteLater();
-+        timeCheck = NULL;
-+    }
-+
-+    if (videoRepaintTimer)
-+    {
-+        videoRepaintTimer->deleteLater();
-+        videoRepaintTimer = NULL;
-+    }
- }
- 
- void GuideGrid::keyPressEvent(QKeyEvent *e)
-@@ -533,7 +566,7 @@
-     return m_channelInfos[idx].chanid;
- }
- 
--void GuideGrid::timeout()
-+void GuideGrid::timeCheckTimeout(void)
- {
-     timeCheck->changeInterval((int)(60 * 1000));
-     QTime new_time = QTime::currentTime();
-@@ -561,6 +594,12 @@
-     repaint(curInfoRect, false);
- }
- 
-+void GuideGrid::repaintVideoTimeout(void)
-+{
-+    timeCheck->changeInterval(1000);
-+    update(videoRect);
-+}
-+
- void GuideGrid::fillChannelInfos(bool gotostartchannel)
- {
-     m_channelInfos.clear();
-@@ -974,6 +1013,7 @@
-     if (r.intersects(videoRect) && m_player)
-     {
-         timeCheck->changeInterval((int)(200));
-+        m_player->DrawUnusedRects(false);
-     }
- 
-     qApp->unlock();
-@@ -1794,7 +1834,10 @@
-     ChannelInfo info = m_channelInfos[idx];
- 
-     if (m_player)
-+    {
-         m_player->EPGChannelUpdate(info.chanid, info.chanstr);
-+        videoRepaintTimer->start(200);
-+    }
- }
- 
- //
-Index: libs/libmythtv/NuppelVideoPlayer.h
-===================================================================
---- libs/libmythtv/NuppelVideoPlayer.h	(revision 13535)
-+++ libs/libmythtv/NuppelVideoPlayer.h	(working copy)
-@@ -118,6 +118,7 @@
-     void StopEmbedding(void);
-     void ExposeEvent(void);
-     bool IsEmbedding(void);
-+    void DrawUnusedRects(bool sync);
- 
-     // Audio Sets
-     void SetNoAudio(void)                     { no_audio_out = true; }
-Index: libs/libmythtv/tv_play.cpp
-===================================================================
---- libs/libmythtv/tv_play.cpp	(revision 13535)
-+++ libs/libmythtv/tv_play.cpp	(working copy)
-@@ -5035,6 +5035,12 @@
-     return false;
- }
- 
-+void TV::DrawUnusedRects(bool sync)
-+{
-+    if (nvp)
-+        nvp->DrawUnusedRects(sync);
-+}
-+
- void TV::doEditSchedule(int editType)
- {
-     if (!playbackinfo)
-Index: libs/libmythtv/videoout_xv.cpp
-===================================================================
---- libs/libmythtv/videoout_xv.cpp	(revision 13535)
-+++ libs/libmythtv/videoout_xv.cpp	(working copy)
-@@ -2465,7 +2465,7 @@
-     }
- 
-     if ((needrepaint || xv_need_bobdeint_repaint) &&
--        (VideoOutputSubType() >= XVideo))
-+        (VideoOutputSubType() >= XVideo) && !embedding)
-     {
-         DrawUnusedRects(/* don't do a sync*/false);
-     }
-@@ -2480,12 +2480,6 @@
- 
- void VideoOutputXv::DrawUnusedRects(bool sync)
- {
--    // Unfortunately, this gets drawn in the wrong place on prebuffering
--    // pauses when embedding and this is rarely useful when embedding
--    // since the background is drawn in guidegrid so we bail here. -- dtk
--    if (embedding) 
--        return;
--
-     // boboff assumes the smallest interlaced resolution is 480 lines - 5%
-     bool use_bob   = (m_deinterlacing && m_deintfiltername == "bobdeint");
-     int boboff_raw = (int)round(((double)display_video_rect.height()) /
-@@ -2512,7 +2506,12 @@
- 
-     X11L;
- 
--    if (xv_draw_colorkey && needrepaint)
-+    // This is used to avoid drawing the colorkey when embedding and
-+    // not using overlay. This is needed because we don't paint this
-+    // in the vertical retrace period when calling this from the EPG.
-+    bool clrdraw = xv_colorkey || !embedding;
-+
-+    if (xv_draw_colorkey && needrepaint && clrdraw)
-     {
-         XSetForeground(XJ_disp, XJ_gc, xv_colorkey);
-         XFillRectangle(XJ_disp, XJ_curwin, XJ_gc,
-@@ -2521,7 +2520,7 @@
-                        display_visible_rect.width(),
-                        display_visible_rect.height() - 2 * boboff);
-     }
--    else if (xv_draw_colorkey && xv_need_bobdeint_repaint)
-+    else if (xv_draw_colorkey && xv_need_bobdeint_repaint && clrdraw)
-     {
-         // if this is only for deinterlacing mode switching, draw
-         // the border areas, presumably the main image is undamaged.
diff --git a/abs/mv-core/myth/stable/mythtv-release-fixes/PKGBUILD b/abs/mv-core/myth/stable/mythtv-release-fixes/PKGBUILD
deleted file mode 100755
index a22451d..0000000
--- a/abs/mv-core/myth/stable/mythtv-release-fixes/PKGBUILD
+++ /dev/null
@@ -1,79 +0,0 @@
-pkgname=mythtv-release-fixes
-pkgver=21228
-pkgrel=1
-pkgdesc=".21  A personal video recorder for Linux"
-url="http://www.mythtv.org"
-license="GPL"
-depends=('lame' 'libmysqlclient' 'alsa-lib'  'wget' 'qt3' 'x-server' 'freetype2' 'libmpeg2' 'libxml2' 'libraw1394' 'lirc' 'perl-date-manip' 'libavc1394' 'libdc1394' 'libiec61883')
-makedepends=('subversion')
-conflicts=(mythtv-svn)
-replaces=()
-backup=()
-options=(!strip)
-MAKEFLAGS="-j6"
-
-install='mythtv.install'
-#source=(mythbackend myth.sh 3466-v1.patch reload.patch)
-source=(mythbackend myth.sh  myth.find_orphans.pl   dbconfig.patch myththemedmenu.cpp.patch myththemedmenu.h.patch screenshots2.diff screenshot_jump.patch pop_be_restart.h.patch pop_be_restart.cpp.patch jump_snapshot.patch smolt_jump.patch)
-arch=('i686')
-md5sums=()
-_svntrunk=http://svn.mythtv.org/svn/branches/release-0-21-fixes/mythtv
-#_svntrunk=http://cvs.mythtv.org/svn/trunk/mythtv
-_svnmod=mythtv
-
-build() {
- svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
-        cd $startdir/src/mythtv
-	 patch -p0 < ../dbconfig.patch
-	 grep snapshot programs/mythfrontend/networkcontrol.cpp|grep -q  jumpMap
-	 status=$?
-
-	if [ $status != 0 ]
-	then
-		echo "patching for screenshot"
-		 patch -p0 < ../screenshots2.diff
-		 patch -p0 < ../screenshot_jump.patch
-	#	 patch -p0 < ../jump_snapshot.patch
-
-	else
-		echo "screenshot already patched"
-	fi
-	 patch -p0 < ../myththemedmenu.cpp.patch
-	 patch -p0 < ../myththemedmenu.h.patch
-	 patch -p0 < ../pop_be_restart.h.patch
-	 patch -p0 < ../pop_be_restart.cpp.patch
-	 patch -p0 < ../smolt_jump.patch
-  	sed -i -e "s/\`(svnversion \$\${SVNTREEDIR} 2>\/dev\/null) || echo Unknown\`/$pkgver/" version.pro
-         make distclean
-	 make clean
-	 ./configure --prefix=/usr --enable-opengl-vsync --enable-dvb --enable-firewire --compile-type=release --with-bindings=perl --disable-audio-arts --disable-xrandr  --disable-audio-jack   --disable-directfb --disable-xvmc  --disable-xvmcw --enable-xvmc-pro --enable-xvmc-opengl  
-
-. /etc/profile
-
-   make
-   make INSTALL_ROOT=$startdir/pkg install
-   mkdir -p $startdir/pkg/usr/share/mythtv/contrib
-   mkdir -p $startdir/pkg/etc/rc.d
-   mkdir -p $startdir/pkg/var/log/mythtv
-   mkdir -p $startdir/pkg/etc/profile.d
-   install -m0755 ../myth.sh $startdir/pkg/etc/profile.d/
-# install contrib
-   mkdir -p $startdir/pkg/usr/local/share/mythtv/contrib || return 1
-   #cp -rp contrib/* $startdir/pkg/usr/local/share/mythtv/contrib
-    rsync -a --exclude=.svn contrib/* $startdir/pkg/usr/local/share/mythtv/contrib
-   echo "-release-fixes"   >  $startdir/pkg/usr/local/share/mythtv/.releasetype
-   #install -m0755 themes/*.ttf $startdir/pkg/usr/local/share/mythtv/themes/
-   # set suid on mythfrontend
-#   chmod a+s  $startdir/pkg/usr/local/bin/mythfrontend
-
-#   mkdir -p $startdir/pkg/usr/lib/
-#   mv $startdir/pkg/usr/local/lib/perl5 $startdir/pkg/usr/lib/perl5
-    cd $startdir/src/mythtv/contrib
-    gcc -Wall -o firewire_tester firewire_tester.c -liec61883 -lraw1394
-    install -m0755 firewire_tester $startdir/pkg/usr/bin/firewire_tester
-#    install -m0755  $startdir/pkg/usr/share/mythtv/contrib/optimize_mythdb.pl  $startdir/pkg/usr/local/bin/optimize_mythdb.pl
-#    cp $startdir/src/myth.find_orphans.pl $startdir/pkg/usr/share/mythtv/contrib/myth.find_orphans.pl
-#    install -m0755  $startdir/pkg/usr/share/mythtv/contrib/myth.find_orphans.pl  $startdir/pkg/usr/bin/myth.find_orphans.pl
-
-
-}
diff --git a/abs/mv-core/myth/stable/mythtv-release-fixes/dbconfig.patch b/abs/mv-core/myth/stable/mythtv-release-fixes/dbconfig.patch
deleted file mode 100644
index 1d181ac..0000000
--- a/abs/mv-core/myth/stable/mythtv-release-fixes/dbconfig.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- libs/libmyth/mythcontext.cpp	2007-10-04 00:20:28.000000000 -0500
-+++ libs/libmyth/mythcontext.cpp.new	2007-11-12 22:54:57.000000000 -0600
-@@ -852,14 +852,14 @@
-         cout << endl << error << endl << endl;
-         response = getResponse("Would you like to configure the database "
-                                "connection now?",
--                               "yes");
-+                               "no");
-         if (!response || response.left(1).lower() != "y")
-             return false;
-         
-         params.dbHostName = getResponse("Database host name:",
-                                         params.dbHostName);
-         response = getResponse("Should I test connectivity to this host "
--                               "using the ping command?", "yes");
-+                               "using the ping command?", "no");
-         params.dbHostPing = (!response || response.left(1).lower() != "y");
- 
-         params.dbPort     = intResponse("Database non-default port:",
diff --git a/abs/mv-core/myth/stable/mythtv-release-fixes/debug_uitypes.cpp.patch b/abs/mv-core/myth/stable/mythtv-release-fixes/debug_uitypes.cpp.patch
deleted file mode 100644
index b87b89f..0000000
--- a/abs/mv-core/myth/stable/mythtv-release-fixes/debug_uitypes.cpp.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- mythtv/libs/libmyth/uitypes.cpp.orig	2007-11-30 14:03:07.000000000 -0600
-+++ mythtv/libs/libmyth/uitypes.cpp	2007-11-30 14:04:09.000000000 -0600
-@@ -3831,15 +3831,15 @@
-     //
-     //  Debugging, draw edges around bins
-     //
--
--    /*
-+    if (m_debug == true)
-+    {
-     p->setPen(QColor(255,0,0));
-     CornerMap::Iterator it;
-     for ( it = bin_corners.begin(); it != bin_corners.end(); ++it )
-     {
-         p->drawRect(it.data());
-     }
--    */
-+    }
- 
- }
- 
diff --git a/abs/mv-core/myth/stable/mythtv-release-fixes/debug_xmlparse.cpp.patch b/abs/mv-core/myth/stable/mythtv-release-fixes/debug_xmlparse.cpp.patch
deleted file mode 100644
index f479bbe..0000000
--- a/abs/mv-core/myth/stable/mythtv-release-fixes/debug_xmlparse.cpp.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- mythtv/libs/libmyth/xmlparse.cpp.orig	2007-11-30 14:03:00.000000000 -0600
-+++ mythtv/libs/libmyth/xmlparse.cpp	2007-11-30 14:06:22.000000000 -0600
-@@ -2618,6 +2618,11 @@
-                 area = parseRect(getFirstText(info));
-                 normalizeRect(area);
-             }
-+            if (info.tagName() == "debug")
-+            {
-+                if  (getFirstText(info) == "true")
-+                    container->SetDebug(true);
-+            }
-             else if (info.tagName() == "image")
-             {
-                 QString imgname = "";
diff --git a/abs/mv-core/myth/stable/mythtv-release-fixes/jump_snapshot.patch b/abs/mv-core/myth/stable/mythtv-release-fixes/jump_snapshot.patch
deleted file mode 100644
index 2d2c68b..0000000
--- a/abs/mv-core/myth/stable/mythtv-release-fixes/jump_snapshot.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- libs/libmythui/mythmainwindow.cpp.orrig	2008-03-19 18:43:08.000000000 +0000
-+++ libs/libmythui/mythmainwindow.cpp	2008-03-19 18:43:51.000000000 +0000
-@@ -1132,7 +1132,9 @@
- 
- void MythMainWindow::JumpTo(const QString& destination, bool pop)
- {
--    if (d->destinationMap.count(destination) > 0 && d->exitmenucallback == NULL)
-+   if (destination == "ScreenShot") 
-+        screenShot(); 
-+   else if (d->destinationMap.count(destination) > 0 && d->exitmenucallback == NULL) 
-     {
-         d->exitingtomain = true;
-         d->popwindows = pop;
diff --git a/abs/mv-core/myth/stable/mythtv-release-fixes/myth.find_orphans.pl b/abs/mv-core/myth/stable/mythtv-release-fixes/myth.find_orphans.pl
deleted file mode 100755
index c258e1d..0000000
--- a/abs/mv-core/myth/stable/mythtv-release-fixes/myth.find_orphans.pl
+++ /dev/null
@@ -1,260 +0,0 @@
-#!/usr/bin/perl
-
-# check for recording anomolies -
-#   based somewhat on greg froese's "myth.rebuilddatabase.pl"
-#   -- Lincoln Dale <ltd@interlink.com.au>, September 2006
-# 2007-03-11:  Added pretty print of unknown files vs. orphaned thumbnails. (Robert Kulagowski)
-
-#  The intent of this script is to be able to find orphaned rows in the 'recorded' table
-#  (entries which don't have matching media files) and orphaned media files (potentially
-#  taking up gigabytes of otherwise usable disk space) which have no matching row in
-#  the 'recorded' db table.
-#
-#  By default, running the script will simply return a list of problems it finds.
-#  Running with --dodbdelete will remove db recorded rows for which there is no matching
-#  media file.  Running with --dodelete will delete media files for which there is no
-#  matching db record.
-#
-#  This script may be useful to fix up some orphaned db entries (causes mythweb to run
-#  verrry slow) as well as reclaim some disk space from some orphaned media files.
-#  (in an ideal world, neither of these would ever happen, but i've seen both happen in reality).
-#  This script makes it easy to keep track of whether it has or hasn't happened, even if you
-#  have thousands of recordings and terabytes of stored media.
-#
-#  no warranties expressed or implied.  if you run this and it deletes all your recordings
-#  and sets mythtv to fill up all your disk space with The Home Shopping Network, its entirely
-#  your fault.
-
-my $progname = "myth.find_orphans.pl";
-my $revision = "0.20";
-
-use DBI;
-use Sys::Hostname;
-use Getopt::Long;
-
-#
-# options
-#
-
-my $opt_host =		hostname;
-my $opt_dbhost = 	"localhost";
-my $opt_database = 	"mythconverg";
-my $opt_user = 		"mythtv";
-my $opt_pass = 		"mythtv";
-my $opt_ext = 		"{nuv,mpg,mpeg,avi}";
-my $opt_dir =		"";
-my $opt_dodelete =	0;
-my $opt_dodbdelete =	0;
-my $debug =		0;
-my $opt_help =		0;
-
-GetOptions(
-        'host=s'	=> \$opt_host,
-        'dbhost=s'	=> \$opt_dbhost,
-        'database=s'	=> \$opt_database,
-        'user=s'	=> \$opt_user,
-        'pass=s'	=> \$opt_pass,
-	'dir=s'		=> \$opt_dir,
-	'dodelete'	=> \$opt_dodelete,
-	'dodbdelete'	=> \$opt_dodbdelete,
-        'debug+'	=> \$debug,
-        'help'		=> \$opt_help,
-        'h'		=> \$opt_help,
-        'v'		=> \$opt_help);
-
-if ($opt_help) {
-	print<<EOF
-$progname (rev $revision)
-(checks MythTV recording directories for orphaned files)
-
-options:
-	--host=(host)		MythTV backend host ($opt_host)
-	--dbhost=(host)		host where MySQL database for backend is ($opt_dbhost)
-	--database=(dbname)	MythTV database ($opt_database)
-	--user=(user)		MySQL MythTV database user ($opt_user)
-	--pass=(pass)		MySQL MythTV database password ($opt_pass)
-	--dir=directories	manually specify recording directories (otherwise setting is from database)
-	--debug			increase debug level
-	--dodbdelete		remove recorded db entries with no matching file (default: don't)
-	--dodelete		delete files with no record (default: don't)
-
-EOF
-;
-	exit(0);
-}
-
-#
-# go go go!
-#
-
-my $valid_recordings = 0;
-my $missing_recordings = 0;
-my $errors = 0;
-my $unknown_files = 0;
-my $known_files = 0;
-my $unknown_size = 0;
-my $known_size = 0;
-my $unknown_thumbnail = 0;
-
-if (!($dbh = DBI->connect("dbi:mysql:database=$opt_database:host=$opt_dbhost","$opt_user","$opt_pass"))) {
-	die "Cannot connect to database $opt_database on host $opt_dbhost: $!\n";
-}
-
-if ($opt_dir eq "") {
-	&dir_lookup("SELECT dirname FROM storagegroup WHERE hostname=(?)");
-	&dir_lookup("SELECT data FROM settings WHERE value='RecordFilePrefix' AND hostname=(?)");
-
-	printf STDERR "Recording directories ($opt_host): $opt_dir\n" if $debug;
-}
-
-if ($opt_dir eq "") {
-	printf "ERROR: no directory found or specified\n";
-	exit 1;
-}
-
-foreach $d (split(/,/,$opt_dir)) {
-	$d =~ s/\/$//g; # strip trailing /
-	$dirs{$d}++;
-}
-
-
-#
-# look in recorded table, make sure we can find every file ..
-#
-
-my $q = "SELECT title, subtitle, starttime, endtime, chanid, basename FROM recorded WHERE hostname=(?) ORDER BY starttime";
-$sth = $dbh->prepare($q);
-$sth->execute($opt_host) || die "Could not execute ($q): $!\n";
-
-while (my @row=$sth->fetchrow_array) {
-	($title, $subtitle, $starttime, $endtime, $channel, $basename) = @row;
-
-	# see if we can find it...
-	$loc = find_file($basename);
-	if ($loc eq "") {
-		printf "Missing media: %s (title:%s, start:%s)\n",$basename,$title,$starttime;
-		$missing_recordings++;
-
-		if ($opt_dodbdelete) {
-			my $sql = sprintf "DELETE FROM recorded WHERE basename LIKE \"%s\" LIMIT 1",$basename;
-			printf "performing database delete: %s\n",$sql;
-			$dbh->do($sql) || die "Could not execute $sql: $!\n";
-		}
-	} else {
-		$valid_recordings++;
-		$seen_basename{$basename}++;
-		$seen_basename{$basename.".png"}++; # thumbnail
-	}
-}
-
-#
-# look in recording directories, see if there are extra files not in database
-#
-
-foreach my $this_dir (keys %dirs) {
-	opendir(DIR, $this_dir) || die "cannot open directory $this_dir: $!\n";
-	foreach $this_file (readdir(DIR)) {
-		if (-f "$this_dir/$this_file") {
-
-			next if ($this_file eq "nfslockfile.lock");
-			next if ($this_file =~ m/^mythconv.*/);
-			next if ($this_dir eq "/data/database_backup");
-
-			my $this_filesize = -s "$this_dir/$this_file";
-			if ($seen_basename{$this_file} == 0) {
-				$sorted_filesizes{$this_filesize} .= sprintf "unknown file [%s]: %s/%s\n",pretty_filesize($this_filesize),$this_dir,$this_file;
-				$unknown_size += $this_filesize;
-				if (substr($this_file,-4) eq ".png") {
-					$unknown_thumbnail++;
-				}
-				else {
-					$unknown_files++;
-				}
-				                                                                         
-				if ($opt_dodelete) {
-					printf STDERR "deleting  [%s]:  %s/%s\n",pretty_filesize($this_filesize),$this_dir,$this_file;
-					unlink "$this_dir/$this_file";
-
-					if (-f "$this_dir/$this_file") {
-						$errors++;
-						printf "ERROR: could not delete $this_dir/$this_file\n";
-					}
-				}
-			} else {
-				$known_files++;
-				$known_size += $this_filesize;
-				printf "KNOWN file [%s]: %s/%s\n",pretty_filesize($this_filesize),$this_dir,$this_file if $debug;
-			}
-		} else {
-			printf "NOT A FILE: %s/%s\n",$this_dir,$this_file if $debug;
-		}
-	}
-	closedir DIR;
-}
-
-
-#
-# finished, report results
-#
-
-foreach my $key (sort { $a <=> $b } keys %sorted_filesizes) {
-	printf $sorted_filesizes{$key};
-}
-
-printf "Summary:\n";
-printf "  Host: %s, Directories: %s\n", $opt_host, join(" ",keys %dirs);
-printf "  %d ERRORS ENCOUNTERED (see above for details)\n",$errors if ($errors > 0);
-printf "  %d valid recording%s, %d missing recording%s %s\n",
-	$valid_recordings, ($valid_recordings != 1 ? "s" : ""),
-	$missing_recordings, ($missing_recordings != 1 ? "s" : ""),
-	($missing_recordings > 0 ? ($opt_dodbdelete ? "were fixed" : "not fixed, check above is valid and use --dodbdelete to fix") : "");
-printf "  %d known media files using %s\n  %d orphaned thumbnails with no corresponding recording\n  %d unknown files using %s %s\n",
-	$known_files, pretty_filesize($known_size), 
-	$unknown_thumbnail,$unknown_files, pretty_filesize($unknown_size), 
-	($unknown_files > 0 ? ($opt_dodelete ? "were fixed" : "not fixed, check above and use --dodelete to clean up if the above output is accurate") : "");
-
-exit(0);
-
-###########################################################################
-# filesize bling
-
-sub pretty_filesize
-{
-	local($fsize) = @_;
-	return sprintf "%0.1fGB",($fsize / 1000000000) if ($fsize >= 1000000000);
-	return sprintf "%0.1fMB",($fsize / 1000000) if ($fsize >= 1000000);
-	return sprintf "%0.1fKB",($fsize / 1000) if ($fsize >= 1000);
-	return sprintf "%0.0fB",$fsize;
-}
-
-###########################################################################
-# find a file in directories without globbing
-
-sub find_file
-{
-	local($fname) = @_;
-
-	foreach my $d (keys %dirs) {
-		my $f = $d."/".$fname;
-		if (-e $f) {
-			return $f;
-		}
-	}
-	return;
-}
-
-###########################################################################
-
-sub dir_lookup
-{
-	my $query = shift;
-
-	$sth = $dbh->prepare($query);
-	$sth->execute($opt_host) || die "Could not execute ($dir_query)";
-	while (my @row = $sth->fetchrow_array) {
-		$opt_dir .= "," if ($opt_dir ne "");
-		$opt_dir .= $row[0];
-	}
-}
-
-###########################################################################
diff --git a/abs/mv-core/myth/stable/mythtv-release-fixes/myth.sh b/abs/mv-core/myth/stable/mythtv-release-fixes/myth.sh
deleted file mode 100755
index fb7122c..0000000
--- a/abs/mv-core/myth/stable/mythtv-release-fixes/myth.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-export PATH=$PATH:/usr/local/bin
-# set core file size to 0
-ulimit -c 0
-export MALLOC_CHECK_=0
\ No newline at end of file
diff --git a/abs/mv-core/myth/stable/mythtv-release-fixes/mythbackend b/abs/mv-core/myth/stable/mythtv-release-fixes/mythbackend
deleted file mode 100755
index f96c6b7..0000000
--- a/abs/mv-core/myth/stable/mythtv-release-fixes/mythbackend
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/bin/mythbackend`
-case "$1" in
-  start)
-    stat_busy "Starting MythTV Backend"
-    [ ! -e /var/run/mysqld.pid ] && echo -n "mysqld not started" && stat_fail && exit
-    [ -z "$PID" ] && /usr/local/bin/mythbackend -d -l /var/log/mythbackend.log -v quiet
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      echo $PID > /var/run/mythbackend.pid
-      add_daemon mythbackend
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping MythTV Backend"
-    [ ! -z "$PID" ]  && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon mythbackend
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"
-esac
-exit 0
diff --git a/abs/mv-core/myth/stable/mythtv-release-fixes/mythbackend.sh b/abs/mv-core/myth/stable/mythtv-release-fixes/mythbackend.sh
deleted file mode 100755
index e7a7b70..0000000
--- a/abs/mv-core/myth/stable/mythtv-release-fixes/mythbackend.sh
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/bin/bash
-#
-#	/etc/rc.d/init.d/mythbackend
-#
-# Starts the mythbackend as a daemon
-#
-# chkconfig: 345 90 10
-# description: Starts the mythbackend process as a daemon after the XWindows \
-#              system is started, in runlevel 5. This allows scheduled \
-#              recordings to occur without manual intervention.
-# processname: mythbackend
-
-# Copyright (c) by Michael Thomson <linux at m-thomson dot net>
-# With thanks to Stu Tomlinson <stu at nosnilmot dot com>
-#
-#  This program is free software; you can redistribute it and/or modify
-#  it under the terms of the GNU General Public License as published by
-#  the Free Software Foundation; either version 2 of the License, or
-#  (at your option) any later version.
-#
-#  This program is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#  GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License
-#  along with this program; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
-
-# Default values to use if none are supplied in the config file.
-# User who should start the mythbackend processes
-MBE_USER="root"
-# Directory holding the mythbackend binary
-MBE_LOCATION="/usr/local/bin/"
-# Name of mythbackend binary
-MBE_PROG="mythbackend"
-# Full path to mythbackend log file
-MBE_LOGFILE="/var/log/mythtv/mythbackend.log"
-
-# Source function library.
-. /etc/init.d/functions
-
-# Source config file if available
-if [ -f "/etc/sysconfig/mythbackend" ]; then
-  . /etc/sysconfig/mythbackend
-fi
-
-test -x ${MBE_LOCATION}${MBE_PROG} || exit 0
-
-RETVAL=0
-
-#
-#	See how we were called.
-#
-
-start() {
-	# Check if mythbackend is already running
-	if [ ! -f /var/lock/subsys/${MBE_PROG} ]; then
-	    echo -n "Starting ${MBE_PROG}: "
-	    # /usr/local/bin/mythbackend -d -l /some/log/file
-	    #daemon --user ${MBE_USER} ${MBE_LOCATION}${MBE_PROG} -d -l ${MBE_LOGFILE}
-	    ${MBE_LOCATION}${MBE_PROG} -d -l ${MBE_LOGFILE}
-	    RETVAL=$?
-	    [ $RETVAL -eq 0 ] && touch /var/lock/subsys/${MBE_PROG}
-	    echo
-	fi
-	return $RETVAL
-}
-
-stop() {
-	echo -n "Stopping ${MBE_PROG}: "
-	killproc ${MBE_LOCATION}${MBE_PROG}
-	RETVAL=$?
-	[ $RETVAL -eq 0 ] && rm -f /var/lock/subsys/${MBE_PROG}
-	echo
-        return $RETVAL
-}
-
-
-restart() {
-	stop
-	start
-}	
-
-reload() {
-	restart
-}	
-
-status_at() {
- 	status ${MBE_LOCATION}${MBE_PROG}
-}
-
-case "$1" in
-start)
-	start
-	;;
-stop)
-	stop
-	;;
-reload|restart)
-	restart
-	;;
-condrestart)
-	if [ -f /var/lock/subsys/${MBE_PROG} ]; then
-	    restart
-	fi
-	;;
-status)
-	status_at
-	;;
-*)
-	echo "Usage: $0 {start|stop|restart|condrestart|status}"
-	exit 1
-esac
-
-exit $?
-exit $RETVAL
diff --git a/abs/mv-core/myth/stable/mythtv-release-fixes/myththemedmenu.cpp.patch b/abs/mv-core/myth/stable/mythtv-release-fixes/myththemedmenu.cpp.patch
deleted file mode 100644
index f5baccd..0000000
--- a/abs/mv-core/myth/stable/mythtv-release-fixes/myththemedmenu.cpp.patch
+++ /dev/null
@@ -1,125 +0,0 @@
---- libs/libmythui/myththemedmenu.cpp.orig	2008-01-31 15:26:38.000000000 +0000
-+++ libs/libmythui/myththemedmenu.cpp	2008-02-07 22:24:27.000000000 +0000
-@@ -2102,6 +2102,10 @@
-             }
-             lastbutton = NULL;
-         }
-+        else if (action == "MENU")
-+        {
-+            parent->doMenu();
-+        }
-         else if (action == "EJECT")
-         {
-             myth_eject();
-@@ -2482,6 +2486,8 @@
- 
-     if (d->foundtheme)
-         d->parseMenu(menufile);
-+
-+    m_menuPopup = NULL;
- }
- 
- MythThemedMenu::~MythThemedMenu(void)
-@@ -2592,3 +2598,102 @@
-     MythScreenType::aboutToShow();
-     d->updateLCD();
- }
-+void MythThemedMenu::doMenu()
-+{
-+    int allowsd = gContext->GetNumSetting("AllowQuitShutdown");
-+    if (m_menuPopup)
-+        return;
-+    QString label = "System Menu";
-+    MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
-+    m_menuPopup = new MythDialogBox(label, mainStack, "menuPopup");
-+    if (m_menuPopup->Create())
-+        mainStack->AddScreen(m_menuPopup);
-+
-+
-+    if ( allowsd != 0 && allowsd !=4  )
-+    {
-+        m_menuPopup->SetReturnEvent(this,"popmenu_exit");
-+        m_menuPopup->AddButton("Shutdown");
-+        m_menuPopup->AddButton("Reboot");
-+        m_menuPopup->AddButton("About");
-+        m_menuPopup->AddButton("Cancel");
-+    }
-+    else
-+    {
-+        m_menuPopup->SetReturnEvent(this,"popmenu_noexit");
-+        m_menuPopup->AddButton("About");
-+        m_menuPopup->AddButton("Cancel");
-+    }
-+}
-+
-+void MythThemedMenu::aboutScreen()
-+{
-+{
-+        extern const char *myth_source_version;
-+        extern const char *myth_source_path;
-+        QString distro_line;
-+        distro_line="";
-+
-+        QFile file("/etc/os_myth_release");
-+        if ( file.open(IO_ReadOnly | IO_Translate) )
-+        {
-+            QTextStream t( &file );        // use a text stream
-+            distro_line = t.readLine();
-+            file.close();
-+        }
-+
-+        QString label = "";
-+        label.append(QObject::tr("Revision: ") + myth_source_version   + "  \n  Branch:" +  myth_source_path  + "\n" + distro_line );
-+
-+        MythScreenStack *mainStack = GetMythMainWindow()->GetMainStack();
-+        m_menuPopup = new MythDialogBox(label, mainStack, "About");
-+        if (m_menuPopup->Create())
-+            mainStack->AddScreen(m_menuPopup);
-+
-+        m_menuPopup->SetReturnEvent(this,"About");
-+        m_menuPopup->AddButton("OK!");
-+    }
-+}
-+
-+void MythThemedMenu::customEvent(QCustomEvent *event)
-+{
-+    if (event->type() == kMythDialogBoxCompletionEventType)
-+    {
-+        DialogCompletionEvent *dce =
-+                dynamic_cast<DialogCompletionEvent*>(event);
-+
-+        QString resultid= dce->GetId();
-+        int buttonnum  = dce->GetResult();
-+        if (resultid == "popmenu_exit")
-+        {
-+            if (buttonnum == 0)
-+            {
-+                QString halt_cmd = gContext->GetSetting("HaltCommand",
-+                        "sudo /sbin/halt -p");
-+                if (!halt_cmd.isEmpty())
-+                    system(halt_cmd.ascii());
-+            }
-+
-+            if (buttonnum == 1)
-+            {
-+                QString reboot_cmd = gContext->GetSetting("RebootCommand",
-+                        "sudo /sbin/reboot");
-+                if (!reboot_cmd.isEmpty())
-+                    system(reboot_cmd.ascii());
-+            }
-+
-+            if (buttonnum == 2)
-+            {
-+                aboutScreen();
-+            }
-+        }
-+
-+        if (resultid == "popmenu_noexit")
-+        {
-+            if (buttonnum == 0)
-+                aboutScreen();
-+        }
-+
-+        m_menuPopup = NULL;
-+    }
-+}
diff --git a/abs/mv-core/myth/stable/mythtv-release-fixes/myththemedmenu.h.patch b/abs/mv-core/myth/stable/mythtv-release-fixes/myththemedmenu.h.patch
deleted file mode 100644
index 9744b11..0000000
--- a/abs/mv-core/myth/stable/mythtv-release-fixes/myththemedmenu.h.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- libs/libmythui/myththemedmenu.h.orig	2008-01-31 15:26:45.000000000 +0000
-+++ libs/libmythui/myththemedmenu.h	2008-02-07 21:00:22.000000000 +0000
-@@ -2,6 +2,7 @@
- #define MYTHTHEMEDMENU_H_
- 
- #include "mythscreentype.h"
-+#include "mythdialogbox.h"
- 
- class MythMainWindow;
- class MythThemedMenuPrivate;
-@@ -26,8 +27,14 @@
- 
-     void ReloadTheme(void);
-     void ReloadExitKey(void);
-+
-     virtual void aboutToShow(void);
- 
-+    void doMenu();
-+    void aboutScreen();
-+    MythDialogBox *m_menuPopup;
-+    void customEvent(QCustomEvent *event);
-+
-   protected:
-     virtual bool keyPressEvent(QKeyEvent *e);
-     virtual void gestureEvent(MythUIType *origtype, MythGestureEvent *ge);
diff --git a/abs/mv-core/myth/stable/mythtv-release-fixes/mythtv.install b/abs/mv-core/myth/stable/mythtv-release-fixes/mythtv.install
deleted file mode 100755
index 2c87aee..0000000
--- a/abs/mv-core/myth/stable/mythtv-release-fixes/mythtv.install
+++ /dev/null
@@ -1,59 +0,0 @@
-
-# arg 1:  the new package version
-pre_install () {
-        echo "backing up the database"
-                dbver=`pacman -Q mythtv-release-fixes | awk  ' { print $2 } '`
-        if [ ! -e /data/databases_backup ]
-        then
-                mkdir -p /data/database_backup
-        fi
-        mysqldump -u mythtv -pmythtv mythconverg -c > /data/database_backup/${dbver}.dump.sql
-}
-
-post_install() {
-  	mkdir -p /data/home
-        /usr/sbin/useradd -G users,video,audio,optical  -m -d /data/home/mythtv mythtv
-        /usr/sbin/usermod -G users,video,audio,optical mythtv
-#        mkdir /var/log/mythtv
-#        chown -R mythtv:users /var/log/mythtv
-        dbver=`pacman -Q mythtv-release-fixes | awk  ' { print $2 } '`
-        if [ ! -e /data/database_backup ]
-        then
-                mkdir -p /data/database_backup
-        fi
-	chown mythtv:nobody /data/database_backup
-	chmod g+s  /data/database_backup
-        
-	mysqldump -u mythtv -pmythtv mythconverg -c > /data/database_backup/${dbver}.dump.sql
-	grep -q /usr/local/lib  /etc/ld.so.conf
-	if [ $? = 1 ]
-	then
-		echo "/usr/local/lib" >> /etc/ld.so.conf
-	fi
-
-}
-pre_upgrade () {
- pre_install
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install
-
-  /bin/true
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  /bin/true
-}
-
-# arg 1:  the old package version
-post_remove() {
-/bint/true
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/mv-core/myth/stable/mythtv-release-fixes/pop_be_restart.cpp.patch b/abs/mv-core/myth/stable/mythtv-release-fixes/pop_be_restart.cpp.patch
deleted file mode 100644
index a7a5326..0000000
--- a/abs/mv-core/myth/stable/mythtv-release-fixes/pop_be_restart.cpp.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- libs/libmythui/myththemedmenu.cpp.orig	2008-03-17 15:54:00.000000000 -0500
-+++ libs/libmythui/myththemedmenu.cpp	2008-03-17 15:54:09.000000000 -0500
-@@ -2615,12 +2615,14 @@
-         m_menuPopup->SetReturnEvent(this,"popmenu_exit");
-         m_menuPopup->AddButton("Shutdown");
-         m_menuPopup->AddButton("Reboot");
-+        m_menuPopup->AddButton("MythBackend restart");
-         m_menuPopup->AddButton("About");
-         m_menuPopup->AddButton("Cancel");
-     }
-     else
-     {
-         m_menuPopup->SetReturnEvent(this,"popmenu_noexit");
-+        m_menuPopup->AddButton("MythBackend restart");
-         m_menuPopup->AddButton("About");
-         m_menuPopup->AddButton("Cancel");
-     }
-@@ -2655,6 +2657,11 @@
-     }
- }
- 
-+void MythThemedMenu::Restartmythbackend()
-+{
-+    system("/usr/MythVantage/bin/mythbeselect -restart");
-+}
-+
- void MythThemedMenu::customEvent(QCustomEvent *event)
- {
-     if (event->type() == kMythDialogBoxCompletionEventType)
-@@ -2684,6 +2691,10 @@
- 
-             if (buttonnum == 2)
-             {
-+                Restartmythbackend();
-+            }
-+            if (buttonnum == 3)
-+            {
-                 aboutScreen();
-             }
-         }
-@@ -2691,6 +2702,10 @@
-         if (resultid == "popmenu_noexit")
-         {
-             if (buttonnum == 0)
-+            {
-+                Restartmythbackend();
-+            }
-+            if (buttonnum == 1)
-                 aboutScreen();
-         }
- 
diff --git a/abs/mv-core/myth/stable/mythtv-release-fixes/pop_be_restart.h.patch b/abs/mv-core/myth/stable/mythtv-release-fixes/pop_be_restart.h.patch
deleted file mode 100644
index 1fba435..0000000
--- a/abs/mv-core/myth/stable/mythtv-release-fixes/pop_be_restart.h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- libs/libmythui/myththemedmenu.h.orig	2008-03-17 15:48:28.000000000 -0500
-+++ libs/libmythui/myththemedmenu.h	2008-03-17 15:48:30.000000000 -0500
-@@ -32,6 +32,7 @@
- 
-     void doMenu();
-     void aboutScreen();
-+    void Restartmythbackend();
-     MythDialogBox *m_menuPopup;
-     void customEvent(QCustomEvent *event);
- 
diff --git a/abs/mv-core/myth/stable/mythtv-release-fixes/reload.patch b/abs/mv-core/myth/stable/mythtv-release-fixes/reload.patch
deleted file mode 100644
index 9cc2044..0000000
--- a/abs/mv-core/myth/stable/mythtv-release-fixes/reload.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- programs/mythfrontend/main.cpp	2007-11-13 15:34:40.000000000 +0000
-+++ programs/mythfrontend/main.cpp.new	2007-11-13 15:36:15.000000000 +0000
-@@ -72,6 +72,9 @@
-     RunProgramGuide(chanid, channum);
- }
- 
-+
-+
-+
- void startFinder(void)
- {
-     RunProgramFind();
-@@ -761,6 +764,7 @@
-     }
- }
- 
-+
- void InitJumpPoints(void)
- {
-     REG_JUMP("Reload Theme", "", "", reloadTheme);
-@@ -784,6 +788,17 @@
-     TV::SetEmbedPbbFunc(PlaybackBox::RunPlaybackBox);
- }
- 
-+
-+void signal_USR1_handler(int){
-+      VERBOSE(VB_GENERAL, "SIG USR1 received, reloading theme");	
-+      RemoteSendMessage("CLEAR_SETTINGS_CACHE");
-+      gContext->ActivateSettingsCache(false);
-+      qApp->processEvents();
-+      GetMythMainWindow()->JumpTo("Reload Theme");
-+      gContext->removeCurrentLocation();
-+      gContext->ActivateSettingsCache(true);
-+}
-+
- int internal_media_init() 
- {
-     REG_MEDIAPLAYER("Internal", "MythTV's native media player.", 
-@@ -1411,7 +1426,12 @@
- 
-         if (!RunMenu(themedir))
-             break;
--
-+         struct sigaction new_action, old_action;
-+        /* Set up the structure to specify the new action. */
-+        new_action.sa_handler = signal_USR1_handler;
-+        ::sigemptyset(&new_action.sa_mask);
-+        new_action.sa_flags = 0;
-+        ::sigaction (SIGUSR1, &new_action, &old_action);
-         qApp->setMainWidget(mainWindow);
-         qApp->exec();
-     } while (!(exitstatus = handleExit()));
diff --git a/abs/mv-core/myth/stable/mythtv-release-fixes/screenshot_jump.patch b/abs/mv-core/myth/stable/mythtv-release-fixes/screenshot_jump.patch
deleted file mode 100644
index 8a5dee4..0000000
--- a/abs/mv-core/myth/stable/mythtv-release-fixes/screenshot_jump.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- programs/mythfrontend/networkcontrol.cpp.orig	2008-03-16 23:31:05.000000000 +0000
-+++ programs/mythfrontend/networkcontrol.cpp	2008-03-16 23:32:01.000000000 +0000
-@@ -80,6 +80,7 @@
-     jumpMap["zoneminderconsole"]     = "ZoneMinder Console";
-     jumpMap["zoneminderliveview"]    = "ZoneMinder Live View";
-     jumpMap["zoneminderevents"]      = "ZoneMinder Events";
-+    jumpMap["snapshot"]              = "ScreenShot";
- 
-     // These jump point names match the (lowercased) locations from gContext
-     jumpMap["channelrecpriority"]    = "Channel Recording Priorities";
diff --git a/abs/mv-core/myth/stable/mythtv-release-fixes/screenshots.diff b/abs/mv-core/myth/stable/mythtv-release-fixes/screenshots.diff
deleted file mode 100644
index 2b5dabe..0000000
--- a/abs/mv-core/myth/stable/mythtv-release-fixes/screenshots.diff
+++ /dev/null
@@ -1,458 +0,0 @@
-Index: libs/libmythui/mythmainwindow.cpp
-===================================================================
---- libs/libmythui/mythmainwindow.cpp	(revision 15827)
-+++ libs/libmythui/mythmainwindow.cpp	(working copy)
-@@ -504,6 +507,81 @@
-     d->repaintRegion = d->repaintRegion.unite(pe->region());
- }
- 
-+bool MythMainWindow::screenShot(QString fname, int x, int y, int x2, int y2, int w, int h)
-+{
-+    bool ret = false;
-+
-+    QString extension = fname.section('.', -1, -2);
-+
-+    if (extension == "jpg")
-+        extension = "JPEG";
-+    else 
-+        extension = "PNG";
-+
-+    VERBOSE(VB_GENERAL, QString("MythMainWindow::screenShot saving winId %1 to %2 (%3 x %4) [ %5/%6 - %7/%8]")
-+		        .arg(QApplication::desktop()->winId())
-+			.arg(fname)
-+			.arg(w)
-+			.arg(h)
-+			.arg(x)
-+			.arg(y)
-+			.arg(x2)
-+			.arg(y2));
-+
-+    QPixmap p;
-+    p = QPixmap::grabWindow( QApplication::desktop()->winId(), x, y, x2, y2);
-+
-+    QImage img = p.convertToImage();
-+
-+    if ( w == 0 )
-+        w = img.width();
-+
-+    if ( h == 0 )
-+        h = img.height();
-+
-+    VERBOSE(VB_GENERAL, QString("Scaling to %1 x %2 from %3 x %4")
-+		    .arg(w)
-+		    .arg(h)
-+		    .arg(img.width())
-+		    .arg(img.height()));
-+
-+    img = img.smoothScale( w, h , QImage::ScaleMin);
-+        
-+    if (img.save(fname ,extension))
-+    {
-+        VERBOSE(VB_GENERAL, "MythMainWindow::screenShot succeeded");
-+	ret = true;
-+    }
-+    else 
-+    {
-+	VERBOSE(VB_GENERAL, "MythMainWindow::screenShot Failed!");
-+	ret = false;
-+    }
-+
-+    return ret;
-+}
-+
-+bool MythMainWindow::screenShot(int x, int y, int x2, int y2)
-+{
-+    QString fPath = gContext->GetSetting("ScreenShotPath","/tmp/");
-+    QString fName = QString("/%1/myth-screenshot-%2.png")
-+	            .arg(gContext->GetSetting("ScreenShotPath","/tmp/"))
-+	            .arg(QDateTime::currentDateTime().toString("yyyy-mm-ddThh-mm-ss.zzz"));
-+
-+    return screenShot(fName, x, y, x2, y2, 0, 0);
-+}
-+
-+bool MythMainWindow::screenShot(QString fname, int w, int h)
-+{
-+    return screenShot(fname, 0, 0, -1, -1, w, h);
-+}
-+
-+
-+bool MythMainWindow::screenShot(void)
-+{
-+    return screenShot(0,0,-1,-1);
-+}
-+
- #ifdef USING_APPLEREMOTE
- // This may be possible via installEventFilter() instead?
- 
-Index: libs/libmythui/mythmainwindow.h
-===================================================================
---- libs/libmythui/mythmainwindow.h	(revision 15827)
-+++ libs/libmythui/mythmainwindow.h	(working copy)
-@@ -101,6 +101,11 @@
- 
-     MythPainter *GetCurrentPainter();
- 
-+    bool screenShot(QString fname, int x, int y, int x2, int y2, int w, int h);
-+    bool screenShot(int x, int y, int x2, int y2);
-+    bool screenShot(QString fname, int w, int h);
-+    bool screenShot(void);
-+
-     void AllowInput(bool allow);
- 
-     QRect GetUIScreenRect();
-Index: programs/mythfrontend/mediarenderer.cpp
-===================================================================
---- programs/mythfrontend/mediarenderer.cpp	(revision 15827)
-+++ programs/mythfrontend/mediarenderer.cpp	(working copy)
-@@ -9,6 +9,7 @@
- /////////////////////////////////////////////////////////////////////////////
- 
- #include "mediarenderer.h"
-+#include "mythfexml.h"
- #include "compat.h"
- 
- /////////////////////////////////////////////////////////////////////////////
-@@ -85,6 +86,11 @@
-                                  "http-get:*:video/mpeg:*,"
-                                  "http-get:*:video/nupplevideo:*,"
-                                  "http-get:*:video/x-ms-wmv:*";
-+        // ------------------------------------------------------------------
-+        // Register the MythFEXML protocol... 
-+        // ------------------------------------------------------------------
-+        VERBOSE(VB_UPNP, "MediaRenderer::Registering MythFEXML Service." );
-+        m_pHttpServer->RegisterExtension( new MythFEXML( RootDevice() ));
- 
-         // VERBOSE(VB_UPNP, QString( "MediaRenderer::Registering AVTransport Service." ));
-         // m_pHttpServer->RegisterExtension( m_pUPnpAVT = new UPnpAVTransport( RootDevice() ));
-Index: programs/mythfrontend/MFEXML_scpd.xml
-===================================================================
---- programs/mythfrontend/MFEXML_scpd.xml	(revision 0)
-+++ programs/mythfrontend/MFEXML_scpd.xml	(revision 0)
-@@ -0,0 +1,34 @@
-+<?xml version="1.0" encoding="utf-8"?>

-+<scpd xmlns="urn:schemas-upnp-org:service-1-0">

-+   <specVersion>

-+      <major>1</major>

-+      <minor>0</minor>

-+   </specVersion>

-+   <actionList>

-+      <action>

-+         <name>GetScreenShot</name>

-+         <argumentList>

-+            <argument>

-+               <name>Height</name>

-+               <direction>in</direction>

-+               <relatedStateVariable>A_ARG_TYPE_Height</relatedStateVariable>

-+            </argument>

-+            <argument>

-+               <name>Width</name>

-+               <direction>in</direction>

-+               <relatedStateVariable>A_ARG_TYPE_Width</relatedStateVariable>

-+            </argument>

-+         </argumentList>

-+      </action>

-+   </actionList>

-+   <serviceStateTable>

-+      <stateVariable sendEvents="no">

-+         <name>A_ARG_TYPE_Height</name>

-+         <dataType>i2</dataType>

-+      </stateVariable>

-+      <stateVariable sendEvents="no">

-+         <name>A_ARG_TYPE_Width</name>

-+         <dataType>i2</dataType>

-+      </stateVariable>

-+   </serviceStateTable>

-+</scpd>

-Index: programs/mythfrontend/globalsettings.cpp
-===================================================================
---- programs/mythfrontend/globalsettings.cpp	(revision 15827)
-+++ programs/mythfrontend/globalsettings.cpp	(working copy)
-@@ -2182,6 +2182,15 @@
-     return ge;
- }
- 
-+static HostLineEdit *ScreenShotPath()
-+{
-+    HostLineEdit *ge = new HostLineEdit("ScreenShotPath");
-+    ge->setLabel(QObject::tr("ScreenShotPath"));
-+    ge->setValue("");
-+    ge->setHelpText(QObject::tr("Path to screenshot storage location. Should be writable by the frontend"));
-+    return ge;
-+}
-+
- static HostCheckBox *UseArrowAccels()
- {
-     HostCheckBox *gc = new HostCheckBox("UseArrowAccels");
-@@ -4455,6 +4464,7 @@
-     MythMediaSettings *mediaMon = new MythMediaSettings();
- 
-     general->addChild(LircKeyPressedApp());
-+    general->addChild(ScreenShotPath());
-     general->addChild(row);
-     general->addChild(NetworkControlPort());
-     general->addChild(mediaMon);
-Index: programs/mythfrontend/mythfexml.h
-===================================================================
---- programs/mythfrontend/mythfexml.h	(revision 0)
-+++ programs/mythfrontend/mythfexml.h	(revision 0)
-@@ -0,0 +1,66 @@
-+//////////////////////////////////////////////////////////////////////////////
-+// Program Name: mythxml.h
-+//                                                                            
-+// Purpose - Myth Frontend XML protocol HttpServerExtension 
-+//                                                                            
-+//////////////////////////////////////////////////////////////////////////////
-+
-+#ifndef MYTHFEXML_H_
-+#define MYTHFEXML_H_
-+
-+#include <qdom.h>
-+#include <qdatetime.h> 
-+
-+#include "upnp.h"
-+#include "eventing.h"
-+#include "mythcontext.h"
-+
-+typedef enum 
-+{
-+    MFEXML_Unknown                =  0,
-+    MFEXML_GetScreenShot          =  1
-+
-+} MythFEXMLMethod;
-+
-+class MythFEXML : public Eventing
-+{
-+    private:
-+
-+        QString                      m_sControlUrl;
-+        QString                      m_sServiceDescFileName;
-+
-+    protected:
-+
-+        // Implement UPnpServiceImpl methods that we can
-+
-+        virtual QString GetServiceType      () { return "urn:schemas-mythtv-org:service:MythTv:1"; }
-+        virtual QString GetServiceId        () { return "urn:mythtv-org:serviceId:MYTHTV_1-0"; }
-+        virtual QString GetServiceControlURL() { return m_sControlUrl.mid( 1 ); }
-+        virtual QString GetServiceDescURL   () { return m_sControlUrl.mid( 1 ) + "/GetServDesc"; }
-+
-+    private:
-+
-+        MythFEXMLMethod GetMethod( const QString &sURI );
-+
-+	void    GetScreenShot    ( HTTPRequest *pRequest );
-+
-+    public:
-+                 MythFEXML( UPnpDevice *pDevice );
-+        virtual ~MythFEXML();
-+
-+        bool     ProcessRequest( HttpWorkerThread *pThread, HTTPRequest *pRequest );
-+
-+        // Static methods shared with HttpStatus
-+
-+};
-+
-+/////////////////////////////////////////////////////////////////////////////
-+/////////////////////////////////////////////////////////////////////////////
-+//
-+// 
-+//
-+/////////////////////////////////////////////////////////////////////////////
-+/////////////////////////////////////////////////////////////////////////////
-+#endif
-+
-+
-Index: programs/mythfrontend/main.cpp
-===================================================================
---- programs/mythfrontend/main.cpp	(revision 15827)
-+++ programs/mythfrontend/main.cpp	(working copy)
-@@ -799,6 +799,11 @@
-     }
- }
- 
-+void getScreenShot(void)
-+{
-+    (void) gContext->GetMainWindow()->screenShot();
-+}
-+
- void InitJumpPoints(void)
- {
-     REG_JUMP("Reload Theme", "", "", reloadTheme);
-@@ -817,6 +822,8 @@
-     REG_JUMP("Status Screen", "", "", showStatus);
-     REG_JUMP("Previously Recorded", "", "", startPrevious);
- 
-+    REG_JUMPEX("ScreenShot","","",getScreenShot,false);
-+
-     REG_KEY("qt", "DELETE", "Delete", "D");
-     REG_KEY("qt", "EDIT", "Edit", "E");
- 
-Index: programs/mythfrontend/mythfrontend.pro
-===================================================================
---- programs/mythfrontend/mythfrontend.pro	(revision 15827)
-+++ programs/mythfrontend/mythfrontend.pro	(working copy)
-@@ -15,7 +15,7 @@
- setting.files += util_menu.xml info_settings.xml main_settings.xml
- setting.files += recpriorities_settings.xml tv_search.xml tv_lists.xml
- setting.files += library.xml manage_recordings.xml optical_menu.xml tvmenu.xml
--setting.files += tv_settings.xml
-+setting.files += tv_settings.xml MFEXML_scpd.xml
- setting.extra = -ldconfig
- 
- INSTALLS += setting
-@@ -26,13 +26,13 @@
- HEADERS += manualbox.h playbackbox.h viewscheduled.h globalsettings.h
- HEADERS += manualschedule.h programrecpriority.h channelrecpriority.h
- HEADERS += statusbox.h networkcontrol.h custompriority.h
--HEADERS += mediarenderer.h
-+HEADERS += mediarenderer.h mythfexml.h
- HEADERS += mythappearance.h
- 
- SOURCES += main.cpp manualbox.cpp playbackbox.cpp viewscheduled.cpp
- SOURCES += globalsettings.cpp manualschedule.cpp programrecpriority.cpp 
- SOURCES += channelrecpriority.cpp statusbox.cpp networkcontrol.cpp
--SOURCES += mediarenderer.cpp
-+SOURCES += mediarenderer.cpp mythfexml.cpp
- SOURCES += custompriority.cpp
- SOURCES += mythappearance.cpp
- 
-Index: programs/mythfrontend/mythfexml.cpp
-===================================================================
---- programs/mythfrontend/mythfexml.cpp	(revision 0)
-+++ programs/mythfrontend/mythfexml.cpp	(revision 0)
-@@ -0,0 +1,135 @@
-+//////////////////////////////////////////////////////////////////////////////
-+// Program Name: MythXML.cpp
-+//                                                                            
-+// Purpose - Html & XML status HttpServerExtension
-+//                                                                            
-+// Created By  : David Blain                    Created On : Oct. 24, 2005
-+// Modified By : Daniel Kristjansson            Modified On: Oct. 31, 2007
-+//                                                                            
-+//////////////////////////////////////////////////////////////////////////////
-+
-+#include "mythfexml.h"
-+
-+#include "libmyth/mythcontext.h"
-+#include "libmyth/util.h"
-+#include "libmyth/mythdbcon.h"
-+
-+#include "mythmainwindow.h"
-+
-+#include <qtextstream.h>
-+#include <qdir.h>
-+#include <qfile.h>
-+#include <qregexp.h>
-+#include <qbuffer.h>
-+#include <math.h>
-+
-+#include "../../config.h"
-+
-+/////////////////////////////////////////////////////////////////////////////
-+//
-+/////////////////////////////////////////////////////////////////////////////
-+
-+MythFEXML::MythFEXML( UPnpDevice *pDevice ) : Eventing( "MythFEXML", "MYTHTV_Event" )
-+{
-+
-+    QString sUPnpDescPath = UPnp::g_pConfig->GetValue( "UPnP/DescXmlPath", m_sSharePath );
-+
-+    m_sServiceDescFileName = sUPnpDescPath + "MFEXML_scpd.xml";
-+    m_sControlUrl          = "/MythFE";
-+
-+    // Add our Service Definition to the device.
-+
-+    RegisterService( pDevice );
-+}
-+
-+/////////////////////////////////////////////////////////////////////////////
-+//
-+/////////////////////////////////////////////////////////////////////////////
-+
-+MythFEXML::~MythFEXML()
-+{
-+}
-+
-+/////////////////////////////////////////////////////////////////////////////
-+//
-+/////////////////////////////////////////////////////////////////////////////
-+
-+MythFEXMLMethod MythFEXML::GetMethod( const QString &sURI )
-+{
-+    if (sURI == "GetScreenShot"        ) return MFEXML_GetScreenShot;
-+
-+    return( MFEXML_Unknown );
-+}
-+
-+/////////////////////////////////////////////////////////////////////////////
-+//
-+/////////////////////////////////////////////////////////////////////////////
-+
-+bool MythFEXML::ProcessRequest( HttpWorkerThread *pThread, HTTPRequest *pRequest )
-+{
-+    try
-+    {
-+        if (pRequest)
-+        {
-+            if (pRequest->m_sBaseUrl != m_sControlUrl)
-+                return( false );
-+
-+            VERBOSE(VB_UPNP, QString("MythFEXML::ProcessRequest: %1 : %2")
-+			             .arg(pRequest->m_sMethod)
-+				     .arg(pRequest->m_sRawRequest));
-+
-+            switch( GetMethod( pRequest->m_sMethod ))
-+            {
-+		case MFEXML_GetScreenShot      : GetScreenShot    ( pRequest ); return true;
-+
-+
-+                default: 
-+                {
-+                    UPnp::FormatErrorResponse( pRequest, UPnPResult_InvalidAction );
-+
-+                    return true;
-+                }
-+            }
-+        }
-+    }
-+    catch( ... )
-+    {
-+        VERBOSE( VB_IMPORTANT, "MythFEXML::ProcessRequest() - Unexpected Exception" );
-+    }
-+
-+    return( false );
-+}           
-+
-+// ==========================================================================
-+// Request handler Methods
-+// ==========================================================================
-+
-+/////////////////////////////////////////////////////////////////////////////
-+//
-+/////////////////////////////////////////////////////////////////////////////
-+
-+void MythFEXML::GetScreenShot( HTTPRequest *pRequest )
-+{
-+    bool bDefaultPixmap = false;
-+
-+    pRequest->m_eResponseType   = ResponseTypeFile;
-+
-+    // Optional Parameters
-+
-+    int     nWidth    = pRequest->m_mapParams[ "Width"     ].toInt();
-+    int     nHeight   = pRequest->m_mapParams[ "Height"    ].toInt();
-+
-+    // Read Icon file path from database
-+
-+    QString sFileName = "/tmp/moo.jpg";
-+
-+
-+    if (!gContext->GetMainWindow()->screenShot(sFileName,nWidth, nHeight))
-+    {
-+        VERBOSE(VB_GENERAL, "MythFEXML: Failed to take screenshot. Aborting");
-+	return;
-+    }
-+
-+    pRequest->m_sFileName = sFileName;
-+}
-+
diff --git a/abs/mv-core/myth/stable/mythtv-release-fixes/screenshots2.diff b/abs/mv-core/myth/stable/mythtv-release-fixes/screenshots2.diff
deleted file mode 100644
index 64ce08c..0000000
--- a/abs/mv-core/myth/stable/mythtv-release-fixes/screenshots2.diff
+++ /dev/null
@@ -1,467 +0,0 @@
-Index: libs/libmythui/mythmainwindow.cpp
-===================================================================
---- libs/libmythui/mythmainwindow.cpp	(revision 16103)
-+++ libs/libmythui/mythmainwindow.cpp	(working copy)
-@@ -8,6 +8,8 @@
- #include <qpaintdevicemetrics.h>
- #include <qdir.h>
- #include <qfile.h>
-+#include <math.h>
-+
- #ifdef QWS
- #include <qwindowsystem_qws.h>
- #endif
-@@ -504,6 +507,83 @@
-     d->repaintRegion = d->repaintRegion.unite(pe->region());
- }
- 
-+bool MythMainWindow::screenShot(QString fname, int x, int y, int x2, int y2, int w, int h)
-+{
-+    bool ret = false;
-+
-+    QString extension = fname.section('.', -1, -1);
-+    if (extension == "jpg")
-+        extension = "JPEG";
-+    else 
-+        extension = "PNG";
-+
-+    VERBOSE(VB_GENERAL, QString("MythMainWindow::screenShot saving winId %1 to %2 (%3 x %4) [ %5/%6 - %7/%8] type %9")
-+		        .arg(QApplication::desktop()->winId())
-+			.arg(fname)
-+			.arg(w)
-+			.arg(h)
-+			.arg(x)
-+			.arg(y)
-+			.arg(x2)
-+			.arg(y2)
-+			.arg(extension));
-+
-+    QPixmap p;
-+    p = QPixmap::grabWindow( QApplication::desktop()->winId(), x, y, x2, y2);
-+
-+    QImage img = p.convertToImage();
-+
-+    if ( w == 0 )
-+        w = img.width();
-+
-+    if ( h == 0 )
-+        h = img.height();
-+
-+    VERBOSE(VB_GENERAL, QString("Scaling to %1 x %2 from %3 x %4")
-+		    .arg(w)
-+		    .arg(h)
-+		    .arg(img.width())
-+		    .arg(img.height()));
-+
-+    img = img.smoothScale( w, h , QImage::ScaleMin);
-+        
-+    if (img.save(fname ,extension,100))
-+    {
-+        VERBOSE(VB_GENERAL, "MythMainWindow::screenShot succeeded");
-+	ret = true;
-+    }
-+    else 
-+    {
-+	VERBOSE(VB_GENERAL, "MythMainWindow::screenShot Failed!");
-+	ret = false;
-+    }
-+
-+    return ret;
-+}
-+
-+bool MythMainWindow::screenShot(int x, int y, int x2, int y2)
-+{
-+    QString fPath = gContext->GetSetting("ScreenShotPath","/tmp/");
-+    QString fName = QString("/%1/myth-screenshot-%2.png")
-+	            .arg(fPath)
-+	            .arg(QDateTime::currentDateTime().toString("yyyy-mm-ddThh-mm-ss.zzz"));
-+
-+    return screenShot(fName, x, y, x2, y2, 0, 0);
-+}
-+
-+bool MythMainWindow::screenShot(QString fname, int w, int h)
-+{
-+    QRect sLoc = qApp->mainWidget()->geometry();
-+    return screenShot(fname, sLoc.left(),sLoc.top(), sLoc.width(), sLoc.height(), w, h);
-+}
-+
-+
-+bool MythMainWindow::screenShot(void)
-+{
-+    QRect sLoc = qApp->mainWidget()->geometry();
-+    return screenShot(sLoc.left(),sLoc.top(), sLoc.width(), sLoc.height());
-+}
-+
- #ifdef USING_APPLEREMOTE
- // This may be possible via installEventFilter() instead?
- 
-Index: libs/libmythui/mythmainwindow.h
-===================================================================
---- libs/libmythui/mythmainwindow.h	(revision 16103)
-+++ libs/libmythui/mythmainwindow.h	(working copy)
-@@ -101,6 +101,11 @@
- 
-     MythPainter *GetCurrentPainter();
- 
-+    bool screenShot(QString fname, int x, int y, int x2, int y2, int w, int h);
-+    bool screenShot(int x, int y, int x2, int y2);
-+    bool screenShot(QString fname, int w, int h);
-+    bool screenShot(void);
-+
-     void AllowInput(bool allow);
- 
-     QRect GetUIScreenRect();
-Index: programs/mythfrontend/mediarenderer.cpp
-===================================================================
---- programs/mythfrontend/mediarenderer.cpp	(revision 16103)
-+++ programs/mythfrontend/mediarenderer.cpp	(working copy)
-@@ -9,6 +9,7 @@
- /////////////////////////////////////////////////////////////////////////////
- 
- #include "mediarenderer.h"
-+#include "mythfexml.h"
- #include "compat.h"
- 
- /////////////////////////////////////////////////////////////////////////////
-@@ -89,6 +90,11 @@
-                                  "http-get:*:video/mpeg:*,"
-                                  "http-get:*:video/nupplevideo:*,"
-                                  "http-get:*:video/x-ms-wmv:*";
-+        // ------------------------------------------------------------------
-+        // Register the MythFEXML protocol... 
-+        // ------------------------------------------------------------------
-+        VERBOSE(VB_UPNP, "MediaRenderer::Registering MythFEXML Service." );
-+        m_pHttpServer->RegisterExtension( new MythFEXML( RootDevice() ));
- 
-         // VERBOSE(VB_UPNP, QString( "MediaRenderer::Registering AVTransport Service." ));
-         // m_pHttpServer->RegisterExtension( m_pUPnpAVT = new UPnpAVTransport( RootDevice() ));
-Index: programs/mythfrontend/MFEXML_scpd.xml
-===================================================================
---- programs/mythfrontend/MFEXML_scpd.xml	(revision 0)
-+++ programs/mythfrontend/MFEXML_scpd.xml	(revision 0)
-@@ -0,0 +1,34 @@
-+<?xml version="1.0" encoding="utf-8"?>

-+<scpd xmlns="urn:schemas-upnp-org:service-1-0">

-+   <specVersion>

-+      <major>1</major>

-+      <minor>0</minor>

-+   </specVersion>

-+   <actionList>

-+      <action>

-+         <name>GetScreenShot</name>

-+         <argumentList>

-+            <argument>

-+               <name>Height</name>

-+               <direction>in</direction>

-+               <relatedStateVariable>A_ARG_TYPE_Height</relatedStateVariable>

-+            </argument>

-+            <argument>

-+               <name>Width</name>

-+               <direction>in</direction>

-+               <relatedStateVariable>A_ARG_TYPE_Width</relatedStateVariable>

-+            </argument>

-+         </argumentList>

-+      </action>

-+   </actionList>

-+   <serviceStateTable>

-+      <stateVariable sendEvents="no">

-+         <name>A_ARG_TYPE_Height</name>

-+         <dataType>i2</dataType>

-+      </stateVariable>

-+      <stateVariable sendEvents="no">

-+         <name>A_ARG_TYPE_Width</name>

-+         <dataType>i2</dataType>

-+      </stateVariable>

-+   </serviceStateTable>

-+</scpd>

-Index: programs/mythfrontend/globalsettings.cpp
-===================================================================
---- programs/mythfrontend/globalsettings.cpp	(revision 16103)
-+++ programs/mythfrontend/globalsettings.cpp	(working copy)
-@@ -2220,6 +2220,15 @@
-     return ge;
- }
- 
-+static HostLineEdit *ScreenShotPath()
-+{
-+    HostLineEdit *ge = new HostLineEdit("ScreenShotPath");
-+    ge->setLabel(QObject::tr("ScreenShotPath"));
-+    ge->setValue("/tmp/");
-+    ge->setHelpText(QObject::tr("Path to screenshot storage location. Should be writable by the frontend"));
-+    return ge;
-+}
-+
- static HostCheckBox *UseArrowAccels()
- {
-     HostCheckBox *gc = new HostCheckBox("UseArrowAccels");
-@@ -4502,6 +4511,7 @@
-     MythMediaSettings *mediaMon = new MythMediaSettings();
- 
-     general->addChild(LircKeyPressedApp());
-+    general->addChild(ScreenShotPath());
-     general->addChild(row);
-     general->addChild(NetworkControlPort());
-     general->addChild(mediaMon);
-Index: programs/mythfrontend/mythfexml.h
-===================================================================
---- programs/mythfrontend/mythfexml.h	(revision 0)
-+++ programs/mythfrontend/mythfexml.h	(revision 0)
-@@ -0,0 +1,66 @@
-+//////////////////////////////////////////////////////////////////////////////
-+// Program Name: mythxml.h
-+//                                                                            
-+// Purpose - Myth Frontend XML protocol HttpServerExtension 
-+//                                                                            
-+//////////////////////////////////////////////////////////////////////////////
-+
-+#ifndef MYTHFEXML_H_
-+#define MYTHFEXML_H_
-+
-+#include <qdom.h>
-+#include <qdatetime.h> 
-+
-+#include "upnp.h"
-+#include "eventing.h"
-+#include "mythcontext.h"
-+
-+typedef enum 
-+{
-+    MFEXML_Unknown                =  0,
-+    MFEXML_GetScreenShot          =  1
-+
-+} MythFEXMLMethod;
-+
-+class MythFEXML : public Eventing
-+{
-+    private:
-+
-+        QString                      m_sControlUrl;
-+        QString                      m_sServiceDescFileName;
-+
-+    protected:
-+
-+        // Implement UPnpServiceImpl methods that we can
-+
-+        virtual QString GetServiceType      () { return "urn:schemas-mythtv-org:service:MythTv:1"; }
-+        virtual QString GetServiceId        () { return "urn:mythtv-org:serviceId:MYTHTV_1-0"; }
-+        virtual QString GetServiceControlURL() { return m_sControlUrl.mid( 1 ); }
-+        virtual QString GetServiceDescURL   () { return m_sControlUrl.mid( 1 ) + "/GetServDesc"; }
-+
-+    private:
-+
-+        MythFEXMLMethod GetMethod( const QString &sURI );
-+
-+	void    GetScreenShot    ( HTTPRequest *pRequest );
-+
-+    public:
-+                 MythFEXML( UPnpDevice *pDevice );
-+        virtual ~MythFEXML();
-+
-+        bool     ProcessRequest( HttpWorkerThread *pThread, HTTPRequest *pRequest );
-+
-+        // Static methods shared with HttpStatus
-+
-+};
-+
-+/////////////////////////////////////////////////////////////////////////////
-+/////////////////////////////////////////////////////////////////////////////
-+//
-+// 
-+//
-+/////////////////////////////////////////////////////////////////////////////
-+/////////////////////////////////////////////////////////////////////////////
-+#endif
-+
-+
-Index: programs/mythfrontend/main.cpp
-===================================================================
---- programs/mythfrontend/main.cpp	(revision 16103)
-+++ programs/mythfrontend/main.cpp	(working copy)
-@@ -800,6 +800,11 @@
-     }
- }
- 
-+void getScreenShot(void)
-+{
-+    (void) gContext->GetMainWindow()->screenShot();
-+}
-+
- void InitJumpPoints(void)
- {
-     REG_JUMP("Reload Theme", "", "", reloadTheme);
-@@ -818,6 +823,8 @@
-     REG_JUMP("Status Screen", "", "", showStatus);
-     REG_JUMP("Previously Recorded", "", "", startPrevious);
- 
-+    REG_JUMPEX("ScreenShot","","",getScreenShot,false);
-+
-     REG_KEY("qt", "DELETE", "Delete", "D");
-     REG_KEY("qt", "EDIT", "Edit", "E");
- 
-Index: programs/mythfrontend/mythfrontend.pro
-===================================================================
---- programs/mythfrontend/mythfrontend.pro	(revision 16103)
-+++ programs/mythfrontend/mythfrontend.pro	(working copy)
-@@ -15,7 +15,7 @@
- setting.files += util_menu.xml info_settings.xml main_settings.xml
- setting.files += recpriorities_settings.xml tv_search.xml tv_lists.xml
- setting.files += library.xml manage_recordings.xml optical_menu.xml tvmenu.xml
--setting.files += tv_settings.xml
-+setting.files += tv_settings.xml MFEXML_scpd.xml
- setting.extra = -ldconfig
- 
- INSTALLS += setting
-@@ -26,13 +26,13 @@
- HEADERS += manualbox.h playbackbox.h viewscheduled.h globalsettings.h
- HEADERS += manualschedule.h programrecpriority.h channelrecpriority.h
- HEADERS += statusbox.h networkcontrol.h custompriority.h
--HEADERS += mediarenderer.h
-+HEADERS += mediarenderer.h mythfexml.h
- HEADERS += mythappearance.h
- 
- SOURCES += main.cpp manualbox.cpp playbackbox.cpp viewscheduled.cpp
- SOURCES += globalsettings.cpp manualschedule.cpp programrecpriority.cpp 
- SOURCES += channelrecpriority.cpp statusbox.cpp networkcontrol.cpp
--SOURCES += mediarenderer.cpp
-+SOURCES += mediarenderer.cpp mythfexml.cpp
- SOURCES += custompriority.cpp
- SOURCES += mythappearance.cpp
- 
-Index: programs/mythfrontend/mythfexml.cpp
-===================================================================
---- programs/mythfrontend/mythfexml.cpp	(revision 0)
-+++ programs/mythfrontend/mythfexml.cpp	(revision 0)
-@@ -0,0 +1,133 @@
-+//////////////////////////////////////////////////////////////////////////////
-+// Program Name: MythXML.cpp
-+//                                                                            
-+// Purpose - Html & XML status HttpServerExtension
-+//                                                                            
-+// Created By  : David Blain                    Created On : Oct. 24, 2005
-+// Modified By : Daniel Kristjansson            Modified On: Oct. 31, 2007
-+//                                                                            
-+//////////////////////////////////////////////////////////////////////////////
-+
-+#include "mythfexml.h"
-+
-+#include "libmyth/mythcontext.h"
-+#include "libmyth/util.h"
-+#include "libmyth/mythdbcon.h"
-+
-+#include "mythmainwindow.h"
-+
-+#include <qtextstream.h>
-+#include <qdir.h>
-+#include <qfile.h>
-+#include <qregexp.h>
-+#include <qbuffer.h>
-+#include <math.h>
-+
-+#include "../../config.h"
-+
-+/////////////////////////////////////////////////////////////////////////////
-+//
-+/////////////////////////////////////////////////////////////////////////////
-+
-+MythFEXML::MythFEXML( UPnpDevice *pDevice ) : Eventing( "MythFEXML", "MYTHTV_Event" )
-+{
-+
-+    QString sUPnpDescPath = UPnp::g_pConfig->GetValue( "UPnP/DescXmlPath", m_sSharePath );
-+
-+    m_sServiceDescFileName = sUPnpDescPath + "MFEXML_scpd.xml";
-+    m_sControlUrl          = "/MythFE";
-+
-+    // Add our Service Definition to the device.
-+
-+    RegisterService( pDevice );
-+}
-+
-+/////////////////////////////////////////////////////////////////////////////
-+//
-+/////////////////////////////////////////////////////////////////////////////
-+
-+MythFEXML::~MythFEXML()
-+{
-+}
-+
-+/////////////////////////////////////////////////////////////////////////////
-+//
-+/////////////////////////////////////////////////////////////////////////////
-+
-+MythFEXMLMethod MythFEXML::GetMethod( const QString &sURI )
-+{
-+    if (sURI == "GetScreenShot"        ) return MFEXML_GetScreenShot;
-+
-+    return( MFEXML_Unknown );
-+}
-+
-+/////////////////////////////////////////////////////////////////////////////
-+//
-+/////////////////////////////////////////////////////////////////////////////
-+
-+bool MythFEXML::ProcessRequest( HttpWorkerThread *pThread, HTTPRequest *pRequest )
-+{
-+    try
-+    {
-+        if (pRequest)
-+        {
-+            if (pRequest->m_sBaseUrl != m_sControlUrl)
-+                return( false );
-+
-+            VERBOSE(VB_UPNP, QString("MythFEXML::ProcessRequest: %1 : %2")
-+			             .arg(pRequest->m_sMethod)
-+				     .arg(pRequest->m_sRawRequest));
-+
-+            switch( GetMethod( pRequest->m_sMethod ))
-+            {
-+		case MFEXML_GetScreenShot      : GetScreenShot    ( pRequest ); return true;
-+
-+
-+                default: 
-+                {
-+                    UPnp::FormatErrorResponse( pRequest, UPnPResult_InvalidAction );
-+
-+                    return true;
-+                }
-+            }
-+        }
-+    }
-+    catch( ... )
-+    {
-+        VERBOSE( VB_IMPORTANT, "MythFEXML::ProcessRequest() - Unexpected Exception" );
-+    }
-+
-+    return( false );
-+}           
-+
-+// ==========================================================================
-+// Request handler Methods
-+// ==========================================================================
-+
-+/////////////////////////////////////////////////////////////////////////////
-+//
-+/////////////////////////////////////////////////////////////////////////////
-+
-+void MythFEXML::GetScreenShot( HTTPRequest *pRequest )
-+{
-+    pRequest->m_eResponseType   = ResponseTypeFile;
-+
-+    // Optional Parameters
-+
-+    int     nWidth    = pRequest->m_mapParams[ "Width"     ].toInt();
-+    int     nHeight   = pRequest->m_mapParams[ "Height"    ].toInt();
-+
-+    // Read Icon file path from database
-+
-+    QString sFileName = QString("/%1/myth-screenshot-XML.jpg")
-+                    .arg(gContext->GetSetting("ScreenShotPath","/tmp/"));
-+
-+    if (!gContext->GetMainWindow()->screenShot(sFileName,nWidth, nHeight))
-+    {
-+        VERBOSE(VB_GENERAL, "MythFEXML: Failed to take screenshot. Aborting");
-+	return;
-+    }
-+
-+    pRequest->m_sFileName = sFileName;
-+}
-+
diff --git a/abs/mv-core/myth/stable/mythtv-release-fixes/smolt_jump.patch b/abs/mv-core/myth/stable/mythtv-release-fixes/smolt_jump.patch
deleted file mode 100644
index ca9bd08..0000000
--- a/abs/mv-core/myth/stable/mythtv-release-fixes/smolt_jump.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- programs/mythfrontend/networkcontrol.cpp.orig	2008-03-23 23:00:25.000000000 +0000
-+++ programs/mythfrontend/networkcontrol.cpp	2008-03-23 23:01:33.000000000 +0000
-@@ -81,6 +81,7 @@
-     jumpMap["zoneminderliveview"]    = "ZoneMinder Live View";
-     jumpMap["zoneminderevents"]      = "ZoneMinder Events";
-     jumpMap["snapshot"]              = "ScreenShot";
-+    jumpMap["mythsmolt"]             = "MythSmolt";
- 
-     // These jump point names match the (lowercased) locations from gContext
-     jumpMap["channelrecpriority"]    = "Channel Recording Priorities";
diff --git a/abs/mv-core/myth/stable/mythtv-themes/PKGBUILD b/abs/mv-core/myth/stable/mythtv-themes/PKGBUILD
deleted file mode 100755
index 379f2d9..0000000
--- a/abs/mv-core/myth/stable/mythtv-themes/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-pkgname=mythtv-themes-release-fixes
-pkgver=21228
-pkgrel=1
-pkgdesc="themes for mythtv" 
-url="http://www.mythtv.org" 
-license="GPL" 
-depends=( ) 
-#makedepends=('sqlite3' 'sed') 
-conflicts=() 
-replaces=() 
-backup=() 
-#install='mythtv.install' 
-source=() 
-arch=('i686')
-md5sums=() 
-_svntrunk=http://svn.mythtv.org/svn/branches/release-0-21-fixes/myththemes
-_svnmod=myththemes
-
-build() { 
-echo svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
- svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
-#svn co http://cvs.mythtv.org/svn/trunk/mythtv
-#svn co http://cvs.mythtv.org/svn/trunk/mythplugins
-#svn co http://cvs.mythtv.org/svn/trunk/myththemes
-cd $startdir/src/myththemes
-   make distclean
-    ./configure --prefix=/usr 
-    #./configure --disable-all --enable-mythweather --enable-fftw --disable-aac  
-   make  || return 1
-   make INSTALL_ROOT=$startdir/pkg install
-#   cd $startdir/src/$pkgname
-#   cd mythmovietime
-#   make || return 1
-#   make INSTALL_ROOT=$startdir/pkg install
-
-}
diff --git a/abs/mv-core/myth/stable/mythvideo/PKGBUILD b/abs/mv-core/myth/stable/mythvideo/PKGBUILD
deleted file mode 100644
index 5afee6a..0000000
--- a/abs/mv-core/myth/stable/mythvideo/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-pkgname=mythvideo-release-fixes
-pkgver=21228
-pkgrel=1
-pkgdesc="Video playback and browsing plugin for MythTV"
-url="http://www.mythtv.org"
-arch=('i686')
-depends=('mythtv-release-fixes'  'perlxml' 'perl-libwww' 'perl-uri' 'perl-xml-simple' 'ffmpeg')
-license="GPL"
-conflicts=('mythtv-plugins-release-fixes')
-groups=('mythtv-all-plugins-release-fixes')
-
-source=()
-_svntrunk=http://svn.mythtv.org/svn/branches/release-0-21-fixes/mythplugins
-_svntrunk=http://svn.mythtv.org/svn/branches/release-0-21-fixes/mythplugins
-_svnmod=mythplugins
-
-build() {
-	cd $startdir/src/
-	echo svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
- 	svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
-	cd $startdir/src/mythplugins
-  	make distclean 
-	PLUGIN=mythvideo
-	grep -q  programs-libs.pro  $PLUGIN/$PLUGIN/$PLUGIN.pro
-	if [ $? != 0 ]
-	then
-			echo "include ( ../../programs-libs.pro )" >> $PLUGIN/$PLUGIN/$PLUGIN.pro
-				msg "appending program lib"
-			fi
-   ./configure --prefix=/usr  --disable-all --enable-mythvideo  --enable-transcode  
-
-   make -j 2 || return 1
-
-   make INSTALL_ROOT=$startdir/pkg install
-}
-md5sums=('2a9fbf45ae58a3a35857ce8d7c4d12db')
diff --git a/abs/mv-core/myth/stable/mythweather/PKGBUILD b/abs/mv-core/myth/stable/mythweather/PKGBUILD
deleted file mode 100644
index dae89df..0000000
--- a/abs/mv-core/myth/stable/mythweather/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-pkgname=mythweather-release-fixes
-pkgver=21228
-pkgrel=1
-pkgdesc="Weather checking plugin for MythTV"
-url="http://www.mythtv.org"
-arch=('i686')
-depends=('mythtv-release-fixes' 'wget' 'perl-xml-sax' 'perl-soap-lite' 'perl-image-size'  'imagemagick')
-conflicts=('mythtv-plugins-release-fixes')
-groups=('mythtv-all-plugins-release-fixes')
-license="GPL"
-source=()
-#_svntrunk=http://cvs.mythtv.org/svn/trunk/mythplugins
-_svntrunk=http://svn.mythtv.org/svn/branches/release-0-21-fixes/mythplugins
-
-_svntrunk=http://svn.mythtv.org/svn/branches/release-0-21-fixes/mythplugins
-_svnmod=mythplugins
-
-build() {
-	cd $startdir/src/
-	echo svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
- 	svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
-	cd $startdir/src/mythplugins
-	make distclean
-	PLUGIN=mythweather
-	grep -q  programs-libs.pro  $PLUGIN/$PLUGIN/$PLUGIN.pro
-	if [ $? != 0 ]
-	then
-			echo "include ( ../../programs-libs.pro )" >> $PLUGIN/$PLUGIN/$PLUGIN.pro
-				msg "appending program lib"
-			fi
-   ./configure  --enable-opengl --disable-all --enable-mythweather --prefix=/usr
- 
-   make -j 2 || return 1
-
-   make INSTALL_ROOT=$startdir/pkg install
-}
-md5sums=('2a9fbf45ae58a3a35857ce8d7c4d12db')
diff --git a/abs/mv-core/myth/stable/mythweb/PKGBUILD b/abs/mv-core/myth/stable/mythweb/PKGBUILD
deleted file mode 100755
index 52341a4..0000000
--- a/abs/mv-core/myth/stable/mythweb/PKGBUILD
+++ /dev/null
@@ -1,34 +0,0 @@
-pkgname=mythweb-release-fixes
-pkgver=21228
-pkgrel=1
-pkgdesc="mythweb" 
-url="http://www.mythtv.org" 
-license="GPL" 
-arch=('i686')
-depends=(php fcgi libmysqlclient ) 
-conflicts=('mythweb' 'mythweb-fixes') 
-replaces=() 
-backup=() 
-install='mythweb.install' 
-source=(mythweblighttpd.patch dblogininit.inc ) 
-md5sums=() 
-_svntrunk=http://svn.mythtv.org/svn/branches/release-0-21-fixes/mythplugins
-_svnmod=mythplugins
-build() { 
-echo svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
- svn co $_svntrunk --config-dir ./ -r $pkgver $_svnmod
-#svn co http://cvs.mythtv.org/svn/trunk/mythtv
-#svn co http://cvs.mythtv.org/svn/trunk/mythplugins
-#svn co http://cvs.mythtv.org/svn/trunk/myththemes
-cd $startdir/src/mythplugins
-
-#take care of fing mythweb
-mkdir -p $startdir/pkg/data/srv/httpd/htdocs/
-cp -rp mythweb $startdir/pkg/data/srv/httpd/htdocs/
-cp -f $startdir/src/dblogininit.inc $startdir/pkg/data/srv/httpd/htdocs/mythweb/includes/
-cd  $startdir/pkg/data/srv/httpd/htdocs/mythweb/includes
-patch -p0 < $startdir/src/mythweblighttpd.patch
-
-chown -R nobody:nobody $startdir/pkg/data/srv/httpd/htdocs/mythweb
-chmod -R  775 $startdir/pkg/data/srv/httpd/htdocs/mythweb
-}
diff --git a/abs/mv-core/myth/stable/mythweb/dblogininit.inc b/abs/mv-core/myth/stable/mythweb/dblogininit.inc
deleted file mode 100755
index c5395c5..0000000
--- a/abs/mv-core/myth/stable/mythweb/dblogininit.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-<?
- $_SERVER["db_server"] = "localhost";
- $_SERVER["db_name"] = "mythconverg";
- $_SERVER["db_login"] = "mythtv";
- $_SERVER["db_password"] = "mythtv";
-?>
diff --git a/abs/mv-core/myth/stable/mythweb/mythweb.install b/abs/mv-core/myth/stable/mythweb/mythweb.install
deleted file mode 100755
index e135b6c..0000000
--- a/abs/mv-core/myth/stable/mythweb/mythweb.install
+++ /dev/null
@@ -1,37 +0,0 @@
-
-# arg 1:  the new package version
-pre_install () {
-/bin/true
-}
-
-post_install() {
-	#cp /etc/lighttpd/lighttpd.conf /tmp
-#	sed -e "s/# .*  \"mod_fastcgi\",/\"mod_fastcgi\"\,/g" /tmp/lighttpd.conf > /etc/lighttpd/lighttpd.conf
- /bin/true
-
-}
-pre_upgrade () {
- pre_install
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install
-
-  /bin/true
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  /bin/true
-}
-
-# arg 1:  the old package version
-post_remove() {
-/bint/true
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/mv-core/myth/stable/mythweb/mythweblighttpd.patch b/abs/mv-core/myth/stable/mythweb/mythweblighttpd.patch
deleted file mode 100755
index 6403a88..0000000
--- a/abs/mv-core/myth/stable/mythweb/mythweblighttpd.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- database.php.orig	2007-12-31 21:25:30.000000000 +0000
-+++ database.php	2007-12-31 21:25:50.000000000 +0000
-@@ -18,6 +18,10 @@
-         custom_error("Please install the MySQL libraries for PHP.\n"
-                     .'The package is usually called something like php-mysql.');
-     }
-+     if (empty($_SERVER['db_server']) || empty($_SERVER['db_name']) || empty($_SERVER['db_login'])) {
-+	      require_once 'dblogininit.inc';
-+	      }
-+	
- 
- // No database connection info defined?
-     if (empty($_SERVER['db_server']) || empty($_SERVER['db_name']) || empty($_SERVER['db_login'])) {
diff --git a/abs/mv-core/myth/stable/syth-lacquer-clean/PKGBUILD b/abs/mv-core/myth/stable/syth-lacquer-clean/PKGBUILD
deleted file mode 100755
index 92e37d6..0000000
--- a/abs/mv-core/myth/stable/syth-lacquer-clean/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-pkgname=syth-lacquer-clean-wide
-pkgver=21228
-pkgrel=1
-pkgdesc=""
-url=""
-license=""
-depends=()
-makedepends=()
-conflicts=()
-replaces=()
-backup=()
- arch=('i686')
-#source=($pkgname.tar.bz2)
-source=(http://jmeyer.us/e107_files/downloads/SVN/$pkgname.tar.bz2)
-
-md5sums=()
-
-build() {
-  cd $startdir/src
-  mkdir -p $startdir/pkg/usr/share/mythtv/themes
-  cp -rp $pkgname $startdir/pkg/usr/share/mythtv/themes/
-
-}
diff --git a/abs/mv-core/myth/stable/syth-lacquer-wide/PKGBUILD b/abs/mv-core/myth/stable/syth-lacquer-wide/PKGBUILD
deleted file mode 100755
index edf4357..0000000
--- a/abs/mv-core/myth/stable/syth-lacquer-wide/PKGBUILD
+++ /dev/null
@@ -1,23 +0,0 @@
-pkgname=syth-lacquer-wide
-pkgver=21228
-pkgrel=1
-pkgdesc="Syth for mythtv .21"
-url=""
-license=""
-depends=()
-makedepends=()
-conflicts=()
-replaces=()
-backup=()
-arch='i686'
-
-source=(http://www.mythvantage.com/src/syth-lacquer-wide.tgz)
-
-md5sums=()
-
-build() {
-  cd $startdir/src
-  mkdir -p $startdir/pkg/usr/share/mythtv/themes
-  cp -rp $pkgname $startdir/pkg/usr/share/mythtv/themes/
-
-}
diff --git a/abs/mv-core/mythdb-initial/PKGBUILD b/abs/mv-core/mythdb-initial/PKGBUILD
deleted file mode 100755
index e4f2c5d..0000000
--- a/abs/mv-core/mythdb-initial/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-pkgname=mythdb-initial
-pkgver=1
-pkgrel=47
-pkgdesc="setup the initial mythtv database"
-url=""
-license=""
-depends=(mysql)
-makedepends=()
-conflicts=()
-replaces=()
-backup=()
-install=mythdb.install
-source=(mc.sql permissions.sql)
-md5sums=()
-arch=('i686')
-build() {
-  cd $startdir/src
-  mkdir -p $startdir/pkg/data/database
-  cp mc.sql  $startdir/pkg/data/database/mc.sql.initial
-  cp permissions.sql  $startdir/pkg/data/database/permissions.sql
-}
diff --git a/abs/mv-core/mythdb-initial/mc.sql b/abs/mv-core/mythdb-initial/mc.sql
deleted file mode 100755
index 73e7410..0000000
--- a/abs/mv-core/mythdb-initial/mc.sql
+++ /dev/null
@@ -1,2330 +0,0 @@
--- MySQL dump 10.11
---
--- Host: localhost    Database: mythconverg
--- ------------------------------------------------------
--- Server version	5.0.27
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
---
--- Table structure for table `archiveitems`
---
-
-DROP TABLE IF EXISTS `archiveitems`;
-CREATE TABLE `archiveitems` (
-  `intid` int(10) unsigned NOT NULL auto_increment,
-  `type` set('Recording','Video','File') default NULL,
-  `title` varchar(128) default NULL,
-  `subtitle` varchar(128) default NULL,
-  `description` text,
-  `startdate` varchar(30) default NULL,
-  `starttime` varchar(30) default NULL,
-  `size` int(10) unsigned NOT NULL,
-  `filename` text NOT NULL,
-  `hascutlist` tinyint(1) NOT NULL default '0',
-  `cutlist` text,
-  PRIMARY KEY  (`intid`),
-  KEY `title` (`title`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `archiveitems`
---
-
-LOCK TABLES `archiveitems` WRITE;
-/*!40000 ALTER TABLE `archiveitems` DISABLE KEYS */;
-/*!40000 ALTER TABLE `archiveitems` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `callsignnetworkmap`
---
-
-DROP TABLE IF EXISTS `callsignnetworkmap`;
-CREATE TABLE `callsignnetworkmap` (
-  `id` int(11) NOT NULL auto_increment,
-  `callsign` varchar(20) NOT NULL default '',
-  `network` varchar(20) NOT NULL default '',
-  PRIMARY KEY  (`id`),
-  UNIQUE KEY `callsign` (`callsign`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `callsignnetworkmap`
---
-
-LOCK TABLES `callsignnetworkmap` WRITE;
-/*!40000 ALTER TABLE `callsignnetworkmap` DISABLE KEYS */;
-/*!40000 ALTER TABLE `callsignnetworkmap` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `capturecard`
---
-
-DROP TABLE IF EXISTS `capturecard`;
-CREATE TABLE `capturecard` (
-  `cardid` int(10) unsigned NOT NULL auto_increment,
-  `videodevice` varchar(128) default NULL,
-  `audiodevice` varchar(128) default NULL,
-  `vbidevice` varchar(128) default NULL,
-  `cardtype` varchar(32) default 'V4L',
-  `defaultinput` varchar(32) default 'Television',
-  `audioratelimit` int(11) default NULL,
-  `hostname` varchar(255) default NULL,
-  `dvb_swfilter` int(11) default '0',
-  `dvb_sat_type` int(11) NOT NULL default '0',
-  `dvb_wait_for_seqstart` int(11) NOT NULL default '1',
-  `skipbtaudio` tinyint(1) default '0',
-  `dvb_on_demand` tinyint(4) NOT NULL default '0',
-  `dvb_diseqc_type` smallint(6) default NULL,
-  `firewire_port` int(10) unsigned NOT NULL default '0',
-  `firewire_node` int(10) unsigned NOT NULL default '2',
-  `firewire_speed` int(10) unsigned NOT NULL default '0',
-  `firewire_model` varchar(32) default NULL,
-  `firewire_connection` int(10) unsigned NOT NULL default '0',
-  `dbox2_port` int(10) unsigned NOT NULL default '31338',
-  `dbox2_httpport` int(10) unsigned NOT NULL default '80',
-  `dbox2_host` varchar(32) default NULL,
-  `signal_timeout` int(11) NOT NULL default '1000',
-  `channel_timeout` int(11) NOT NULL default '3000',
-  `dvb_tuning_delay` int(10) unsigned NOT NULL default '0',
-  `contrast` int(11) NOT NULL default '0',
-  `brightness` int(11) NOT NULL default '0',
-  `colour` int(11) NOT NULL default '0',
-  `hue` int(11) NOT NULL default '0',
-  `diseqcid` int(10) unsigned default NULL,
-  `dvb_eitscan` tinyint(1) NOT NULL default '1',
-  PRIMARY KEY  (`cardid`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `capturecard`
---
-
-LOCK TABLES `capturecard` WRITE;
-/*!40000 ALTER TABLE `capturecard` DISABLE KEYS */;
-/*!40000 ALTER TABLE `capturecard` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `cardinput`
---
-
-DROP TABLE IF EXISTS `cardinput`;
-CREATE TABLE `cardinput` (
-  `cardinputid` int(10) unsigned NOT NULL auto_increment,
-  `cardid` int(10) unsigned NOT NULL default '0',
-  `sourceid` int(10) unsigned NOT NULL default '0',
-  `inputname` varchar(32) NOT NULL default '',
-  `externalcommand` varchar(128) default NULL,
-  `preference` int(11) NOT NULL default '0',
-  `shareable` char(1) default 'N',
-  `tunechan` varchar(10) default NULL,
-  `startchan` varchar(10) default NULL,
-  `freetoaironly` tinyint(1) default '1',
-  `diseqc_port` smallint(6) default NULL,
-  `diseqc_pos` float default NULL,
-  `lnb_lof_switch` int(11) default '11700000',
-  `lnb_lof_hi` int(11) default '10600000',
-  `lnb_lof_lo` int(11) default '9750000',
-  `displayname` varchar(64) NOT NULL default '',
-  `radioservices` tinyint(1) default '1',
-  `dishnet_eit` tinyint(1) NOT NULL default '0',
-  `recpriority` int(11) NOT NULL default '0',
-  `quicktune` tinyint(4) NOT NULL default '0',
-  PRIMARY KEY  (`cardinputid`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `cardinput`
---
-
-LOCK TABLES `cardinput` WRITE;
-/*!40000 ALTER TABLE `cardinput` DISABLE KEYS */;
-/*!40000 ALTER TABLE `cardinput` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `channel`
---
-
-DROP TABLE IF EXISTS `channel`;
-CREATE TABLE `channel` (
-  `chanid` int(10) unsigned NOT NULL default '0',
-  `channum` varchar(10) NOT NULL default '',
-  `freqid` varchar(10) default NULL,
-  `sourceid` int(10) unsigned default NULL,
-  `callsign` varchar(20) NOT NULL default '',
-  `name` varchar(64) NOT NULL default '',
-  `icon` varchar(255) NOT NULL default 'none',
-  `finetune` int(11) default NULL,
-  `videofilters` varchar(255) NOT NULL default '',
-  `xmltvid` varchar(64) NOT NULL default '',
-  `recpriority` int(10) NOT NULL default '0',
-  `contrast` int(11) default '32768',
-  `brightness` int(11) default '32768',
-  `colour` int(11) default '32768',
-  `hue` int(11) default '32768',
-  `tvformat` varchar(10) NOT NULL default 'Default',
-  `commfree` tinyint(4) NOT NULL default '0',
-  `visible` tinyint(1) NOT NULL default '1',
-  `outputfilters` varchar(255) NOT NULL default '',
-  `useonairguide` tinyint(1) default '0',
-  `mplexid` smallint(6) default NULL,
-  `serviceid` mediumint(8) unsigned default NULL,
-  `atscsrcid` int(11) default NULL,
-  `tmoffset` int(11) NOT NULL default '0',
-  `atsc_major_chan` int(10) unsigned NOT NULL default '0',
-  `atsc_minor_chan` int(10) unsigned NOT NULL default '0',
-  `last_record` datetime NOT NULL,
-  `default_authority` varchar(32) NOT NULL default '',
-  `commmethod` int(11) NOT NULL default '-1',
-  PRIMARY KEY  (`chanid`),
-  KEY `channel_src` (`channum`,`sourceid`),
-  KEY `sourceid` (`sourceid`,`xmltvid`,`chanid`),
-  KEY `visible` (`visible`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `channel`
---
-
-LOCK TABLES `channel` WRITE;
-/*!40000 ALTER TABLE `channel` DISABLE KEYS */;
-/*!40000 ALTER TABLE `channel` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `codecparams`
---
-
-DROP TABLE IF EXISTS `codecparams`;
-CREATE TABLE `codecparams` (
-  `profile` int(10) unsigned NOT NULL default '0',
-  `name` varchar(128) NOT NULL default '',
-  `value` varchar(128) default NULL,
-  PRIMARY KEY  (`profile`,`name`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `codecparams`
---
-
-LOCK TABLES `codecparams` WRITE;
-/*!40000 ALTER TABLE `codecparams` DISABLE KEYS */;
-/*!40000 ALTER TABLE `codecparams` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `credits`
---
-
-DROP TABLE IF EXISTS `credits`;
-CREATE TABLE `credits` (
-  `person` mediumint(8) unsigned NOT NULL default '0',
-  `chanid` int(10) unsigned NOT NULL default '0',
-  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
-  `role` set('actor','director','producer','executive_producer','writer','guest_star','host','adapter','presenter','commentator','guest') NOT NULL default '',
-  UNIQUE KEY `chanid` (`chanid`,`starttime`,`person`,`role`),
-  KEY `person` (`person`,`role`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `credits`
---
-
-LOCK TABLES `credits` WRITE;
-/*!40000 ALTER TABLE `credits` DISABLE KEYS */;
-/*!40000 ALTER TABLE `credits` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `customexample`
---
-
-DROP TABLE IF EXISTS `customexample`;
-CREATE TABLE `customexample` (
-  `rulename` varchar(64) NOT NULL,
-  `fromclause` text NOT NULL,
-  `whereclause` text NOT NULL,
-  `search` tinyint(4) NOT NULL default '0',
-  PRIMARY KEY  (`rulename`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `customexample`
---
-
-LOCK TABLES `customexample` WRITE;
-/*!40000 ALTER TABLE `customexample` DISABLE KEYS */;
-INSERT INTO `customexample` VALUES ('New Flix','','program.category_type = \'movie\' AND program.airdate >= \n     YEAR(DATE_SUB(NOW(), INTERVAL 1 YEAR)) \nAND program.stars > 0.5 ',1);
-/*!40000 ALTER TABLE `customexample` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `diseqc_config`
---
-
-DROP TABLE IF EXISTS `diseqc_config`;
-CREATE TABLE `diseqc_config` (
-  `cardinputid` int(10) unsigned NOT NULL,
-  `diseqcid` int(10) unsigned NOT NULL,
-  `value` varchar(16) NOT NULL default '',
-  KEY `id` (`cardinputid`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `diseqc_config`
---
-
-LOCK TABLES `diseqc_config` WRITE;
-/*!40000 ALTER TABLE `diseqc_config` DISABLE KEYS */;
-/*!40000 ALTER TABLE `diseqc_config` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `diseqc_tree`
---
-
-DROP TABLE IF EXISTS `diseqc_tree`;
-CREATE TABLE `diseqc_tree` (
-  `diseqcid` int(10) unsigned NOT NULL auto_increment,
-  `parentid` int(10) unsigned default NULL,
-  `ordinal` tinyint(3) unsigned NOT NULL,
-  `type` varchar(16) NOT NULL default '',
-  `subtype` varchar(16) NOT NULL default '',
-  `description` varchar(32) NOT NULL default '',
-  `switch_ports` tinyint(3) unsigned NOT NULL default '0',
-  `rotor_hi_speed` float NOT NULL default '0',
-  `rotor_lo_speed` float NOT NULL default '0',
-  `rotor_positions` varchar(255) NOT NULL default '',
-  `lnb_lof_switch` int(10) NOT NULL default '0',
-  `lnb_lof_hi` int(10) NOT NULL default '0',
-  `lnb_lof_lo` int(10) NOT NULL default '0',
-  `cmd_repeat` int(11) NOT NULL default '1',
-  `lnb_pol_inv` tinyint(4) NOT NULL default '0',
-  PRIMARY KEY  (`diseqcid`),
-  KEY `parentid` (`parentid`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `diseqc_tree`
---
-
-LOCK TABLES `diseqc_tree` WRITE;
-/*!40000 ALTER TABLE `diseqc_tree` DISABLE KEYS */;
-/*!40000 ALTER TABLE `diseqc_tree` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `displayprofilegroups`
---
-
-DROP TABLE IF EXISTS `displayprofilegroups`;
-CREATE TABLE `displayprofilegroups` (
-  `name` varchar(128) NOT NULL,
-  `hostname` varchar(255) NOT NULL,
-  `profilegroupid` int(10) unsigned NOT NULL auto_increment,
-  PRIMARY KEY  (`name`,`hostname`),
-  UNIQUE KEY `profilegroupid` (`profilegroupid`)
-) ENGINE=MyISAM AUTO_INCREMENT=4 DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `displayprofilegroups`
---
-
-LOCK TABLES `displayprofilegroups` WRITE;
-/*!40000 ALTER TABLE `displayprofilegroups` DISABLE KEYS */;
-INSERT INTO `displayprofilegroups` VALUES ('CPU++','myhost',1),('CPU+','myhost',2),('CPU--','myhost',3);
-/*!40000 ALTER TABLE `displayprofilegroups` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `displayprofiles`
---
-
-DROP TABLE IF EXISTS `displayprofiles`;
-CREATE TABLE `displayprofiles` (
-  `profilegroupid` int(10) unsigned NOT NULL,
-  `profileid` int(10) unsigned NOT NULL auto_increment,
-  `value` varchar(128) NOT NULL,
-  `data` varchar(255) NOT NULL default '',
-  KEY `profilegroupid` (`profilegroupid`),
-  KEY `profileid` (`profileid`,`value`),
-  KEY `profileid_2` (`profileid`)
-) ENGINE=MyISAM AUTO_INCREMENT=13 DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `displayprofiles`
---
-
-LOCK TABLES `displayprofiles` WRITE;
-/*!40000 ALTER TABLE `displayprofiles` DISABLE KEYS */;
-INSERT INTO `displayprofiles` VALUES (1,1,'pref_priority','1'),(1,1,'pref_cmp0','> 0 0'),(1,1,'pref_decoder','ffmpeg'),(1,1,'pref_max_cpus','1'),(1,1,'pref_videorenderer','xv-blit'),(1,1,'pref_osdrenderer','softblend'),(1,1,'pref_osdfade','1'),(1,1,'pref_deint0','bobdeint'),(1,1,'pref_deint1','linearblend'),(1,1,'pref_filters',''),(1,2,'pref_priority','2'),(1,2,'pref_cmp0','> 0 0'),(1,2,'pref_decoder','ffmpeg'),(1,2,'pref_max_cpus','1'),(1,2,'pref_videorenderer','quartz-blit'),(1,2,'pref_osdrenderer','softblend'),(1,2,'pref_osdfade','1'),(1,2,'pref_deint0','linearblend'),(1,2,'pref_deint1','linearblend'),(1,2,'pref_filters',''),(2,3,'pref_priority','1'),(2,3,'pref_cmp0','<= 720 576'),(2,3,'pref_cmp1','> 0 0'),(2,3,'pref_decoder','ffmpeg'),(2,3,'pref_max_cpus','1'),(2,3,'pref_videorenderer','xv-blit'),(2,3,'pref_osdrenderer','softblend'),(2,3,'pref_osdfade','1'),(2,3,'pref_deint0','bobdeint'),(2,3,'pref_deint1','linearblend'),(2,3,'pref_filters',''),(2,4,'pref_priority','2'),(2,4,'pref_cmp0','<= 1280 720'),(2,4,'pref_cmp1','> 720 576'),(2,4,'pref_decoder','xvmc'),(2,4,'pref_max_cpus','1'),(2,4,'pref_videorenderer','xvmc-blit'),(2,4,'pref_osdrenderer','opengl'),(2,4,'pref_osdfade','1'),(2,4,'pref_deint0','bobdeint'),(2,4,'pref_deint1','onefield'),(2,4,'pref_filters',''),(2,5,'pref_priority','3'),(2,5,'pref_cmp0','<= 1280 720'),(2,5,'pref_cmp1','> 720 576'),(2,5,'pref_decoder','libmpeg2'),(2,5,'pref_max_cpus','1'),(2,5,'pref_videorenderer','xv-blit'),(2,5,'pref_osdrenderer','softblend'),(2,5,'pref_osdfade','1'),(2,5,'pref_deint0','bobdeint'),(2,5,'pref_deint1','onefield'),(2,5,'pref_filters',''),(2,6,'pref_priority','4'),(2,6,'pref_cmp0','> 0 0'),(2,6,'pref_decoder','xvmc'),(2,6,'pref_max_cpus','1'),(2,6,'pref_videorenderer','xvmc-blit'),(2,6,'pref_osdrenderer','ia44blend'),(2,6,'pref_osdfade','0'),(2,6,'pref_deint0','bobdeint'),(2,6,'pref_deint1','onefield'),(2,6,'pref_filters',''),(2,7,'pref_priority','5'),(2,7,'pref_cmp0','> 0 0'),(2,7,'pref_decoder','libmpeg2'),(2,7,'pref_max_cpus','1'),(2,7,'pref_videorenderer','xv-blit'),(2,7,'pref_osdrenderer','chromakey'),(2,7,'pref_osdfade','0'),(2,7,'pref_deint0','bobdeint'),(2,7,'pref_deint1','onefield'),(2,7,'pref_filters',''),(3,8,'pref_priority','1'),(3,8,'pref_cmp0','<= 720 576'),(3,8,'pref_cmp1','> 0 0'),(3,8,'pref_decoder','ivtv'),(3,8,'pref_max_cpus','1'),(3,8,'pref_videorenderer','ivtv'),(3,8,'pref_osdrenderer','ivtv'),(3,8,'pref_osdfade','1'),(3,8,'pref_deint0','none'),(3,8,'pref_deint1','none'),(3,8,'pref_filters',''),(3,9,'pref_priority','2'),(3,9,'pref_cmp0','<= 720 576'),(3,9,'pref_cmp1','> 0 0'),(3,9,'pref_decoder','xvmc'),(3,9,'pref_max_cpus','1'),(3,9,'pref_videorenderer','xvmc-blit'),(3,9,'pref_osdrenderer','ia44blend'),(3,9,'pref_osdfade','0'),(3,9,'pref_deint0','bobdeint'),(3,9,'pref_deint1','onefield'),(3,9,'pref_filters',''),(3,10,'pref_priority','3'),(3,10,'pref_cmp0','<= 1280 720'),(3,10,'pref_cmp1','> 720 576'),(3,10,'pref_decoder','xvmc'),(3,10,'pref_max_cpus','1'),(3,10,'pref_videorenderer','xvmc-blit'),(3,10,'pref_osdrenderer','ia44blend'),(3,10,'pref_osdfade','0'),(3,10,'pref_deint0','bobdeint'),(3,10,'pref_deint1','onefield'),(3,10,'pref_filters',''),(3,11,'pref_priority','4'),(3,11,'pref_cmp0','> 0 0'),(3,11,'pref_decoder','xvmc'),(3,11,'pref_max_cpus','1'),(3,11,'pref_videorenderer','xvmc-blit'),(3,11,'pref_osdrenderer','ia44blend'),(3,11,'pref_osdfade','0'),(3,11,'pref_deint0','bobdeint'),(3,11,'pref_deint1','onefield'),(3,11,'pref_filters',''),(3,12,'pref_priority','5'),(3,12,'pref_cmp0','> 0 0'),(3,12,'pref_decoder','libmpeg2'),(3,12,'pref_max_cpus','1'),(3,12,'pref_videorenderer','xv-blit'),(3,12,'pref_osdrenderer','chromakey'),(3,12,'pref_osdfade','0'),(3,12,'pref_deint0','none'),(3,12,'pref_deint1','none'),(3,12,'pref_filters','');
-/*!40000 ALTER TABLE `displayprofiles` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `dtv_multiplex`
---
-
-DROP TABLE IF EXISTS `dtv_multiplex`;
-CREATE TABLE `dtv_multiplex` (
-  `mplexid` smallint(6) NOT NULL auto_increment,
-  `sourceid` smallint(6) default NULL,
-  `transportid` int(11) default NULL,
-  `networkid` int(11) default NULL,
-  `frequency` int(11) default NULL,
-  `inversion` char(1) default 'a',
-  `symbolrate` int(11) default NULL,
-  `fec` varchar(10) default 'auto',
-  `polarity` char(1) default NULL,
-  `modulation` varchar(10) default 'auto',
-  `bandwidth` char(1) default 'a',
-  `lp_code_rate` varchar(10) default 'auto',
-  `transmission_mode` char(1) default 'a',
-  `guard_interval` varchar(10) default 'auto',
-  `visible` smallint(1) NOT NULL default '0',
-  `constellation` varchar(10) default 'auto',
-  `hierarchy` varchar(10) default 'auto',
-  `hp_code_rate` varchar(10) default 'auto',
-  `sistandard` varchar(10) default 'dvb',
-  `serviceversion` smallint(6) default '33',
-  `updatetimestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
-  PRIMARY KEY  (`mplexid`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `dtv_multiplex`
---
-
-LOCK TABLES `dtv_multiplex` WRITE;
-/*!40000 ALTER TABLE `dtv_multiplex` DISABLE KEYS */;
-/*!40000 ALTER TABLE `dtv_multiplex` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `dtv_privatetypes`
---
-
-DROP TABLE IF EXISTS `dtv_privatetypes`;
-CREATE TABLE `dtv_privatetypes` (
-  `sitype` varchar(4) NOT NULL default '',
-  `networkid` int(11) NOT NULL default '0',
-  `private_type` varchar(20) NOT NULL default '',
-  `private_value` varchar(100) NOT NULL default ''
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `dtv_privatetypes`
---
-
-LOCK TABLES `dtv_privatetypes` WRITE;
-/*!40000 ALTER TABLE `dtv_privatetypes` DISABLE KEYS */;
-INSERT INTO `dtv_privatetypes` VALUES ('dvb',9018,'channel_numbers','131'),('dvb',9018,'guide_fixup','2'),('dvb',256,'guide_fixup','1'),('dvb',257,'guide_fixup','1'),('dvb',256,'tv_types','1,150,134,133'),('dvb',257,'tv_types','1,150,134,133'),('dvb',4100,'sdt_mapping','1'),('dvb',4101,'sdt_mapping','1'),('dvb',4102,'sdt_mapping','1'),('dvb',4103,'sdt_mapping','1'),('dvb',4104,'sdt_mapping','1'),('dvb',4105,'sdt_mapping','1'),('dvb',4106,'sdt_mapping','1'),('dvb',4107,'sdt_mapping','1'),('dvb',4097,'sdt_mapping','1'),('dvb',4098,'sdt_mapping','1'),('dvb',4100,'tv_types','1,145,154'),('dvb',4101,'tv_types','1,145,154'),('dvb',4102,'tv_types','1,145,154'),('dvb',4103,'tv_types','1,145,154'),('dvb',4104,'tv_types','1,145,154'),('dvb',4105,'tv_types','1,145,154'),('dvb',4106,'tv_types','1,145,154'),('dvb',4107,'tv_types','1,145,154'),('dvb',4097,'tv_types','1,145,154'),('dvb',4098,'tv_types','1,145,154'),('dvb',4100,'guide_fixup','1'),('dvb',4101,'guide_fixup','1'),('dvb',4102,'guide_fixup','1'),('dvb',4103,'guide_fixup','1'),('dvb',4104,'guide_fixup','1'),('dvb',4105,'guide_fixup','1'),('dvb',4106,'guide_fixup','1'),('dvb',4107,'guide_fixup','1'),('dvb',4096,'guide_fixup','5'),('dvb',4097,'guide_fixup','1'),('dvb',4098,'guide_fixup','1'),('dvb',94,'tv_types','1,128'),('atsc',1793,'guide_fixup','3'),('dvb',40999,'guide_fixup','4'),('dvb',70,'force_guide_present','yes'),('dvb',70,'guide_ranges','80,80,96,96'),('dvb',4112,'channel_numbers','131'),('dvb',4115,'channel_numbers','131'),('dvb',4116,'channel_numbers','131'),('dvb',12802,'channel_numbers','131'),('dvb',12803,'channel_numbers','131'),('dvb',12829,'channel_numbers','131'),('dvb',40999,'parse_subtitle_list','1070,1308,1041,1306,1307,1030,1016,1131,1068,1069'),('dvb',4096,'guide_fixup','5');
-/*!40000 ALTER TABLE `dtv_privatetypes` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `dvdbookmark`
---
-
-DROP TABLE IF EXISTS `dvdbookmark`;
-CREATE TABLE `dvdbookmark` (
-  `serialid` varchar(16) NOT NULL default '',
-  `name` varchar(32) default NULL,
-  `title` smallint(6) NOT NULL default '0',
-  `audionum` tinyint(4) NOT NULL default '-1',
-  `subtitlenum` tinyint(4) NOT NULL default '-1',
-  `framenum` bigint(20) NOT NULL default '0',
-  `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
-  PRIMARY KEY  (`serialid`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `dvdbookmark`
---
-
-LOCK TABLES `dvdbookmark` WRITE;
-/*!40000 ALTER TABLE `dvdbookmark` DISABLE KEYS */;
-/*!40000 ALTER TABLE `dvdbookmark` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `dvdinput`
---
-
-DROP TABLE IF EXISTS `dvdinput`;
-CREATE TABLE `dvdinput` (
-  `intid` int(10) unsigned NOT NULL,
-  `hsize` int(10) unsigned default NULL,
-  `vsize` int(10) unsigned default NULL,
-  `ar_num` int(10) unsigned default NULL,
-  `ar_denom` int(10) unsigned default NULL,
-  `fr_code` int(10) unsigned default NULL,
-  `letterbox` tinyint(1) default NULL,
-  `v_format` varchar(16) default NULL,
-  PRIMARY KEY  (`intid`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `dvdinput`
---
-
-LOCK TABLES `dvdinput` WRITE;
-/*!40000 ALTER TABLE `dvdinput` DISABLE KEYS */;
-INSERT INTO `dvdinput` VALUES (1,720,480,16,9,1,1,'ntsc'),(2,720,480,16,9,1,0,'ntsc'),(3,720,480,4,3,1,1,'ntsc'),(4,720,480,4,3,1,0,'ntsc'),(5,720,576,16,9,3,1,'pal'),(6,720,576,16,9,3,0,'pal'),(7,720,576,4,3,3,1,'pal'),(8,720,576,4,3,3,0,'pal');
-/*!40000 ALTER TABLE `dvdinput` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `dvdtranscode`
---
-
-DROP TABLE IF EXISTS `dvdtranscode`;
-CREATE TABLE `dvdtranscode` (
-  `intid` int(11) NOT NULL auto_increment,
-  `input` int(10) unsigned default NULL,
-  `name` varchar(128) NOT NULL,
-  `sync_mode` int(10) unsigned default NULL,
-  `use_yv12` tinyint(1) default NULL,
-  `cliptop` int(11) default NULL,
-  `clipbottom` int(11) default NULL,
-  `clipleft` int(11) default NULL,
-  `clipright` int(11) default NULL,
-  `f_resize_h` int(11) default NULL,
-  `f_resize_w` int(11) default NULL,
-  `hq_resize_h` int(11) default NULL,
-  `hq_resize_w` int(11) default NULL,
-  `grow_h` int(11) default NULL,
-  `grow_w` int(11) default NULL,
-  `clip2top` int(11) default NULL,
-  `clip2bottom` int(11) default NULL,
-  `clip2left` int(11) default NULL,
-  `clip2right` int(11) default NULL,
-  `codec` varchar(128) NOT NULL,
-  `codec_param` varchar(128) default NULL,
-  `bitrate` int(11) default NULL,
-  `a_sample_r` int(11) default NULL,
-  `a_bitrate` int(11) default NULL,
-  `two_pass` tinyint(1) default NULL,
-  `tc_param` varchar(128) default NULL,
-  PRIMARY KEY  (`intid`)
-) ENGINE=MyISAM AUTO_INCREMENT=12 DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `dvdtranscode`
---
-
-LOCK TABLES `dvdtranscode` WRITE;
-/*!40000 ALTER TABLE `dvdtranscode` DISABLE KEYS */;
-INSERT INTO `dvdtranscode` VALUES (1,1,'Good',2,1,16,16,0,0,2,0,0,0,0,0,32,32,8,8,'divx5',NULL,1618,NULL,NULL,0,NULL),(2,2,'Excellent',2,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,'divx5',NULL,0,NULL,NULL,1,NULL),(3,2,'Good',2,1,0,0,8,8,0,0,0,0,0,0,0,0,0,0,'divx5',NULL,1618,NULL,NULL,0,NULL),(4,2,'Medium',2,1,0,0,8,8,5,5,0,0,0,0,0,0,0,0,'divx5',NULL,1200,NULL,NULL,0,NULL),(5,3,'Good',2,1,0,0,0,0,0,0,0,0,2,0,80,80,8,8,'divx5',NULL,0,NULL,NULL,0,NULL),(6,4,'Excellent',2,1,0,0,0,0,0,0,0,0,2,0,0,0,0,0,'divx5',NULL,0,NULL,NULL,1,NULL),(7,4,'Good',2,1,0,0,8,8,0,2,0,0,0,0,0,0,0,0,'divx5',NULL,1618,NULL,NULL,0,NULL),(8,5,'Good',1,1,16,16,0,0,5,0,0,0,0,0,40,40,8,8,'divx5',NULL,1618,NULL,NULL,0,NULL),(9,6,'Good',1,1,0,0,16,16,5,0,0,0,0,0,0,0,0,0,'divx5',NULL,1618,NULL,NULL,0,NULL),(10,7,'Good',1,1,0,0,0,0,1,0,0,0,0,0,76,76,8,8,'divx5',NULL,1618,NULL,NULL,0,NULL),(11,8,'Good',1,1,0,0,0,0,1,0,0,0,0,0,0,0,0,0,'divx5',NULL,1618,NULL,NULL,0,NULL);
-/*!40000 ALTER TABLE `dvdtranscode` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `eit_cache`
---
-
-DROP TABLE IF EXISTS `eit_cache`;
-CREATE TABLE `eit_cache` (
-  `chanid` int(10) NOT NULL,
-  `eventid` int(10) unsigned NOT NULL default '0',
-  `tableid` tinyint(3) unsigned NOT NULL,
-  `version` tinyint(3) unsigned NOT NULL,
-  `endtime` int(10) unsigned NOT NULL,
-  `status` tinyint(4) NOT NULL default '0',
-  PRIMARY KEY  (`chanid`,`eventid`,`status`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `eit_cache`
---
-
-LOCK TABLES `eit_cache` WRITE;
-/*!40000 ALTER TABLE `eit_cache` DISABLE KEYS */;
-/*!40000 ALTER TABLE `eit_cache` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `favorites`
---
-
-DROP TABLE IF EXISTS `favorites`;
-CREATE TABLE `favorites` (
-  `favid` int(11) unsigned NOT NULL auto_increment,
-  `userid` int(11) unsigned NOT NULL default '0',
-  `chanid` int(11) unsigned NOT NULL default '0',
-  PRIMARY KEY  (`favid`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `favorites`
---
-
-LOCK TABLES `favorites` WRITE;
-/*!40000 ALTER TABLE `favorites` DISABLE KEYS */;
-/*!40000 ALTER TABLE `favorites` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `filemarkup`
---
-
-DROP TABLE IF EXISTS `filemarkup`;
-CREATE TABLE `filemarkup` (
-  `filename` text NOT NULL,
-  `mark` bigint(20) NOT NULL,
-  `offset` varchar(32) default NULL,
-  `type` int(11) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `filemarkup`
---
-
-LOCK TABLES `filemarkup` WRITE;
-/*!40000 ALTER TABLE `filemarkup` DISABLE KEYS */;
-/*!40000 ALTER TABLE `filemarkup` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `gallerymetadata`
---
-
-DROP TABLE IF EXISTS `gallerymetadata`;
-CREATE TABLE `gallerymetadata` (
-  `image` varchar(255) NOT NULL,
-  `angle` int(11) NOT NULL,
-  PRIMARY KEY  (`image`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `gallerymetadata`
---
-
-LOCK TABLES `gallerymetadata` WRITE;
-/*!40000 ALTER TABLE `gallerymetadata` DISABLE KEYS */;
-/*!40000 ALTER TABLE `gallerymetadata` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `gamemetadata`
---
-
-DROP TABLE IF EXISTS `gamemetadata`;
-CREATE TABLE `gamemetadata` (
-  `system` varchar(128) NOT NULL default '',
-  `romname` varchar(128) NOT NULL default '',
-  `gamename` varchar(128) NOT NULL default '',
-  `genre` varchar(128) NOT NULL default '',
-  `year` varchar(10) NOT NULL default '',
-  `publisher` varchar(128) NOT NULL default '',
-  `favorite` tinyint(1) default NULL,
-  `rompath` varchar(255) NOT NULL default '',
-  `gametype` varchar(64) NOT NULL default '',
-  `diskcount` tinyint(1) NOT NULL default '1',
-  `country` varchar(128) NOT NULL default '',
-  `crc_value` varchar(64) NOT NULL default '',
-  `display` tinyint(1) NOT NULL default '1',
-  `version` varchar(64) NOT NULL default '',
-  KEY `system` (`system`),
-  KEY `year` (`year`),
-  KEY `romname` (`romname`),
-  KEY `gamename` (`gamename`),
-  KEY `genre` (`genre`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `gamemetadata`
---
-
-LOCK TABLES `gamemetadata` WRITE;
-/*!40000 ALTER TABLE `gamemetadata` DISABLE KEYS */;
-/*!40000 ALTER TABLE `gamemetadata` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `gameplayers`
---
-
-DROP TABLE IF EXISTS `gameplayers`;
-CREATE TABLE `gameplayers` (
-  `gameplayerid` int(10) unsigned NOT NULL auto_increment,
-  `playername` varchar(64) NOT NULL default '',
-  `workingpath` varchar(255) NOT NULL default '',
-  `rompath` varchar(255) NOT NULL default '',
-  `screenshots` varchar(255) NOT NULL default '',
-  `commandline` text NOT NULL,
-  `gametype` varchar(64) NOT NULL default '',
-  `extensions` varchar(128) NOT NULL default '',
-  `spandisks` tinyint(1) NOT NULL default '0',
-  PRIMARY KEY  (`gameplayerid`),
-  UNIQUE KEY `playername` (`playername`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `gameplayers`
---
-
-LOCK TABLES `gameplayers` WRITE;
-/*!40000 ALTER TABLE `gameplayers` DISABLE KEYS */;
-/*!40000 ALTER TABLE `gameplayers` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `housekeeping`
---
-
-DROP TABLE IF EXISTS `housekeeping`;
-CREATE TABLE `housekeeping` (
-  `tag` varchar(64) NOT NULL default '',
-  `lastrun` datetime default NULL,
-  PRIMARY KEY  (`tag`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `housekeeping`
---
-
-LOCK TABLES `housekeeping` WRITE;
-/*!40000 ALTER TABLE `housekeeping` DISABLE KEYS */;
-INSERT INTO `housekeeping` VALUES ('JobQueueCleanup','2006-10-07 14:23:53'),('InUseProgramsCleanup','2006-10-07 14:23:53'),('JobQueueRecover-myhost','2006-10-07 14:23:53'),('BackupDB','2008-02-21 08:34:39');
-/*!40000 ALTER TABLE `housekeeping` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `inputgroup`
---
-
-DROP TABLE IF EXISTS `inputgroup`;
-CREATE TABLE `inputgroup` (
-  `cardinputid` int(10) unsigned NOT NULL,
-  `inputgroupid` int(10) unsigned NOT NULL,
-  `inputgroupname` varchar(32) NOT NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `inputgroup`
---
-
-LOCK TABLES `inputgroup` WRITE;
-/*!40000 ALTER TABLE `inputgroup` DISABLE KEYS */;
-/*!40000 ALTER TABLE `inputgroup` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `inuseprograms`
---
-
-DROP TABLE IF EXISTS `inuseprograms`;
-CREATE TABLE `inuseprograms` (
-  `chanid` int(10) unsigned NOT NULL default '0',
-  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
-  `recusage` varchar(128) NOT NULL default '',
-  `lastupdatetime` datetime NOT NULL default '0000-00-00 00:00:00',
-  `hostname` varchar(255) NOT NULL default '',
-  `rechost` varchar(64) NOT NULL,
-  `recdir` varchar(255) NOT NULL default '',
-  KEY `chanid` (`chanid`,`starttime`),
-  KEY `recusage` (`recusage`,`lastupdatetime`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `inuseprograms`
---
-
-LOCK TABLES `inuseprograms` WRITE;
-/*!40000 ALTER TABLE `inuseprograms` DISABLE KEYS */;
-/*!40000 ALTER TABLE `inuseprograms` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `jobqueue`
---
-
-DROP TABLE IF EXISTS `jobqueue`;
-CREATE TABLE `jobqueue` (
-  `id` int(11) NOT NULL auto_increment,
-  `chanid` int(10) NOT NULL default '0',
-  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
-  `inserttime` datetime NOT NULL default '0000-00-00 00:00:00',
-  `type` int(11) NOT NULL default '0',
-  `cmds` int(11) NOT NULL default '0',
-  `flags` int(11) NOT NULL default '0',
-  `status` int(11) NOT NULL default '0',
-  `statustime` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
-  `hostname` varchar(255) NOT NULL default '',
-  `args` blob NOT NULL,
-  `comment` varchar(128) NOT NULL default '',
-  `schedruntime` datetime NOT NULL default '2007-01-01 00:00:00',
-  PRIMARY KEY  (`id`),
-  UNIQUE KEY `chanid` (`chanid`,`starttime`,`type`,`inserttime`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `jobqueue`
---
-
-LOCK TABLES `jobqueue` WRITE;
-/*!40000 ALTER TABLE `jobqueue` DISABLE KEYS */;
-/*!40000 ALTER TABLE `jobqueue` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `jumppoints`
---
-
-DROP TABLE IF EXISTS `jumppoints`;
-CREATE TABLE `jumppoints` (
-  `destination` varchar(128) NOT NULL default '',
-  `description` varchar(255) default NULL,
-  `keylist` varchar(128) default NULL,
-  `hostname` varchar(255) NOT NULL default '',
-  PRIMARY KEY  (`destination`,`hostname`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `jumppoints`
---
-
-LOCK TABLES `jumppoints` WRITE;
-/*!40000 ALTER TABLE `jumppoints` DISABLE KEYS */;
-INSERT INTO `jumppoints` VALUES ('Reload Theme',NULL,'','myhost'),('Main Menu',NULL,'','myhost'),('Program Guide',NULL,'','myhost'),('Program Finder',NULL,'','myhost'),('Manage Recordings / Fix Conflicts',NULL,'','myhost'),('Program Recording Priorities',NULL,'','myhost'),('Channel Recording Priorities',NULL,'','myhost'),('TV Recording Playback',NULL,'','myhost'),('TV Recording Deletion',NULL,'','myhost'),('Live TV',NULL,'','myhost'),('Live TV In Guide',NULL,'','myhost'),('Manual Record Scheduling',NULL,'','myhost'),('Status Screen',NULL,'','myhost'),('Previously Recorded',NULL,'','myhost'),('Play DVD',NULL,'','myhost'),('Play VCD',NULL,'','myhost'),('Rip DVD',NULL,'','myhost'),('Netflix Browser',NULL,'','myhost'),('Netflix Queue',NULL,'','myhost'),('Netflix History',NULL,'','myhost'),('MythGallery',NULL,'','myhost'),('MythGame',NULL,'','myhost'),('Play music',NULL,'','myhost'),('Select music playlists',NULL,'','myhost'),('Rip CD',NULL,'','myhost'),('Scan music',NULL,'','myhost'),('MythNews',NULL,'','myhost'),('MythVideo',NULL,'','myhost'),('Video Manager',NULL,'','myhost'),('Video Browser',NULL,'','myhost'),('Video Listings',NULL,'','myhost'),('Video Gallery',NULL,'','myhost'),('MythWeather',NULL,'','myhost'),('ScreenShot','','Alt+C,Print','myhost');
-/*!40000 ALTER TABLE `jumppoints` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `keybindings`
---
-
-DROP TABLE IF EXISTS `keybindings`;
-CREATE TABLE `keybindings` (
-  `context` varchar(32) NOT NULL default '',
-  `action` varchar(32) NOT NULL default '',
-  `description` varchar(255) default NULL,
-  `keylist` varchar(128) default NULL,
-  `hostname` varchar(255) NOT NULL default '',
-  PRIMARY KEY  (`context`,`action`,`hostname`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `keybindings`
---
-
-LOCK TABLES `keybindings` WRITE;
-/*!40000 ALTER TABLE `keybindings` DISABLE KEYS */;
-INSERT INTO `keybindings` VALUES ('Global','UP','Up Arrow','Up','myhost'),('Global','DOWN','Down Arrow','Down','myhost'),('Global','LEFT','Left Arrow','Left','myhost'),('Global','RIGHT','Right Arrow','Right','myhost'),('Global','SELECT','Select','Return,Enter,Space','myhost'),('Global','ESCAPE','Escape','Esc','myhost'),('Global','MENU','Pop-up menu','M','myhost'),('Global','INFO','More information','I','myhost'),('Global','PAGEUP','Page Up','PgUp','myhost'),('Global','PAGEDOWN','Page Down','PgDown','myhost'),('Global','PREVVIEW','Previous View','Home','myhost'),('Global','NEXTVIEW','Next View','End','myhost'),('Global','HELP','Help','F1','myhost'),('Global','EJECT','Eject Removable Media','','myhost'),('Global','0','0','0','myhost'),('Global','1','1','1','myhost'),('Global','2','2','2','myhost'),('Global','3','3','3','myhost'),('Global','4','4','4','myhost'),('Global','5','5','5','myhost'),('Global','6','6','6','myhost'),('Global','7','7','7','myhost'),('Global','8','8','8','myhost'),('Global','9','9','9','myhost'),('qt','DELETE','Delete','D','myhost'),('qt','EDIT','Edit','E','myhost'),('TV Frontend','PAGEUP','Page Up','3','myhost'),('TV Frontend','PAGEDOWN','Page Down','9','myhost'),('TV Frontend','DELETE','Delete Program','D','myhost'),('TV Frontend','PLAYBACK','Play Program','P','myhost'),('TV Frontend','TOGGLERECORD','Toggle recording status of current program','R','myhost'),('TV Frontend','DAYLEFT','Page the program guide back one day','Home,7','myhost'),('TV Frontend','DAYRIGHT','Page the program guide forward one day','End,1','myhost'),('TV Frontend','PAGELEFT','Page the program guide left',',,<','myhost'),('TV Frontend','PAGERIGHT','Page the program guide right','>,.','myhost'),('TV Frontend','TOGGLEFAV','Toggle the current channel as a favorite','?','myhost'),('TV Frontend','NEXTFAV','Toggle showing all channels or just favorites in the program guide.','/','myhost'),('TV Frontend','CHANUPDATE','Switch channels without exiting guide in Live TV mode.','X','myhost'),('TV Frontend','RANKINC','Increase program or channel rank','Right','myhost'),('TV Frontend','RANKDEC','Decrease program or channel rank','Left','myhost'),('TV Frontend','UPCOMING','List upcoming episodes','O','myhost'),('TV Frontend','DETAILS','Show program details','U','myhost'),('TV Frontend','VIEWCARD','Switch Capture Card view','Y','myhost'),('TV Frontend','CUSTOMEDIT','Edit Custom Record Rule','E','myhost'),('TV Playback','CLEAROSD','Clear OSD','Backspace','myhost'),('TV Playback','PAUSE','Pause','P','myhost'),('TV Playback','DELETE','Delete Program','D','myhost'),('TV Playback','SEEKFFWD','Fast Forward','Right','myhost'),('TV Playback','SEEKRWND','Rewind','Left','myhost'),('TV Playback','ARBSEEK','Arbitrary Seek','*','myhost'),('TV Playback','CHANNELUP','Channel up','Up','myhost'),('TV Playback','CHANNELDOWN','Channel down','Down','myhost'),('TV Playback','NEXTFAV','Switch to the next favorite channel','/','myhost'),('TV Playback','PREVCHAN','Switch to the previous channel','H','myhost'),('TV Playback','JUMPFFWD','Jump ahead','PgDown','myhost'),('TV Playback','JUMPRWND','Jump back','PgUp','myhost'),('TV Playback','JUMPBKMRK','Jump to bookmark','K','myhost'),('TV Playback','FFWDSTICKY','Fast Forward (Sticky) or Forward one frame while paused','>,.','myhost'),('TV Playback','RWNDSTICKY','Rewind (Sticky) or Rewind one frame while paused',',,<','myhost'),('TV Frontend','PAGETOP','Page to top of list','','myhost'),('TV Frontend','PAGEMIDDLE','Page to middle of list','','myhost'),('TV Playback','SKIPCOMMERCIAL','Skip Commercial','Z,End','myhost'),('TV Playback','SKIPCOMMBACK','Skip Commercial (Reverse)','Q,Home','myhost'),('TV Playback','JUMPSTART','Jump to the start of the recording.','Ctrl+B','myhost'),('TV Playback','TOGGLEBROWSE','Toggle channel browse mode','O','myhost'),('TV Playback','TOGGLERECORD','Toggle recording status of current program','R','myhost'),('TV Playback','TOGGLEFAV','Toggle the current channel as a favorite','?','myhost'),('TV Playback','VOLUMEDOWN','Volume down','[,{,F10,Volume Down','myhost'),('TV Playback','VOLUMEUP','Volume up','],},F11,Volume Up','myhost'),('TV Playback','MUTE','Mute','|,\\,F9,Volume Mute','myhost'),('TV Playback','TOGGLEPIPMODE','Toggle Picture-in-Picture mode','V','myhost'),('TV Playback','TOGGLEPIPWINDOW','Toggle active PiP window','B','myhost'),('TV Playback','SWAPPIP','Swap PiP/Main','N','myhost'),('TV Playback','TOGGLECC','Toggle any captions','T','myhost'),('TV Playback','TOGGLETTC','Toggle Teletext Captions','','myhost'),('TV Playback','TOGGLESUBTITLE','Toggle Subtitles','','myhost'),('TV Playback','TOGGLECC608','Toggle VBI CC','','myhost'),('TV Playback','TOGGLECC708','Toggle ATSC CC','','myhost'),('TV Playback','TOGGLETTM','Toggle Teletext Menu','','myhost'),('TV Playback','SELECTAUDIO_0','Play audio track 1','','myhost'),('TV Playback','SELECTAUDIO_1','Play audio track 2','','myhost'),('TV Playback','SELECTSUBTITLE_0','Display subtitle 1','','myhost'),('TV Playback','SELECTSUBTITLE_1','Display subtitle 2','','myhost'),('TV Playback','SELECTCC608_0','Display VBI CC1','','myhost'),('TV Playback','SELECTCC608_1','Display VBI CC2','','myhost'),('TV Playback','SELECTCC608_2','Display VBI CC3','','myhost'),('TV Playback','SELECTCC608_3','Display VBI CC4','','myhost'),('TV Playback','SELECTCC708_0','Display ATSC CC1','','myhost'),('TV Playback','SELECTCC708_1','Display ATSC CC2','','myhost'),('TV Playback','SELECTCC708_2','Display ATSC CC3','','myhost'),('TV Playback','SELECTCC708_3','Display ATSC CC4','','myhost'),('TV Playback','NEXTAUDIO','Next audio track','+','myhost'),('TV Playback','PREVAUDIO','Previous audio track','-','myhost'),('TV Playback','NEXTSUBTITLE','Next subtitle track','','myhost'),('TV Playback','PREVSUBTITLE','Previous subtitle track','','myhost'),('TV Playback','NEXTCC608','Next VBI CC track','','myhost'),('TV Playback','PREVCC608','Previous VBI CC track','','myhost'),('TV Playback','NEXTCC708','Next ATSC CC track','','myhost'),('TV Playback','PREVCC708','Previous ATSC CC track','','myhost'),('TV Playback','NEXTCC','Next of any captions','','myhost'),('TV Playback','NEXTSCAN','Next video scan overidemode','','myhost'),('TV Playback','QUEUETRANSCODE','Queue the current recording for transcoding','X','myhost'),('TV Playback','SPEEDINC','Increase the playback speed','U','myhost'),('TV Playback','SPEEDDEC','Decrease the playback speed','J','myhost'),('TV Playback','ADJUSTSTRETCH','Turn on time stretch control','A','myhost'),('TV Playback','STRETCHINC','Increase time stretch speed','','myhost'),('TV Playback','STRETCHDEC','Decrease time stretch speed','','myhost'),('TV Playback','TOGGLESTRETCH','Toggle time stretch speed','','myhost'),('TV Playback','TOGGLEAUDIOSYNC','Turn on audio sync adjustment controls','','myhost'),('TV Playback','TOGGLEPICCONTROLS','Playback picture adjustments','F','myhost'),('TV Playback','TOGGLECHANCONTROLS','Recording picture adjustments for this channel','Ctrl+G','myhost'),('TV Playback','TOGGLERECCONTROLS','Recording picture adjustments for this recorder','G','myhost'),('TV Playback','TOGGLEEDIT','Start Edit Mode','E','myhost'),('TV Playback','CYCLECOMMSKIPMODE','Cycle Commercial Skip mode','','myhost'),('TV Playback','GUIDE','Show the Program Guide','S','myhost'),('TV Playback','FINDER','Show the Program Finder','#','myhost'),('TV Playback','TOGGLESLEEP','Toggle the Sleep Timer','F8','myhost'),('TV Playback','PLAY','Play','Ctrl+P','myhost'),('TV Playback','JUMPPREV','Jump to previously played recording','','myhost'),('TV Playback','JUMPREC','Display menu of recorded programs to jump to','','myhost'),('TV Playback','SIGNALMON','Monitor Signal Quality','F7','myhost'),('TV Playback','JUMPTODVDROOTMENU','Jump to the DVD Root Menu','','myhost'),('TV Editing','CLEARMAP','Clear editing cut points','C,Q,Home','myhost'),('TV Editing','INVERTMAP','Invert Begin/End cut points','I','myhost'),('TV Editing','LOADCOMMSKIP','Load cut list from commercial skips','Z,End','myhost'),('TV Editing','NEXTCUT','Jump to the next cut point','PgDown','myhost'),('TV Editing','PREVCUT','Jump to the previous cut point','PgUp','myhost'),('TV Editing','BIGJUMPREW','Jump back 10x the normal amount',',,<','myhost'),('TV Editing','BIGJUMPFWD','Jump forward 10x the normal amount','>,.','myhost'),('TV Editing','TOGGLEEDIT','Exit out of Edit Mode','E','myhost'),('Teletext Menu','NEXTPAGE','Next Page','Down','myhost'),('Teletext Menu','PREVPAGE','Previous Page','Up','myhost'),('Teletext Menu','NEXTSUBPAGE','Next Subpage','Right','myhost'),('Teletext Menu','PREVSUBPAGE','Previous Subpage','Left','myhost'),('Teletext Menu','TOGGLETT','Toggle Teletext','T','myhost'),('Teletext Menu','MENURED','Menu Red','F2','myhost'),('Teletext Menu','MENUGREEN','Menu Green','F3','myhost'),('Teletext Menu','MENUYELLOW','Menu Yellow','F4','myhost'),('Teletext Menu','MENUBLUE','Menu Blue','F5','myhost'),('Teletext Menu','MENUWHITE','Menu White','F6','myhost'),('Teletext Menu','TOGGLEBACKGROUND','Toggle Background','F7','myhost'),('Teletext Menu','REVEAL','Reveal hidden Text','F8','myhost'),('ITV Menu','MENURED','Menu Red','F2','myhost'),('ITV Menu','MENUGREEN','Menu Green','F3','myhost'),('ITV Menu','MENUYELLOW','Menu Yellow','F4','myhost'),('ITV Menu','MENUBLUE','Menu Blue','F5','myhost'),('ITV Menu','TEXTEXIT','Menu Exit','F6','myhost'),('ITV Menu','MENUTEXT','Menu Text','F7','myhost'),('Archive','TOGGLECUT','Toggle use cut list state for selected program','C','myhost'),('NetFlix','MOVETOTOP','Moves movie to top of queue','1','myhost'),('NetFlix','REMOVE','Removes movie from queue','D','myhost'),('Gallery','PLAY','Start/Stop Slideshow','P','myhost'),('Gallery','HOME','Go to the first image in thumbnail view','Home','myhost'),('Gallery','END','Go to the last image in thumbnail view','End','myhost'),('Gallery','MENU','Toggle activating menu in thumbnail view','M','myhost'),('Gallery','SLIDESHOW','Start Slideshow in thumbnail view','S','myhost'),('Gallery','RANDOMSHOW','Start Random Slideshow in thumbnail view','R','myhost'),('Gallery','ROTRIGHT','Rotate image right 90 degrees','],3','myhost'),('Gallery','ROTLEFT','Rotate image left 90 degrees','[,1','myhost'),('Gallery','ZOOMOUT','Zoom image out','7','myhost'),('Gallery','ZOOMIN','Zoom image in','9','myhost'),('Gallery','SCROLLUP','Scroll image up','2','myhost'),('Gallery','SCROLLLEFT','Scroll image left','4','myhost'),('Gallery','SCROLLRIGHT','Scroll image right','6','myhost'),('Gallery','SCROLLDOWN','Scroll image down','8','myhost'),('Gallery','RECENTER','Recenter image','5','myhost'),('Gallery','FULLSIZE','Full-size (un-zoom) image','0','myhost'),('Gallery','UPLEFT','Go to the upper-left corner of the image','PgUp','myhost'),('Gallery','LOWRIGHT','Go to the lower-right corner of the image','PgDown','myhost'),('Gallery','INFO','Toggle Showing Information about Image','I','myhost'),('Gallery','DELETE','Delete marked images or current image if none are marked','D','myhost'),('Gallery','MARK','Mark image','T','myhost'),('Game','TOGGLEFAV','Toggle the current game as a favorite','?,/','myhost'),('Game','INCSEARCH','Show incremental search dialog','Ctrl+S','myhost'),('Game','INCSEARCHNEXT','Incremental search find next match','Ctrl+N','myhost'),('Music','DELETE','Delete track from playlist','D','myhost'),('Music','NEXTTRACK','Move to the next track','>,.,Z,End','myhost'),('Music','PREVTRACK','Move to the previous track',',,<,Q,Home','myhost'),('Music','FFWD','Fast forward','PgDown','myhost'),('Music','RWND','Rewind','PgUp','myhost'),('Music','PAUSE','Pause/Start playback','P','myhost'),('Music','STOP','Stop playback','O','myhost'),('Music','VOLUMEDOWN','Volume down','[,{,F10,Volume Down','myhost'),('Music','VOLUMEUP','Volume up','],},F11,Volume Up','myhost'),('Music','MUTE','Mute','|,\\,F9,Volume Mute','myhost'),('Music','CYCLEVIS','Cycle visualizer mode','6','myhost'),('Music','BLANKSCR','Blank screen','5','myhost'),('Music','THMBUP','Increase rating','9','myhost'),('Music','THMBDOWN','Decrease rating','7','myhost'),('Music','REFRESH','Refresh music tree','8','myhost'),('Music','FILTER','Filter All My Music','F','myhost'),('Music','INCSEARCH','Show incremental search dialog','Ctrl+S','myhost'),('Music','INCSEARCHNEXT','Incremental search find next match','Ctrl+N','myhost'),('News','RETRIEVENEWS','Update news items','I','myhost'),('News','FORCERETRIEVE','Force update news items','M','myhost'),('News','CANCEL','Cancel news item updating','C','myhost'),('Video','FILTER','Open video filter dialog','F','myhost'),('Video','DELETE','Delete video','D','myhost'),('Video','BROWSE','Change browsable in video manager','B','myhost'),('Video','INCPARENT','Increase Parental Level','],},F11','myhost'),('Video','DECPARENT','Decrease Parental Level','[,{,F10','myhost'),('Video','HOME','Go to the first video','Home','myhost'),('Video','END','Go to the last video','End','myhost'),('Weather','PAUSE','Pause current page','P','myhost'),('Welcome','STARTXTERM','Open an Xterm window','F12','myhost'),('Welcome','SHOWSETTINGS','Show Mythshutdown settings','F11','myhost'),('TV Frontend','CHANGERECGROUP','Change Recording Group','','myhost'),('TV Frontend','PAGEBOTTOM','Page to bottom of list','','myhost'),('TV Frontend','TOGGLEEPGORDER','Reverse the channel order in the program guide','0','myhost'),('TV Frontend','GUIDE','Show the Program Guide','S','myhost'),('TV Frontend','FINDER','Show the Program Finder','#','myhost'),('TV Frontend','VOLUMEDOWN','Volume down','[,{,F10,Volume Down','myhost'),('TV Frontend','VOLUMEUP','Volume up','],},F11,Volume Up','myhost'),('TV Frontend','MUTE','Mute','|,\\,F9,Volume Mute','myhost'),('TV Frontend','VIEWINPUT','Switch Capture Card view','C','myhost'),('TV Frontend','CHANGEGROUPVIEW','Change Group View','','myhost'),('TV Playback','NEXTSOURCE','Next Video Source','Y','myhost'),('TV Playback','PREVSOURCE','Previous Video Source','Ctrl+Y','myhost'),('TV Playback','NEXTINPUT','Next Input','C','myhost'),('TV Playback','NEXTCARD','Next Card','','myhost'),('TV Playback','TOGGLEASPECT','Toggle the video aspect ratio','Ctrl+W','myhost'),('TV Playback','TOGGLEFILL','Next Preconfigured Zoom mode','W','myhost'),('TV Playback','VIEWSCHEDULED','Display scheduled recording list','','myhost'),('TV Playback','EXITSHOWNOPROMPTS','Exit Show without any prompts','','myhost'),('TV Playback','SCREENSHOT','Save screenshot of current video frame','','myhost'),('ITV Menu','MENUEPG','Menu EPG','F12','myhost');
-/*!40000 ALTER TABLE `keybindings` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `keyword`
---
-
-DROP TABLE IF EXISTS `keyword`;
-CREATE TABLE `keyword` (
-  `phrase` varchar(128) NOT NULL default '',
-  `searchtype` int(10) unsigned NOT NULL default '3',
-  UNIQUE KEY `phrase` (`phrase`,`searchtype`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `keyword`
---
-
-LOCK TABLES `keyword` WRITE;
-/*!40000 ALTER TABLE `keyword` DISABLE KEYS */;
-/*!40000 ALTER TABLE `keyword` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `music_albums`
---
-
-DROP TABLE IF EXISTS `music_albums`;
-CREATE TABLE `music_albums` (
-  `album_id` int(11) unsigned NOT NULL auto_increment,
-  `artist_id` int(11) unsigned NOT NULL default '0',
-  `album_name` varchar(255) NOT NULL default '',
-  `year` smallint(6) NOT NULL default '0',
-  `compilation` tinyint(1) unsigned NOT NULL default '0',
-  PRIMARY KEY  (`album_id`),
-  KEY `idx_album_name` (`album_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `music_albums`
---
-
-LOCK TABLES `music_albums` WRITE;
-/*!40000 ALTER TABLE `music_albums` DISABLE KEYS */;
-/*!40000 ALTER TABLE `music_albums` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `music_artists`
---
-
-DROP TABLE IF EXISTS `music_artists`;
-CREATE TABLE `music_artists` (
-  `artist_id` int(11) unsigned NOT NULL auto_increment,
-  `artist_name` varchar(255) NOT NULL default '',
-  PRIMARY KEY  (`artist_id`),
-  KEY `idx_artist_name` (`artist_name`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `music_artists`
---
-
-LOCK TABLES `music_artists` WRITE;
-/*!40000 ALTER TABLE `music_artists` DISABLE KEYS */;
-/*!40000 ALTER TABLE `music_artists` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `music_genres`
---
-
-DROP TABLE IF EXISTS `music_genres`;
-CREATE TABLE `music_genres` (
-  `genre_id` int(11) unsigned NOT NULL auto_increment,
-  `genre` varchar(25) NOT NULL default '',
-  PRIMARY KEY  (`genre_id`),
-  KEY `idx_genre` (`genre`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `music_genres`
---
-
-LOCK TABLES `music_genres` WRITE;
-/*!40000 ALTER TABLE `music_genres` DISABLE KEYS */;
-/*!40000 ALTER TABLE `music_genres` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `music_playlists`
---
-
-DROP TABLE IF EXISTS `music_playlists`;
-CREATE TABLE `music_playlists` (
-  `playlist_id` int(11) unsigned NOT NULL auto_increment,
-  `playlist_name` varchar(255) NOT NULL default '',
-  `playlist_songs` text NOT NULL,
-  `last_accessed` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
-  `length` int(11) unsigned NOT NULL default '0',
-  `songcount` smallint(8) unsigned NOT NULL default '0',
-  `hostname` varchar(255) NOT NULL default '',
-  PRIMARY KEY  (`playlist_id`)
-) ENGINE=MyISAM AUTO_INCREMENT=3 DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `music_playlists`
---
-
-LOCK TABLES `music_playlists` WRITE;
-/*!40000 ALTER TABLE `music_playlists` DISABLE KEYS */;
-INSERT INTO `music_playlists` VALUES (1,'default_playlist_storage','','2006-10-07 16:07:39',0,0,'myhost'),(2,'backup_playlist_storage','','2006-10-07 16:07:39',0,0,'myhost');
-/*!40000 ALTER TABLE `music_playlists` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `music_smartplaylist_categories`
---
-
-DROP TABLE IF EXISTS `music_smartplaylist_categories`;
-CREATE TABLE `music_smartplaylist_categories` (
-  `categoryid` int(10) unsigned NOT NULL auto_increment,
-  `name` varchar(128) NOT NULL,
-  PRIMARY KEY  (`categoryid`),
-  KEY `name` (`name`)
-) ENGINE=MyISAM AUTO_INCREMENT=4 DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `music_smartplaylist_categories`
---
-
-LOCK TABLES `music_smartplaylist_categories` WRITE;
-/*!40000 ALTER TABLE `music_smartplaylist_categories` DISABLE KEYS */;
-INSERT INTO `music_smartplaylist_categories` VALUES (1,'Decades'),(2,'Favourite Tracks'),(3,'New Tracks');
-/*!40000 ALTER TABLE `music_smartplaylist_categories` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `music_smartplaylist_items`
---
-
-DROP TABLE IF EXISTS `music_smartplaylist_items`;
-CREATE TABLE `music_smartplaylist_items` (
-  `smartplaylistitemid` int(10) unsigned NOT NULL auto_increment,
-  `smartplaylistid` int(10) unsigned NOT NULL,
-  `field` varchar(50) NOT NULL,
-  `operator` varchar(20) NOT NULL,
-  `value1` varchar(255) NOT NULL,
-  `value2` varchar(255) NOT NULL,
-  PRIMARY KEY  (`smartplaylistitemid`),
-  KEY `smartplaylistid` (`smartplaylistid`)
-) ENGINE=MyISAM AUTO_INCREMENT=9 DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `music_smartplaylist_items`
---
-
-LOCK TABLES `music_smartplaylist_items` WRITE;
-/*!40000 ALTER TABLE `music_smartplaylist_items` DISABLE KEYS */;
-INSERT INTO `music_smartplaylist_items` VALUES (1,1,'Year','is between','1960','1969'),(2,2,'Year','is between','1970','1979'),(3,3,'Year','is between','1980','1989'),(4,4,'Year','is between','1990','1999'),(5,5,'Year','is between','2000','2009'),(6,6,'Rating','is greater than','7','0'),(7,7,'Play Count','is greater than','0','0'),(8,8,'Play Count','is equal to','0','0');
-/*!40000 ALTER TABLE `music_smartplaylist_items` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `music_smartplaylists`
---
-
-DROP TABLE IF EXISTS `music_smartplaylists`;
-CREATE TABLE `music_smartplaylists` (
-  `smartplaylistid` int(10) unsigned NOT NULL auto_increment,
-  `name` varchar(128) NOT NULL,
-  `categoryid` int(10) unsigned NOT NULL,
-  `matchtype` set('All','Any') NOT NULL default 'All',
-  `orderby` varchar(128) NOT NULL default '',
-  `limitto` int(10) unsigned NOT NULL default '0',
-  PRIMARY KEY  (`smartplaylistid`),
-  KEY `name` (`name`),
-  KEY `categoryid` (`categoryid`)
-) ENGINE=MyISAM AUTO_INCREMENT=9 DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `music_smartplaylists`
---
-
-LOCK TABLES `music_smartplaylists` WRITE;
-/*!40000 ALTER TABLE `music_smartplaylists` DISABLE KEYS */;
-INSERT INTO `music_smartplaylists` VALUES (1,'1960\'s',1,'All','Artist (A)',0),(2,'1970\'s',1,'All','Artist (A)',0),(3,'1980\'s',1,'All','Artist (A)',0),(4,'1990\'s',1,'All','Artist (A)',0),(5,'2000\'s',1,'All','Artist (A)',0),(6,'Favorite Tracks',2,'All','Artist (A), Album (A)',0),(7,'100 Most Played Tracks',2,'All','Play Count (D)',100),(8,'Never Played Tracks',3,'All','Artist (A), Album (A)',0);
-/*!40000 ALTER TABLE `music_smartplaylists` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `music_songs`
---
-
-DROP TABLE IF EXISTS `music_songs`;
-CREATE TABLE `music_songs` (
-  `song_id` int(11) unsigned NOT NULL auto_increment,
-  `filename` text NOT NULL,
-  `name` varchar(255) NOT NULL default '',
-  `track` smallint(6) unsigned NOT NULL default '0',
-  `artist_id` int(11) unsigned NOT NULL default '0',
-  `album_id` int(11) unsigned NOT NULL default '0',
-  `genre_id` int(11) unsigned NOT NULL default '0',
-  `year` smallint(6) NOT NULL default '0',
-  `length` int(11) unsigned NOT NULL default '0',
-  `numplays` int(11) unsigned NOT NULL default '0',
-  `rating` tinyint(4) unsigned NOT NULL default '0',
-  `lastplay` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
-  `date_entered` datetime default NULL,
-  `date_modified` datetime default NULL,
-  `format` varchar(4) NOT NULL default '0',
-  `mythdigest` varchar(255) default NULL,
-  `size` bigint(20) unsigned default NULL,
-  `description` varchar(255) default NULL,
-  `comment` varchar(255) default NULL,
-  `disc_count` smallint(5) unsigned default '0',
-  `disc_number` smallint(5) unsigned default '0',
-  `track_count` smallint(5) unsigned default '0',
-  `start_time` int(10) unsigned default '0',
-  `stop_time` int(10) unsigned default NULL,
-  `eq_preset` varchar(255) default NULL,
-  `relative_volume` tinyint(4) default '0',
-  `sample_rate` int(10) unsigned default '0',
-  `bitrate` int(10) unsigned default '0',
-  `bpm` smallint(5) unsigned default NULL,
-  PRIMARY KEY  (`song_id`),
-  KEY `idx_name` (`name`),
-  KEY `idx_mythdigest` (`mythdigest`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `music_songs`
---
-
-LOCK TABLES `music_songs` WRITE;
-/*!40000 ALTER TABLE `music_songs` DISABLE KEYS */;
-/*!40000 ALTER TABLE `music_songs` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `music_stats`
---
-
-DROP TABLE IF EXISTS `music_stats`;
-CREATE TABLE `music_stats` (
-  `num_artists` smallint(5) unsigned NOT NULL default '0',
-  `num_albums` smallint(5) unsigned NOT NULL default '0',
-  `num_songs` mediumint(8) unsigned NOT NULL default '0',
-  `num_genres` tinyint(3) unsigned NOT NULL default '0',
-  `total_time` varchar(12) NOT NULL default '0',
-  `total_size` varchar(10) NOT NULL default '0'
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `music_stats`
---
-
-LOCK TABLES `music_stats` WRITE;
-/*!40000 ALTER TABLE `music_stats` DISABLE KEYS */;
-/*!40000 ALTER TABLE `music_stats` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `musicmetadata`
---
-
-DROP TABLE IF EXISTS `musicmetadata`;
-CREATE TABLE `musicmetadata` (
-  `intid` int(10) unsigned NOT NULL auto_increment,
-  `artist` varchar(128) NOT NULL,
-  `compilation_artist` varchar(128) NOT NULL,
-  `album` varchar(128) NOT NULL,
-  `title` varchar(128) NOT NULL,
-  `genre` varchar(128) NOT NULL,
-  `year` int(10) unsigned NOT NULL,
-  `tracknum` int(10) unsigned NOT NULL,
-  `length` int(10) unsigned NOT NULL,
-  `filename` text NOT NULL,
-  `rating` int(10) unsigned NOT NULL default '5',
-  `lastplay` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
-  `playcount` int(10) unsigned NOT NULL default '0',
-  `mythdigest` varchar(255) default NULL,
-  `size` bigint(20) unsigned default NULL,
-  `date_added` datetime default NULL,
-  `date_modified` datetime default NULL,
-  `format` varchar(4) default NULL,
-  `description` varchar(255) default NULL,
-  `comment` varchar(255) default NULL,
-  `compilation` tinyint(4) default '0',
-  `composer` varchar(255) default NULL,
-  `disc_count` smallint(5) unsigned default '0',
-  `disc_number` smallint(5) unsigned default '0',
-  `track_count` smallint(5) unsigned default '0',
-  `start_time` int(10) unsigned default '0',
-  `stop_time` int(10) unsigned default NULL,
-  `eq_preset` varchar(255) default NULL,
-  `relative_volume` tinyint(4) default '0',
-  `sample_rate` int(10) unsigned default NULL,
-  `bpm` smallint(5) unsigned default NULL,
-  PRIMARY KEY  (`intid`),
-  KEY `artist` (`artist`),
-  KEY `album` (`album`),
-  KEY `title` (`title`),
-  KEY `genre` (`genre`),
-  KEY `mythdigest` (`mythdigest`),
-  KEY `compilation_artist` (`compilation_artist`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `musicmetadata`
---
-
-LOCK TABLES `musicmetadata` WRITE;
-/*!40000 ALTER TABLE `musicmetadata` DISABLE KEYS */;
-/*!40000 ALTER TABLE `musicmetadata` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `musicplaylist`
---
-
-DROP TABLE IF EXISTS `musicplaylist`;
-CREATE TABLE `musicplaylist` (
-  `playlistid` int(10) unsigned NOT NULL auto_increment,
-  `name` varchar(128) NOT NULL,
-  `hostname` varchar(255) default NULL,
-  `songlist` text NOT NULL,
-  PRIMARY KEY  (`playlistid`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `musicplaylist`
---
-
-LOCK TABLES `musicplaylist` WRITE;
-/*!40000 ALTER TABLE `musicplaylist` DISABLE KEYS */;
-/*!40000 ALTER TABLE `musicplaylist` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `mythlog`
---
-
-DROP TABLE IF EXISTS `mythlog`;
-CREATE TABLE `mythlog` (
-  `logid` int(10) unsigned NOT NULL auto_increment,
-  `module` varchar(32) NOT NULL default '',
-  `priority` int(11) NOT NULL default '0',
-  `acknowledged` tinyint(1) default '0',
-  `logdate` datetime default NULL,
-  `host` varchar(128) default NULL,
-  `message` varchar(255) NOT NULL default '',
-  `details` text,
-  PRIMARY KEY  (`logid`),
-  KEY `module` (`module`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `mythlog`
---
-
-LOCK TABLES `mythlog` WRITE;
-/*!40000 ALTER TABLE `mythlog` DISABLE KEYS */;
-/*!40000 ALTER TABLE `mythlog` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `netflix`
---
-
-DROP TABLE IF EXISTS `netflix`;
-CREATE TABLE `netflix` (
-  `name` varchar(100) NOT NULL,
-  `category` varchar(255) NOT NULL,
-  `url` varchar(255) NOT NULL,
-  `ico` varchar(255) default NULL,
-  `updated` int(10) unsigned default NULL,
-  `is_queue` int(10) unsigned default NULL,
-  PRIMARY KEY  (`name`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `netflix`
---
-
-LOCK TABLES `netflix` WRITE;
-/*!40000 ALTER TABLE `netflix` DISABLE KEYS */;
-/*!40000 ALTER TABLE `netflix` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `networkiconmap`
---
-
-DROP TABLE IF EXISTS `networkiconmap`;
-CREATE TABLE `networkiconmap` (
-  `id` int(11) NOT NULL auto_increment,
-  `network` varchar(20) NOT NULL default '',
-  `url` varchar(255) NOT NULL default '',
-  PRIMARY KEY  (`id`),
-  UNIQUE KEY `network` (`network`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `networkiconmap`
---
-
-LOCK TABLES `networkiconmap` WRITE;
-/*!40000 ALTER TABLE `networkiconmap` DISABLE KEYS */;
-/*!40000 ALTER TABLE `networkiconmap` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `newssites`
---
-
-DROP TABLE IF EXISTS `newssites`;
-CREATE TABLE `newssites` (
-  `name` varchar(100) NOT NULL,
-  `category` varchar(255) NOT NULL,
-  `url` varchar(255) NOT NULL,
-  `ico` varchar(255) default NULL,
-  `updated` int(10) unsigned default NULL,
-  PRIMARY KEY  (`name`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `newssites`
---
-
-LOCK TABLES `newssites` WRITE;
-/*!40000 ALTER TABLE `newssites` DISABLE KEYS */;
-/*!40000 ALTER TABLE `newssites` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `oldfind`
---
-
-DROP TABLE IF EXISTS `oldfind`;
-CREATE TABLE `oldfind` (
-  `recordid` int(11) NOT NULL default '0',
-  `findid` int(11) NOT NULL default '0',
-  PRIMARY KEY  (`recordid`,`findid`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `oldfind`
---
-
-LOCK TABLES `oldfind` WRITE;
-/*!40000 ALTER TABLE `oldfind` DISABLE KEYS */;
-/*!40000 ALTER TABLE `oldfind` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `oldprogram`
---
-
-DROP TABLE IF EXISTS `oldprogram`;
-CREATE TABLE `oldprogram` (
-  `oldtitle` varchar(128) NOT NULL default '',
-  `airdate` datetime NOT NULL default '0000-00-00 00:00:00',
-  PRIMARY KEY  (`oldtitle`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `oldprogram`
---
-
-LOCK TABLES `oldprogram` WRITE;
-/*!40000 ALTER TABLE `oldprogram` DISABLE KEYS */;
-/*!40000 ALTER TABLE `oldprogram` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `oldrecorded`
---
-
-DROP TABLE IF EXISTS `oldrecorded`;
-CREATE TABLE `oldrecorded` (
-  `chanid` int(10) unsigned NOT NULL default '0',
-  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
-  `endtime` datetime NOT NULL default '0000-00-00 00:00:00',
-  `title` varchar(128) NOT NULL default '',
-  `subtitle` varchar(128) NOT NULL default '',
-  `description` text NOT NULL,
-  `category` varchar(64) NOT NULL default '',
-  `seriesid` varchar(40) NOT NULL default '',
-  `programid` varchar(40) NOT NULL default '',
-  `findid` int(11) NOT NULL default '0',
-  `recordid` int(11) NOT NULL default '0',
-  `station` varchar(20) NOT NULL default '',
-  `rectype` int(10) unsigned NOT NULL default '0',
-  `duplicate` tinyint(1) NOT NULL default '0',
-  `recstatus` int(11) NOT NULL default '0',
-  `reactivate` smallint(6) NOT NULL default '0',
-  `generic` tinyint(1) default '0',
-  PRIMARY KEY  (`station`,`starttime`,`title`),
-  KEY `endtime` (`endtime`),
-  KEY `title` (`title`),
-  KEY `seriesid` (`seriesid`),
-  KEY `programid` (`programid`),
-  KEY `recordid` (`recordid`),
-  KEY `recstatus` (`recstatus`,`programid`,`seriesid`),
-  KEY `recstatus_2` (`recstatus`,`title`,`subtitle`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `oldrecorded`
---
-
-LOCK TABLES `oldrecorded` WRITE;
-/*!40000 ALTER TABLE `oldrecorded` DISABLE KEYS */;
-/*!40000 ALTER TABLE `oldrecorded` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `people`
---
-
-DROP TABLE IF EXISTS `people`;
-CREATE TABLE `people` (
-  `person` mediumint(8) unsigned NOT NULL auto_increment,
-  `name` char(128) NOT NULL default '',
-  PRIMARY KEY  (`person`),
-  UNIQUE KEY `name` (`name`(41))
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `people`
---
-
-LOCK TABLES `people` WRITE;
-/*!40000 ALTER TABLE `people` DISABLE KEYS */;
-/*!40000 ALTER TABLE `people` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `pidcache`
---
-
-DROP TABLE IF EXISTS `pidcache`;
-CREATE TABLE `pidcache` (
-  `chanid` smallint(6) NOT NULL default '0',
-  `pid` int(11) NOT NULL default '-1',
-  `tableid` int(11) NOT NULL default '-1',
-  KEY `chanid` (`chanid`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `pidcache`
---
-
-LOCK TABLES `pidcache` WRITE;
-/*!40000 ALTER TABLE `pidcache` DISABLE KEYS */;
-/*!40000 ALTER TABLE `pidcache` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `playgroup`
---
-
-DROP TABLE IF EXISTS `playgroup`;
-CREATE TABLE `playgroup` (
-  `name` varchar(32) NOT NULL default '',
-  `titlematch` varchar(255) NOT NULL default '',
-  `skipahead` int(11) NOT NULL default '0',
-  `skipback` int(11) NOT NULL default '0',
-  `timestretch` int(11) NOT NULL default '0',
-  `jump` int(11) NOT NULL default '0',
-  PRIMARY KEY  (`name`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `playgroup`
---
-
-LOCK TABLES `playgroup` WRITE;
-/*!40000 ALTER TABLE `playgroup` DISABLE KEYS */;
-INSERT INTO `playgroup` VALUES ('Default','',30,5,100,0);
-/*!40000 ALTER TABLE `playgroup` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `powerpriority`
---
-
-DROP TABLE IF EXISTS `powerpriority`;
-CREATE TABLE `powerpriority` (
-  `priorityname` varchar(64) NOT NULL,
-  `recpriority` int(10) NOT NULL default '0',
-  `selectclause` text NOT NULL,
-  PRIMARY KEY  (`priorityname`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `powerpriority`
---
-
-LOCK TABLES `powerpriority` WRITE;
-/*!40000 ALTER TABLE `powerpriority` DISABLE KEYS */;
-/*!40000 ALTER TABLE `powerpriority` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `profilegroups`
---
-
-DROP TABLE IF EXISTS `profilegroups`;
-CREATE TABLE `profilegroups` (
-  `id` int(10) unsigned NOT NULL auto_increment,
-  `name` varchar(128) default NULL,
-  `cardtype` varchar(32) NOT NULL default 'V4L',
-  `is_default` int(1) default '0',
-  `hostname` varchar(255) default NULL,
-  PRIMARY KEY  (`id`),
-  UNIQUE KEY `name` (`name`,`hostname`),
-  KEY `cardtype` (`cardtype`)
-) ENGINE=MyISAM AUTO_INCREMENT=13 DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `profilegroups`
---
-
-LOCK TABLES `profilegroups` WRITE;
-/*!40000 ALTER TABLE `profilegroups` DISABLE KEYS */;
-INSERT INTO `profilegroups` VALUES (1,'Software Encoders (v4l based)','V4L',1,NULL),(2,'MPEG-2 Encoders (PVR-x50, PVR-500)','MPEG',1,NULL),(3,'Hardware MJPEG Encoders (Matrox G200-TV, Miro DC10, etc)','MJPEG',1,NULL),(4,'Hardware HDTV','HDTV',1,NULL),(5,'Hardware DVB Encoders','DVB',1,NULL),(6,'Transcoders','TRANSCODE',1,NULL),(7,'FireWire Input','FIREWIRE',1,NULL),(8,'USB Mpeg-4 Encoder (Plextor ConvertX, etc)','GO7007',1,NULL),(9,'DBOX2 Input','DBOX2',1,NULL),(10,'Freebox Input','Freebox',1,NULL),(11,'HDHomeRun Recorders','HDHOMERUN',1,NULL),(12,'CRC IP Recorders','CRC_IP',1,NULL);
-/*!40000 ALTER TABLE `profilegroups` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `program`
---
-
-DROP TABLE IF EXISTS `program`;
-CREATE TABLE `program` (
-  `chanid` int(10) unsigned NOT NULL default '0',
-  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
-  `endtime` datetime NOT NULL default '0000-00-00 00:00:00',
-  `title` varchar(128) NOT NULL default '',
-  `subtitle` varchar(128) NOT NULL default '',
-  `description` text NOT NULL,
-  `category` varchar(64) NOT NULL default '',
-  `category_type` varchar(64) NOT NULL default '',
-  `airdate` year(4) NOT NULL default '0000',
-  `stars` float NOT NULL default '0',
-  `previouslyshown` tinyint(4) NOT NULL default '0',
-  `title_pronounce` varchar(128) NOT NULL default '',
-  `stereo` tinyint(1) NOT NULL default '0',
-  `subtitled` tinyint(1) NOT NULL default '0',
-  `hdtv` tinyint(1) NOT NULL default '0',
-  `closecaptioned` tinyint(1) NOT NULL default '0',
-  `partnumber` int(11) NOT NULL default '0',
-  `parttotal` int(11) NOT NULL default '0',
-  `seriesid` varchar(40) NOT NULL default '',
-  `originalairdate` date default NULL,
-  `showtype` varchar(30) NOT NULL default '',
-  `colorcode` varchar(20) NOT NULL default '',
-  `syndicatedepisodenumber` varchar(20) NOT NULL default '',
-  `programid` varchar(40) NOT NULL default '',
-  `manualid` int(10) unsigned NOT NULL default '0',
-  `generic` tinyint(1) default '0',
-  `listingsource` int(11) NOT NULL default '0',
-  `first` tinyint(1) NOT NULL default '0',
-  `last` tinyint(1) NOT NULL default '0',
-  `audioprop` set('STEREO','MONO','SURROUND','DOLBY','HARDHEAR','VISUALIMPAIR') NOT NULL,
-  `subtitletypes` set('HARDHEAR','NORMAL','ONSCREEN','SIGNED') NOT NULL,
-  `videoprop` set('HDTV','WIDESCREEN','AVC') NOT NULL,
-  PRIMARY KEY  (`chanid`,`starttime`,`manualid`),
-  KEY `endtime` (`endtime`),
-  KEY `title` (`title`),
-  KEY `title_pronounce` (`title_pronounce`),
-  KEY `seriesid` (`seriesid`),
-  KEY `id_start_end` (`chanid`,`starttime`,`endtime`),
-  KEY `program_manualid` (`manualid`),
-  KEY `previouslyshown` (`previouslyshown`),
-  KEY `programid` (`programid`,`starttime`),
-  KEY `starttime` (`starttime`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `program`
---
-
-LOCK TABLES `program` WRITE;
-/*!40000 ALTER TABLE `program` DISABLE KEYS */;
-/*!40000 ALTER TABLE `program` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `programgenres`
---
-
-DROP TABLE IF EXISTS `programgenres`;
-CREATE TABLE `programgenres` (
-  `chanid` int(10) unsigned NOT NULL default '0',
-  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
-  `relevance` char(1) NOT NULL default '',
-  `genre` char(30) default NULL,
-  PRIMARY KEY  (`chanid`,`starttime`,`relevance`),
-  KEY `genre` (`genre`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `programgenres`
---
-
-LOCK TABLES `programgenres` WRITE;
-/*!40000 ALTER TABLE `programgenres` DISABLE KEYS */;
-/*!40000 ALTER TABLE `programgenres` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `programrating`
---
-
-DROP TABLE IF EXISTS `programrating`;
-CREATE TABLE `programrating` (
-  `chanid` int(10) unsigned NOT NULL default '0',
-  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
-  `system` char(8) NOT NULL default '',
-  `rating` char(16) default NULL,
-  UNIQUE KEY `chanid` (`chanid`,`starttime`,`system`,`rating`),
-  KEY `starttime` (`starttime`,`system`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `programrating`
---
-
-LOCK TABLES `programrating` WRITE;
-/*!40000 ALTER TABLE `programrating` DISABLE KEYS */;
-/*!40000 ALTER TABLE `programrating` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `recgrouppassword`
---
-
-DROP TABLE IF EXISTS `recgrouppassword`;
-CREATE TABLE `recgrouppassword` (
-  `recgroup` varchar(32) NOT NULL default '',
-  `password` varchar(10) NOT NULL default '',
-  PRIMARY KEY  (`recgroup`),
-  UNIQUE KEY `recgroup` (`recgroup`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `recgrouppassword`
---
-
-LOCK TABLES `recgrouppassword` WRITE;
-/*!40000 ALTER TABLE `recgrouppassword` DISABLE KEYS */;
-/*!40000 ALTER TABLE `recgrouppassword` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `record`
---
-
-DROP TABLE IF EXISTS `record`;
-CREATE TABLE `record` (
-  `recordid` int(10) unsigned NOT NULL auto_increment,
-  `type` int(10) unsigned NOT NULL default '0',
-  `chanid` int(10) unsigned default NULL,
-  `starttime` time NOT NULL default '00:00:00',
-  `startdate` date NOT NULL default '0000-00-00',
-  `endtime` time NOT NULL default '00:00:00',
-  `enddate` date NOT NULL default '0000-00-00',
-  `title` varchar(128) NOT NULL default '',
-  `subtitle` varchar(128) NOT NULL default '',
-  `description` text NOT NULL,
-  `category` varchar(64) NOT NULL default '',
-  `profile` varchar(128) NOT NULL default 'Default',
-  `recpriority` int(10) NOT NULL default '0',
-  `autoexpire` int(11) NOT NULL default '0',
-  `maxepisodes` int(11) NOT NULL default '0',
-  `maxnewest` int(11) NOT NULL default '0',
-  `startoffset` int(11) NOT NULL default '0',
-  `endoffset` int(11) NOT NULL default '0',
-  `recgroup` varchar(32) NOT NULL default 'Default',
-  `dupmethod` int(11) NOT NULL default '6',
-  `dupin` int(11) NOT NULL default '15',
-  `station` varchar(20) NOT NULL default '',
-  `seriesid` varchar(40) NOT NULL default '',
-  `programid` varchar(40) NOT NULL default '',
-  `search` int(10) unsigned NOT NULL default '0',
-  `autotranscode` tinyint(1) NOT NULL default '0',
-  `autocommflag` tinyint(1) NOT NULL default '0',
-  `autouserjob1` tinyint(1) NOT NULL default '0',
-  `autouserjob2` tinyint(1) NOT NULL default '0',
-  `autouserjob3` tinyint(1) NOT NULL default '0',
-  `autouserjob4` tinyint(1) NOT NULL default '0',
-  `findday` tinyint(4) NOT NULL default '0',
-  `findtime` time NOT NULL default '00:00:00',
-  `findid` int(11) NOT NULL default '0',
-  `inactive` tinyint(1) NOT NULL default '0',
-  `parentid` int(11) NOT NULL default '0',
-  `transcoder` int(11) NOT NULL default '0',
-  `tsdefault` float NOT NULL default '1',
-  `playgroup` varchar(32) NOT NULL default 'Default',
-  `prefinput` int(10) NOT NULL default '0',
-  `next_record` datetime NOT NULL,
-  `last_record` datetime NOT NULL,
-  `last_delete` datetime NOT NULL,
-  `storagegroup` varchar(32) NOT NULL default 'Default',
-  `avg_delay` int(11) NOT NULL default '100',
-  PRIMARY KEY  (`recordid`),
-  KEY `chanid` (`chanid`,`starttime`),
-  KEY `title` (`title`),
-  KEY `seriesid` (`seriesid`),
-  KEY `programid` (`programid`),
-  KEY `maxepisodes` (`maxepisodes`),
-  KEY `search` (`search`),
-  KEY `type` (`type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `record`
---
-
-LOCK TABLES `record` WRITE;
-/*!40000 ALTER TABLE `record` DISABLE KEYS */;
-/*!40000 ALTER TABLE `record` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `recorded`
---
-
-DROP TABLE IF EXISTS `recorded`;
-CREATE TABLE `recorded` (
-  `chanid` int(10) unsigned NOT NULL default '0',
-  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
-  `endtime` datetime NOT NULL default '0000-00-00 00:00:00',
-  `title` varchar(128) NOT NULL default '',
-  `subtitle` varchar(128) NOT NULL default '',
-  `description` text NOT NULL,
-  `category` varchar(64) NOT NULL default '',
-  `hostname` varchar(255) NOT NULL default '',
-  `bookmark` tinyint(1) NOT NULL default '0',
-  `editing` int(10) unsigned NOT NULL default '0',
-  `cutlist` tinyint(1) NOT NULL default '0',
-  `autoexpire` int(11) NOT NULL default '0',
-  `commflagged` int(10) unsigned NOT NULL default '0',
-  `recgroup` varchar(32) NOT NULL default 'Default',
-  `recordid` int(11) default NULL,
-  `seriesid` varchar(40) NOT NULL default '',
-  `programid` varchar(40) NOT NULL default '',
-  `lastmodified` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
-  `filesize` bigint(20) NOT NULL default '0',
-  `stars` float NOT NULL default '0',
-  `previouslyshown` tinyint(1) default '0',
-  `originalairdate` date default NULL,
-  `preserve` tinyint(1) NOT NULL default '0',
-  `findid` int(11) NOT NULL default '0',
-  `deletepending` tinyint(1) NOT NULL default '0',
-  `transcoder` int(11) NOT NULL default '0',
-  `timestretch` float NOT NULL default '1',
-  `recpriority` int(11) NOT NULL default '0',
-  `basename` varchar(255) NOT NULL,
-  `progstart` datetime NOT NULL default '0000-00-00 00:00:00',
-  `progend` datetime NOT NULL default '0000-00-00 00:00:00',
-  `playgroup` varchar(32) NOT NULL default 'Default',
-  `profile` varchar(32) NOT NULL default '',
-  `duplicate` tinyint(1) NOT NULL default '0',
-  `transcoded` tinyint(1) NOT NULL default '0',
-  `watched` tinyint(4) NOT NULL default '0',
-  `storagegroup` varchar(32) NOT NULL default 'Default',
-  PRIMARY KEY  (`chanid`,`starttime`),
-  KEY `endtime` (`endtime`),
-  KEY `seriesid` (`seriesid`),
-  KEY `programid` (`programid`),
-  KEY `title` (`title`),
-  KEY `recordid` (`recordid`),
-  KEY `deletepending` (`deletepending`,`lastmodified`),
-  KEY `recgroup` (`recgroup`,`endtime`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `recorded`
---
-
-LOCK TABLES `recorded` WRITE;
-/*!40000 ALTER TABLE `recorded` DISABLE KEYS */;
-/*!40000 ALTER TABLE `recorded` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `recordedcredits`
---
-
-DROP TABLE IF EXISTS `recordedcredits`;
-CREATE TABLE `recordedcredits` (
-  `person` mediumint(8) unsigned NOT NULL default '0',
-  `chanid` int(10) unsigned NOT NULL default '0',
-  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
-  `role` set('actor','director','producer','executive_producer','writer','guest_star','host','adapter','presenter','commentator','guest') NOT NULL default '',
-  UNIQUE KEY `chanid` (`chanid`,`starttime`,`person`,`role`),
-  KEY `person` (`person`,`role`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `recordedcredits`
---
-
-LOCK TABLES `recordedcredits` WRITE;
-/*!40000 ALTER TABLE `recordedcredits` DISABLE KEYS */;
-/*!40000 ALTER TABLE `recordedcredits` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `recordedfile`
---
-
-DROP TABLE IF EXISTS `recordedfile`;
-CREATE TABLE `recordedfile` (
-  `chanid` int(10) unsigned NOT NULL default '0',
-  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
-  `basename` varchar(128) NOT NULL default '',
-  `filesize` bigint(20) NOT NULL default '0',
-  `width` smallint(5) unsigned NOT NULL default '0',
-  `height` smallint(5) unsigned NOT NULL default '0',
-  `fps` float(6,3) NOT NULL default '0.000',
-  `aspect` float(8,6) NOT NULL default '0.000000',
-  `audio_sample_rate` smallint(5) unsigned NOT NULL default '0',
-  `audio_bits_per_sample` smallint(5) unsigned NOT NULL default '0',
-  `audio_channels` tinyint(3) unsigned NOT NULL default '0',
-  `audio_type` varchar(255) NOT NULL default '',
-  `video_type` varchar(255) NOT NULL default '',
-  `comment` varchar(255) NOT NULL default '',
-  PRIMARY KEY  (`chanid`,`starttime`),
-  KEY `basename` (`basename`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `recordedfile`
---
-
-LOCK TABLES `recordedfile` WRITE;
-/*!40000 ALTER TABLE `recordedfile` DISABLE KEYS */;
-/*!40000 ALTER TABLE `recordedfile` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `recordedmarkup`
---
-
-DROP TABLE IF EXISTS `recordedmarkup`;
-CREATE TABLE `recordedmarkup` (
-  `chanid` int(10) unsigned NOT NULL default '0',
-  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
-  `mark` mediumint(8) unsigned NOT NULL default '0',
-  `offset` varchar(32) default NULL,
-  `type` tinyint(4) NOT NULL default '0',
-  PRIMARY KEY  (`chanid`,`starttime`,`type`,`mark`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `recordedmarkup`
---
-
-LOCK TABLES `recordedmarkup` WRITE;
-/*!40000 ALTER TABLE `recordedmarkup` DISABLE KEYS */;
-/*!40000 ALTER TABLE `recordedmarkup` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `recordedprogram`
---
-
-DROP TABLE IF EXISTS `recordedprogram`;
-CREATE TABLE `recordedprogram` (
-  `chanid` int(10) unsigned NOT NULL default '0',
-  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
-  `endtime` datetime NOT NULL default '0000-00-00 00:00:00',
-  `title` varchar(128) NOT NULL default '',
-  `subtitle` varchar(128) NOT NULL default '',
-  `description` text NOT NULL,
-  `category` varchar(64) NOT NULL default '',
-  `category_type` varchar(64) NOT NULL default '',
-  `airdate` year(4) NOT NULL default '0000',
-  `stars` float unsigned NOT NULL default '0',
-  `previouslyshown` tinyint(4) NOT NULL default '0',
-  `title_pronounce` varchar(128) NOT NULL default '',
-  `stereo` tinyint(1) NOT NULL default '0',
-  `subtitled` tinyint(1) NOT NULL default '0',
-  `hdtv` tinyint(1) NOT NULL default '0',
-  `closecaptioned` tinyint(1) NOT NULL default '0',
-  `partnumber` int(11) NOT NULL default '0',
-  `parttotal` int(11) NOT NULL default '0',
-  `seriesid` varchar(40) NOT NULL default '',
-  `originalairdate` date default NULL,
-  `showtype` varchar(30) NOT NULL default '',
-  `colorcode` varchar(20) NOT NULL default '',
-  `syndicatedepisodenumber` varchar(20) NOT NULL default '',
-  `programid` varchar(40) NOT NULL default '',
-  `manualid` int(10) unsigned NOT NULL default '0',
-  `generic` tinyint(1) default '0',
-  `listingsource` int(11) NOT NULL default '0',
-  `first` tinyint(1) NOT NULL default '0',
-  `last` tinyint(1) NOT NULL default '0',
-  `audioprop` set('STEREO','MONO','SURROUND','DOLBY','HARDHEAR','VISUALIMPAIR') NOT NULL,
-  `subtitletypes` set('HARDHEAR','NORMAL','ONSCREEN','SIGNED') NOT NULL,
-  `videoprop` set('HDTV','WIDESCREEN','AVC') NOT NULL,
-  PRIMARY KEY  (`chanid`,`starttime`,`manualid`),
-  KEY `endtime` (`endtime`),
-  KEY `title` (`title`),
-  KEY `title_pronounce` (`title_pronounce`),
-  KEY `seriesid` (`seriesid`),
-  KEY `programid` (`programid`),
-  KEY `id_start_end` (`chanid`,`starttime`,`endtime`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `recordedprogram`
---
-
-LOCK TABLES `recordedprogram` WRITE;
-/*!40000 ALTER TABLE `recordedprogram` DISABLE KEYS */;
-/*!40000 ALTER TABLE `recordedprogram` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `recordedrating`
---
-
-DROP TABLE IF EXISTS `recordedrating`;
-CREATE TABLE `recordedrating` (
-  `chanid` int(10) unsigned NOT NULL default '0',
-  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
-  `system` char(8) NOT NULL default '',
-  `rating` char(16) default NULL,
-  UNIQUE KEY `chanid` (`chanid`,`starttime`,`system`,`rating`),
-  KEY `starttime` (`starttime`,`system`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `recordedrating`
---
-
-LOCK TABLES `recordedrating` WRITE;
-/*!40000 ALTER TABLE `recordedrating` DISABLE KEYS */;
-/*!40000 ALTER TABLE `recordedrating` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `recordedseek`
---
-
-DROP TABLE IF EXISTS `recordedseek`;
-CREATE TABLE `recordedseek` (
-  `chanid` int(10) unsigned NOT NULL default '0',
-  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
-  `mark` mediumint(8) unsigned NOT NULL default '0',
-  `offset` bigint(20) unsigned NOT NULL,
-  `type` tinyint(4) NOT NULL default '0',
-  PRIMARY KEY  (`chanid`,`starttime`,`type`,`mark`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `recordedseek`
---
-
-LOCK TABLES `recordedseek` WRITE;
-/*!40000 ALTER TABLE `recordedseek` DISABLE KEYS */;
-/*!40000 ALTER TABLE `recordedseek` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `recordingprofiles`
---
-
-DROP TABLE IF EXISTS `recordingprofiles`;
-CREATE TABLE `recordingprofiles` (
-  `id` int(10) unsigned NOT NULL auto_increment,
-  `name` varchar(128) default NULL,
-  `videocodec` varchar(128) default NULL,
-  `audiocodec` varchar(128) default NULL,
-  `profilegroup` int(10) unsigned NOT NULL default '0',
-  PRIMARY KEY  (`id`),
-  KEY `profilegroup` (`profilegroup`)
-) ENGINE=MyISAM AUTO_INCREMENT=50 DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `recordingprofiles`
---
-
-LOCK TABLES `recordingprofiles` WRITE;
-/*!40000 ALTER TABLE `recordingprofiles` DISABLE KEYS */;
-INSERT INTO `recordingprofiles` VALUES (1,'Default',NULL,NULL,1),(2,'Live TV',NULL,NULL,1),(3,'High Quality',NULL,NULL,1),(4,'Low Quality',NULL,NULL,1),(5,'Default',NULL,NULL,2),(6,'Live TV',NULL,NULL,2),(7,'High Quality',NULL,NULL,2),(8,'Low Quality',NULL,NULL,2),(9,'Default',NULL,NULL,3),(10,'Live TV',NULL,NULL,3),(11,'High Quality',NULL,NULL,3),(12,'Low Quality',NULL,NULL,3),(13,'Default',NULL,NULL,4),(14,'Live TV',NULL,NULL,4),(15,'High Quality',NULL,NULL,4),(16,'Low Quality',NULL,NULL,4),(17,'Default',NULL,NULL,5),(18,'Live TV',NULL,NULL,5),(19,'High Quality',NULL,NULL,5),(20,'Low Quality',NULL,NULL,5),(21,'RTjpeg/MPEG4',NULL,NULL,6),(22,'MPEG2',NULL,NULL,6),(23,'Default',NULL,NULL,8),(24,'Live TV',NULL,NULL,8),(25,'High Quality',NULL,NULL,8),(26,'Low Quality',NULL,NULL,8),(27,'High Quality',NULL,NULL,6),(28,'Medium Quality',NULL,NULL,6),(29,'Low Quality',NULL,NULL,6),(30,'Default',NULL,NULL,10),(31,'Live TV',NULL,NULL,10),(32,'High Quality',NULL,NULL,10),(33,'Low Quality',NULL,NULL,10),(34,'Default',NULL,NULL,11),(35,'Live TV',NULL,NULL,11),(36,'High Quality',NULL,NULL,11),(37,'Low Quality',NULL,NULL,11),(38,'Default',NULL,NULL,12),(39,'Live TV',NULL,NULL,12),(40,'High Quality',NULL,NULL,12),(41,'Low Quality',NULL,NULL,12),(42,'Default',NULL,NULL,7),(43,'Live TV',NULL,NULL,7),(44,'High Quality',NULL,NULL,7),(45,'Low Quality',NULL,NULL,7),(46,'Default',NULL,NULL,9),(47,'Live TV',NULL,NULL,9),(48,'High Quality',NULL,NULL,9),(49,'Low Quality',NULL,NULL,9);
-/*!40000 ALTER TABLE `recordingprofiles` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `recordmatch`
---
-
-DROP TABLE IF EXISTS `recordmatch`;
-CREATE TABLE `recordmatch` (
-  `recordid` int(10) unsigned default NULL,
-  `chanid` int(10) unsigned default NULL,
-  `starttime` datetime default NULL,
-  `manualid` int(10) unsigned default NULL,
-  `oldrecduplicate` tinyint(1) default NULL,
-  `recduplicate` tinyint(1) default NULL,
-  `findduplicate` tinyint(1) default NULL,
-  `oldrecstatus` int(11) default NULL,
-  KEY `recordid` (`recordid`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `recordmatch`
---
-
-LOCK TABLES `recordmatch` WRITE;
-/*!40000 ALTER TABLE `recordmatch` DISABLE KEYS */;
-/*!40000 ALTER TABLE `recordmatch` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `romdb`
---
-
-DROP TABLE IF EXISTS `romdb`;
-CREATE TABLE `romdb` (
-  `crc` varchar(64) NOT NULL default '',
-  `name` varchar(128) NOT NULL default '',
-  `description` varchar(128) NOT NULL default '',
-  `category` varchar(128) NOT NULL default '',
-  `year` varchar(10) NOT NULL default '',
-  `manufacturer` varchar(128) NOT NULL default '',
-  `country` varchar(128) NOT NULL default '',
-  `publisher` varchar(128) NOT NULL default '',
-  `platform` varchar(64) NOT NULL default '',
-  `filesize` int(12) default NULL,
-  `flags` varchar(64) NOT NULL default '',
-  `version` varchar(64) NOT NULL default '',
-  `binfile` varchar(64) NOT NULL default '',
-  KEY `crc` (`crc`),
-  KEY `year` (`year`),
-  KEY `category` (`category`),
-  KEY `name` (`name`),
-  KEY `description` (`description`),
-  KEY `platform` (`platform`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `romdb`
---
-
-LOCK TABLES `romdb` WRITE;
-/*!40000 ALTER TABLE `romdb` DISABLE KEYS */;
-/*!40000 ALTER TABLE `romdb` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `schemalock`
---
-
-DROP TABLE IF EXISTS `schemalock`;
-CREATE TABLE `schemalock` (
-  `schemalock` int(1) default NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `schemalock`
---
-
-LOCK TABLES `schemalock` WRITE;
-/*!40000 ALTER TABLE `schemalock` DISABLE KEYS */;
-/*!40000 ALTER TABLE `schemalock` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `settings`
---
-
-DROP TABLE IF EXISTS `settings`;
-CREATE TABLE `settings` (
-  `value` varchar(128) NOT NULL default '',
-  `data` text,
-  `hostname` varchar(255) default NULL,
-  KEY `value` (`value`,`hostname`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `settings`
---
-
-LOCK TABLES `settings` WRITE;
-/*!40000 ALTER TABLE `settings` DISABLE KEYS */;
-INSERT INTO `settings` VALUES ('mythfilldatabaseLastRunStart',NULL,NULL),('mythfilldatabaseLastRunEnd',NULL,NULL),('mythfilldatabaseLastRunStatus',NULL,NULL),('DataDirectMessage',NULL,NULL),('HaveRepeats','0',NULL),('DBSchemaVer','1211',NULL),('DefaultTranscoder','0',NULL),('MythFillSuggestedRunTime','1970-01-01T00:00:00',NULL),('MythFillGrabberSuggestsTime','1',NULL),('Language','EN','myhost'),('BackendServerIP','127.0.0.1','myhost'),('BackendServerPort','6543','myhost'),('BackendStatusPort','6544','myhost'),('MasterServerIP','127.0.0.1',NULL),('MasterServerPort','6543',NULL),('RecordFilePrefix','/data/media/video/recordings','myhost'),('TVFormat','NTSC',NULL),('VbiFormat','None',NULL),('FreqTable','us-bcast',NULL),('TimeOffset','None',NULL),('MasterBackendOverride','1',NULL),('DeletesFollowLinks','0',NULL),('EITTimeOffset','Auto',NULL),('EITTransportTimeout','5',NULL),('EITIgnoresSource','0',NULL),('EITCrawIdleStart','60',NULL),('startupCommand','',NULL),('blockSDWUwithoutClient','1',NULL),('idleTimeoutSecs','0',NULL),('idleWaitForRecordingTime','15',NULL),('StartupSecsBeforeRecording','120',NULL),('WakeupTimeFormat','hh:mm yyyy-MM-dd',NULL),('SetWakeuptimeCommand','',NULL),('ServerHaltCommand','sudo /sbin/halt -p',NULL),('preSDWUCheckCommand','',NULL),('WOLbackendReconnectWaitTime','0',NULL),('WOLbackendConnectRetry','5',NULL),('WOLbackendCommand','',NULL),('WOLslaveBackendsCommand','',NULL),('JobQueueMaxSimultaneousJobs','1','myhost'),('JobQueueCheckFrequency','60','myhost'),('JobQueueWindowStart','00:00','myhost'),('JobQueueWindowEnd','23:59','myhost'),('JobQueueCPU','0','myhost'),('JobAllowCommFlag','1','myhost'),('JobAllowTranscode','1','myhost'),('JobAllowUserJob1','1','myhost'),('JobAllowUserJob2','1','myhost'),('JobAllowUserJob3','1','myhost'),('JobAllowUserJob4','1','myhost'),('JobsRunOnRecordHost','0',NULL),('AutoCommflagWhileRecording','0',NULL),('JobQueueCommFlagCommand','mythcommflag',NULL),('JobQueueTranscodeCommand','mythtranscode',NULL),('AutoTranscodeBeforeAutoCommflag','0',NULL),('SaveTranscoding','0',NULL),('UserJobDesc1','Encode to ipod',NULL),('UserJob1','/usr/bin/myth2ipod-userjob.sh \"%DIR%\" \"%FILE%\"',NULL),('UserJobDesc2','User Job #2',NULL),('UserJob2','',NULL),('UserJobDesc3','User Job #3',NULL),('UserJob3','',NULL),('UserJobDesc4','User Job #4',NULL),('UserJob4','',NULL),('Deinterlace','1','myhost'),('DeinterlaceFilter','kerneldeint','myhost'),('CustomFilters','','myhost'),('PreferredMPEG2Decoder','ffmpeg','myhost'),('RealtimePriority','1','myhost'),('UseVideoTimebase','0','myhost'),('DecodeExtraAudio','1','myhost'),('AspectOverride','0','myhost'),('PIPLocation','0','myhost'),('PlaybackExitPrompt','2','myhost'),('EndOfRecordingExitPrompt','1','myhost'),('ClearSavedPosition','1','myhost'),('AltClearSavedPosition','1','myhost'),('UseOutputPictureControls','0','myhost'),('AudioNag','1','myhost'),('UDPNotifyPort','6948','myhost'),('PlayBoxOrdering','1','myhost'),('PlayBoxEpisodeSort','Date','myhost'),('GeneratePreviewPixmaps','0','myhost'),('PreviewPixmapOffset','64',NULL),('PreviewFromBookmark','1','myhost'),('PlaybackPreview','1','myhost'),('PlaybackPreviewLowCPU','0','myhost'),('PlaybackBoxStartInTitle','1','myhost'),('ShowGroupInfo','0','myhost'),('AllRecGroupPassword','',NULL),('DisplayRecGroup','Default','myhost'),('QueryInitialFilter','0','myhost'),('RememberRecGroup','1','myhost'),('DispRecGroupAsAllProg','0','myhost'),('LiveTVInAllPrograms','0','myhost'),('DisplayGroupDefaultView','0','myhost'),('DisplayGroupTitleSort','0','myhost'),('PVR350OutputEnable','0','myhost'),('PVR350VideoDev','/dev/video16','myhost'),('PVR350EPGAlphaValue','164','myhost'),('PVR350InternalAudioOnly','0','myhost'),('SmartForward','0','myhost'),('StickyKeys','1','myhost'),('FFRewReposTime','100','myhost'),('FFRewReverse','1','myhost'),('ExactSeeking','0','myhost'),('AutoCommercialSkip','2','myhost'),('CommRewindAmount','0','myhost'),('CommNotifyAmount','0','myhost'),('MaximumCommercialSkip','3600',NULL),('CommSkipAllBlanks','1',NULL),('VertScanPercentage','0','myhost'),('HorizScanPercentage','0','myhost'),('XScanDisplacement','0','myhost'),('YScanDisplacement','0','myhost'),('OSDTheme','blueosd','myhost'),('OSDGeneralTimeout','2','myhost'),('OSDProgramInfoTimeout','3','myhost'),('OSDNotifyTimeout','5','myhost'),('OSDFont','FreeMono.ttf','myhost'),('OSDCCFont','FreeMono.ttf','myhost'),('OSDThemeFontSizeType','default','myhost'),('CCBackground','0','myhost'),('DefaultCCMode','0','myhost'),('PersistentBrowseMode','1','myhost'),('EnableMHEG','0','myhost'),('OSDCC708TextZoom','100','myhost'),('OSDCC708DefaultFontType','MonoSerif','myhost'),('OSDCC708MonoSerifFont','FreeMono.ttf','myhost'),('OSDCC708PropSerifFont','FreeMono.ttf','myhost'),('OSDCC708MonoSansSerifFont','FreeMono.ttf','myhost'),('OSDCC708PropSansSerifFont','FreeMono.ttf','myhost'),('OSDCC708CasualFont','FreeMono.ttf','myhost'),('OSDCC708CursiveFont','FreeMono.ttf','myhost'),('OSDCC708CapitalsFont','FreeMono.ttf','myhost'),('OSDCC708MonoSerifItalicFont','FreeMono.ttf','myhost'),('OSDCC708PropSerifItalicFont','FreeMono.ttf','myhost'),('OSDCC708MonoSansSerifItalicFont','FreeMono.ttf','myhost'),('OSDCC708PropSansSerifItalicFont','FreeMono.ttf','myhost'),('OSDCC708CasualItalicFont','FreeMono.ttf','myhost'),('OSDCC708CursiveItalicFont','FreeMono.ttf','myhost'),('OSDCC708CapitalsItalicFont','FreeMono.ttf','myhost'),('ChannelOrdering','channum','myhost'),('ChannelFormat','<num> <sign>','myhost'),('LongChannelFormat','<num> <name>','myhost'),('SmartChannelChange','0','myhost'),('LastFreeCard','0',NULL),('AutoExpireMethod','2',NULL),('AutoExpireDayPriority','3',NULL),('AutoExpireDefault','1',NULL),('AutoExpireLiveTVMaxAge','1',NULL),('AutoCommercialFlag','1',NULL),('CommercialSkipMethod','255',NULL),('AggressiveCommDetect','1',NULL),('AutoTranscode','0',NULL),('AutoRunUserJob1','0',NULL),('AutoRunUserJob2','0',NULL),('AutoRunUserJob3','0',NULL),('AutoRunUserJob4','0',NULL),('AutoExpireExtraSpace','2',NULL),('RecordPreRoll','0',NULL),('RecordOverTime','0',NULL),('OverTimeCategory','category name',NULL),('CategoryOverTime','30',NULL),('ATSCCheckSignalThreshold','65',NULL),('ATSCCheckSignalWait','5000',NULL),('HDRingbufferSize','9400',NULL),('EPGFillType','10','myhost'),('EPGShowCategoryColors','1','myhost'),('EPGShowCategoryText','1','myhost'),('EPGScrollType','1','myhost'),('EPGShowChannelIcon','1','myhost'),('EPGShowFavorites','0','myhost'),('WatchTVGuide','0','myhost'),('chanPerPage','5','myhost'),('timePerPage','4','myhost'),('UnknownTitle','Unknown','myhost'),('UnknownCategory','Unknown','myhost'),('DefaultTVChannel','3','myhost'),('SelectChangesChannel','1','myhost'),('SelChangeRecThreshold','16','myhost'),('EPGEnableJumpToChannel','0',NULL),('Theme','basic-purple','myhost'),('ThemePainter','qt','myhost'),('Style','Windows','myhost'),('ThemeFontSizeType','default','myhost'),('RandomTheme','0','myhost'),('MenuTheme','MythVantage-menu','myhost'),('GuiWidth','0','myhost'),('GuiHeight','0','myhost'),('GuiOffsetX','0','myhost'),('GuiOffsetY','0','myhost'),('GuiSizeForTV','0','myhost'),('HideMouseCursor','1','myhost'),('RunFrontendInWindow','0','myhost'),('UseVideoModes','0','myhost'),('GuiVidModeResolution','640x480','myhost'),('TVVidModeResolution','640x480','myhost'),('TVVidModeForceAspect','0.0','myhost'),('VidModeWidth0','0','myhost'),('VidModeHeight0','0','myhost'),('TVVidModeResolution0','640x480','myhost'),('TVVidModeForceAspect0','0.0','myhost'),('VidModeWidth1','0','myhost'),('VidModeHeight1','0','myhost'),('TVVidModeResolution1','640x480','myhost'),('TVVidModeForceAspect1','0.0','myhost'),('VidModeWidth2','0','myhost'),('VidModeHeight2','0','myhost'),('TVVidModeResolution2','640x480','myhost'),('TVVidModeForceAspect2','0.0','myhost'),('ISO639Language0','eng','myhost'),('ISO639Language1','eng','myhost'),('DateFormat','ddd MMM d','myhost'),('ShortDateFormat','M/d','myhost'),('TimeFormat','h:mm AP','myhost'),('QtFontSmall','12','myhost'),('QtFontMedium','16','myhost'),('QtFontBig','25','myhost'),('PlayBoxTransparency','1','myhost'),('PlayBoxShading','0','myhost'),('UseVirtualKeyboard','1','myhost'),('LCDEnable','0','myhost'),('LCDShowTime','1','myhost'),('LCDShowMenu','1','myhost'),('LCDShowMusic','1','myhost'),('LCDShowMusicItems','ArtistTitle','myhost'),('LCDShowChannel','1','myhost'),('LCDShowRecStatus','0','myhost'),('LCDShowVolume','1','myhost'),('LCDShowGeneric','1','myhost'),('LCDBacklightOn','1','myhost'),('LCDHeartBeatOn','0','myhost'),('LCDBigClock','0','myhost'),('LCDKeyString','ABCDEF','myhost'),('LCDPopupTime','5','myhost'),('PassThruOutputDevice','Default','myhost'),('AC3PassThru','0','myhost'),('DTSPassThru','0','myhost'),('AggressiveSoundcardBuffer','0','myhost'),('MythControlsVolume','1','myhost'),('MixerControl','PCM','myhost'),('MasterMixerVolume','70','myhost'),('PCMMixerVolume','70','myhost'),('IndividualMuteControl','0','myhost'),('AllowQuitShutdown','3','myhost'),('NoPromptOnExit','0','myhost'),('HaltCommand','sudo /sbin/poweroff','myhost'),('LircKeyPressedApp','','myhost'),('UseArrowAccels','1','myhost'),('NetworkControlEnabled','1','myhost'),('NetworkControlPort','6546','myhost'),('SetupPinCodeRequired','0','myhost'),('MonitorDrives','0','myhost'),('EnableXbox','0','myhost'),('LogEnabled','1',NULL),('LogPrintLevel','8','myhost'),('LogCleanEnabled','0','myhost'),('LogCleanPeriod','14','myhost'),('LogCleanDays','14','myhost'),('LogCleanMax','30','myhost'),('LogMaxCount','100','myhost'),('MythFillEnabled','0',NULL),('MythFillDatabasePath','/usr/local/bin/mythfilldatabase',NULL),('MythFillDatabaseArgs','',NULL),('MythFillDatabaseLog','',NULL),('MythFillPeriod','1',NULL),('MythFillMinHour','2',NULL),('MythFillMaxHour','5',NULL),('SchedMoveHigher','1',NULL),('DefaultStartOffset','0',NULL),('DefaultEndOffset','0',NULL),('ComplexPriority','0',NULL),('PrefInputPriority','2',NULL),('OnceRecPriority','0',NULL),('HDTVRecPriority','0',NULL),('CCRecPriority','0',NULL),('SingleRecordRecPriority','1',NULL),('OverrideRecordRecPriority','0',NULL),('FindOneRecordRecPriority','-1',NULL),('WeekslotRecordRecPriority','0',NULL),('TimeslotRecordRecPriority','0',NULL),('ChannelRecordRecPriority','0',NULL),('AllRecordRecPriority','0',NULL),('ArchiveDBSchemaVer','1000',NULL),('MythArchiveTempDir','/data/media/tmp','myhost'),('MythArchiveShareDir','/usr/local/share/mythtv/mytharchive/','myhost'),('MythArchiveVideoFormat','NTSC','myhost'),('MythArchiveFileFilter','*.mpg *.mov *.avi *.mpeg *.nuv','myhost'),('MythArchiveDVDLocation','/dev/dvd','myhost'),('MythArchiveEncodeToAc3','1','myhost'),('MythArchiveCopyRemoteFiles','1','myhost'),('MythArchiveAlwaysUseMythTranscode','1','myhost'),('MythArchiveUseFIFO','1','myhost'),('MythArchiveMainMenuAR','16:9','myhost'),('MythArchiveChapterMenuAR','Video','myhost'),('MythArchiveFfmpegCmd','ffmpeg','myhost'),('MythArchiveMplexCmd','mplex','myhost'),('MythArchiveDvdauthorCmd','dvdauthor','myhost'),('MythArchiveSpumuxCmd','spumux','myhost'),('MythArchiveMpeg2encCmd','mpeg2enc','myhost'),('MythArchiveMkisofsCmd','mkisofs','myhost'),('MythArchiveGrowisofsCmd','growisofs','myhost'),('MythArchiveTcrequantCmd','tcrequant','myhost'),('MythArchivePng2yuvCmd','png2yuv','myhost'),('DVDDBSchemaVer','1002',NULL),('DVDDeviceLocation','/dev/dvd','myhost'),('VCDDeviceLocation','/dev/cdrom','myhost'),('DVDOnInsertDVD','1','myhost'),('mythdvd.DVDPlayerCommand','Internal','myhost'),('VCDPlayerCommand','mplayer vcd:// -cdrom-device %d -fs -zoom -vo xv','myhost'),('DVDRipLocation','/data/media/tmp','myhost'),('TitlePlayCommand','mplayer dvd://%t -dvd-device %d -fs -zoom -vo xv -aid %a -channels %c','myhost'),('SubTitleCommand','-sid %s','myhost'),('TranscodeCommand','transcode','myhost'),('MTDPort','2442','myhost'),('MTDNiceLevel','20','myhost'),('MTDConcurrentTranscodes','1','myhost'),('MTDRipSize','0','myhost'),('MTDLogFlag','0','myhost'),('MTDac3Flag','0','myhost'),('MTDxvidFlag','1','myhost'),('GalleryDBSchemaVer','1000',NULL),('GalleryDir','/data/media/images','myhost'),('GalleryThumbnailLocation','1','myhost'),('GallerySortOrder','20','myhost'),('GalleryImportDirs','/mnt/cdrom:/mnt/camera','myhost'),('GalleryMoviePlayerCmd','mplayer -fs %s','myhost'),('SlideshowOpenGLTransition','none','myhost'),('SlideshowOpenGLTransitionLength','2000','myhost'),('SlideshowTransition','none','myhost'),('SlideshowBackground','','myhost'),('SlideshowDelay','5','myhost'),('GameDBSchemaVer','1012',NULL),('MusicDBSchemaVer','1006',NULL),('MusicLocation','/data/media/audio','myhost'),('MusicAudioDevice','default','myhost'),('CDDevice','/dev/cdrom','myhost'),('TreeLevels','splitartist artist album title','myhost'),('NonID3FileNameFormat','GENRE/ARTIST/ALBUM/TRACK_TITLE','myhost'),('Ignore_ID3','0','myhost'),('AutoLookupCD','1','myhost'),('AutoPlayCD','0','myhost'),('KeyboardAccelerators','1','myhost'),('CDWriterEnabled','0','myhost'),('CDDiskSize','1','myhost'),('CDCreateDir','1','myhost'),('CDWriteSpeed','0','myhost'),('CDBlankType','fast','myhost'),('PlayMode','none','myhost'),('IntelliRatingWeight','35','myhost'),('IntelliPlayCountWeight','25','myhost'),('IntelliLastPlayWeight','25','myhost'),('IntelliRandomWeight','15','myhost'),('MusicShowRatings','0','myhost'),('ShowWholeTree','1','myhost'),('ListAsShuffled','0','myhost'),('VisualMode','Random','myhost'),('VisualCycleOnSongChange','0','myhost'),('VisualModeDelay','0','myhost'),('VisualScaleWidth','1','myhost'),('VisualScaleHeight','1','myhost'),('ParanoiaLevel','Full','myhost'),('FilenameTemplate','ARTIST/ALBUM/TRACK-TITLE','myhost'),('TagSeparator',' - ','myhost'),('NoWhitespace','0','myhost'),('PostCDRipScript','','myhost'),('EjectCDAfterRipping','1','myhost'),('OnlyImportNewMusic','0','myhost'),('EncoderType','ogg','myhost'),('DefaultRipQuality','0','myhost'),('Mp3UseVBR','0','myhost'),('VideoDBSchemaVer','1010',NULL),('VideoStartupDir','/data/media/video/movies','myhost'),('VideoArtworkDir','/data/media/images/posters','myhost'),('VideoDefaultParentalLevel','4','myhost'),('VideoAggressivePC','0','myhost'),('VideoListUnknownFiletypes','1','myhost'),('VideoBrowserNoDB','0','myhost'),('VideoGalleryNoDB','0','myhost'),('VideoTreeNoDB','0','myhost'),('VideoTreeLoadMetaData','1','myhost'),('VideoNewBrowsable','1','myhost'),('mythvideo.sort_ignores_case','1','myhost'),('mythvideo.db_folder_view','1','myhost'),('mythvideo.ImageCacheSize','50','myhost'),('Default MythVideo View','1','myhost'),('MovieListCommandLine','/usr/local/share/mythtv/mythvideo/scripts/imdb.pl -M tv=no;video=no','myhost'),('MoviePosterCommandLine','/usr/local/share/mythtv/mythvideo/scripts/imdb.pl -P','myhost'),('MovieDataCommandLine','/usr/local/share/mythtv/mythvideo/scripts/imdb.pl -D','myhost'),('VideoGalleryColsPerPage','4','myhost'),('VideoGalleryRowsPerPage','3','myhost'),('VideoGallerySubtitle','1','myhost'),('VideoGalleryAspectRatio','1','myhost'),('VideoDefaultPlayer','Internal','myhost'),('Myhostname','myhost','myhost'),('UseDHCP','1','myhost'),('RepeatMode','all','myhost'),('LastMusicPlaylistPush','0','myhost'),('Mysqlserver','127.0.0.1','myhost'),('ServiceMythWEB','0','myhost'),('ServiceNFS','0','myhost'),('ServiceSamba','0','myhost'),('TVVidModeRefreshRate','0','myhost'),('TVVidModeRefreshRate0','0','myhost'),('TVVidModeRefreshRate1','0','myhost'),('TVVidModeRefreshRate2','0','myhost'),('GalleryRecursiveSlideshow','1','myhost'),('GameAllTreeLevels','system gamename','myhost'),('GameFavTreeLevels','gamename','myhost'),('WebBrowserZoomLevel','20','myhost'),('WebBrowserCommand','/usr/local/bin/mythbrowser','myhost'),('WebBrowserScrollMode','1','myhost'),('WebBrowserScrollSpeed','4','myhost'),('WebBrowserHideScrollbars','0','myhost'),('locale','USWI0455','myhost'),('AutomaticSetWatched','0','myhost'),('AutoExpireWatchedPriority','0',NULL),('RerecordWatched','1',NULL),('AudioOutputDevice','/dev/dsp','myhost'),('MixerDevice','/dev/mixer','myhost'),('MythArchiveDateFormat','%a  %b  %d','myhost'),('MythArchiveTimeFormat','%I:%M %p','myhost'),('GalleryOverlayCaption','0','myhost'),('DisplayGroupDefaultViewMask','1','myhost'),('TruncateDeletesSlowly','0','myhost'),('HOSTtemplatetype','Do Nothing','myhost'),('MythFillFixProgramIDsHasRunOnce','1','myhost'),('BackupDBLastRunStart','2008-02-21 08:34:39',NULL),('BackupDBLastRunEnd','2008-02-21 08:34:39',NULL),('DefaultVideoPlaybackProfile','CPU+','myhost'),('JumpToProgramOSD','1','myhost'),('ContinueEmbeddedTVPlay','0','myhost'),('AlwaysStreamFiles','0','myhost'),('UseOpenGLVSync','0','myhost'),('AdjustFill','0','myhost'),('LetterboxColour','0','myhost'),('PlaybackWatchList','1','myhost'),('PlaybackWLStart','0','myhost'),('PlaybackWLAutoExpire','0','myhost'),('PlaybackWLMaxAge','60','myhost'),('PlaybackWLBlackOut','2','myhost'),('Prefer708Captions','1','myhost'),('LiveTVPriority','0',NULL),('AutoExpireInsteadOfDelete','0',NULL),('DeletedFifoOrder','0',NULL),('ThemeCacheSize','1','myhost'),('MaxChannels','2','myhost'),('AudioUpmixType','2','myhost'),('ScreenShotPath','/data/home/mythtv/capture','myhost'),('MediaChangeEvents','0','myhost'),('IgnoreDevices','','myhost'),('OverrideExitMenu','0','myhost'),('RebootCommand','sudo /sbin/reboot','myhost'),('SchedOpenEnd','0',NULL);
-/*!40000 ALTER TABLE `settings` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `storagegroup`
---
-
-DROP TABLE IF EXISTS `storagegroup`;
-CREATE TABLE `storagegroup` (
-  `id` int(11) NOT NULL auto_increment,
-  `groupname` varchar(32) NOT NULL,
-  `hostname` varchar(64) NOT NULL default '',
-  `dirname` varchar(255) NOT NULL default '',
-  PRIMARY KEY  (`id`),
-  UNIQUE KEY `grouphostdir` (`groupname`,`hostname`,`dirname`),
-  KEY `hostname` (`hostname`)
-) ENGINE=MyISAM AUTO_INCREMENT=5 DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `storagegroup`
---
-
-LOCK TABLES `storagegroup` WRITE;
-/*!40000 ALTER TABLE `storagegroup` DISABLE KEYS */;
-INSERT INTO `storagegroup` VALUES (1,'Default','myhost','/data/media/video/recordings'),(2,'DB Backups','myhost','/data/database_backup/'),(4,'LiveTV','myhost','/data/media/video/livetv/');
-/*!40000 ALTER TABLE `storagegroup` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `tvchain`
---
-
-DROP TABLE IF EXISTS `tvchain`;
-CREATE TABLE `tvchain` (
-  `chanid` int(10) unsigned NOT NULL default '0',
-  `starttime` datetime NOT NULL default '0000-00-00 00:00:00',
-  `chainid` varchar(128) NOT NULL default '',
-  `chainpos` int(10) NOT NULL default '0',
-  `discontinuity` tinyint(1) NOT NULL default '0',
-  `watching` int(10) NOT NULL default '0',
-  `hostprefix` varchar(128) NOT NULL default '',
-  `cardtype` varchar(32) NOT NULL default 'V4L',
-  `input` varchar(32) NOT NULL default '',
-  `channame` varchar(32) NOT NULL default '',
-  `endtime` datetime NOT NULL default '0000-00-00 00:00:00',
-  PRIMARY KEY  (`chanid`,`starttime`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `tvchain`
---
-
-LOCK TABLES `tvchain` WRITE;
-/*!40000 ALTER TABLE `tvchain` DISABLE KEYS */;
-/*!40000 ALTER TABLE `tvchain` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `upnpmedia`
---
-
-DROP TABLE IF EXISTS `upnpmedia`;
-CREATE TABLE `upnpmedia` (
-  `intid` int(10) unsigned NOT NULL default '0',
-  `class` varchar(64) NOT NULL default '',
-  `itemtype` varchar(128) NOT NULL default '',
-  `parentid` int(10) unsigned NOT NULL default '0',
-  `itemproperties` varchar(255) NOT NULL default '',
-  `filepath` varchar(512) NOT NULL default '',
-  `title` varchar(255) NOT NULL default '',
-  `filename` varchar(512) NOT NULL default '',
-  `coverart` varchar(512) NOT NULL default '',
-  PRIMARY KEY  (`intid`),
-  KEY `class` (`class`),
-  KEY `filepath` (`filepath`),
-  KEY `parentid` (`parentid`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `upnpmedia`
---
-
-LOCK TABLES `upnpmedia` WRITE;
-/*!40000 ALTER TABLE `upnpmedia` DISABLE KEYS */;
-/*!40000 ALTER TABLE `upnpmedia` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `videocategory`
---
-
-DROP TABLE IF EXISTS `videocategory`;
-CREATE TABLE `videocategory` (
-  `intid` int(10) unsigned NOT NULL auto_increment,
-  `category` varchar(128) NOT NULL,
-  PRIMARY KEY  (`intid`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `videocategory`
---
-
-LOCK TABLES `videocategory` WRITE;
-/*!40000 ALTER TABLE `videocategory` DISABLE KEYS */;
-/*!40000 ALTER TABLE `videocategory` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `videocountry`
---
-
-DROP TABLE IF EXISTS `videocountry`;
-CREATE TABLE `videocountry` (
-  `intid` int(10) unsigned NOT NULL auto_increment,
-  `country` varchar(128) NOT NULL,
-  PRIMARY KEY  (`intid`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `videocountry`
---
-
-LOCK TABLES `videocountry` WRITE;
-/*!40000 ALTER TABLE `videocountry` DISABLE KEYS */;
-/*!40000 ALTER TABLE `videocountry` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `videogenre`
---
-
-DROP TABLE IF EXISTS `videogenre`;
-CREATE TABLE `videogenre` (
-  `intid` int(10) unsigned NOT NULL auto_increment,
-  `genre` varchar(128) NOT NULL,
-  PRIMARY KEY  (`intid`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `videogenre`
---
-
-LOCK TABLES `videogenre` WRITE;
-/*!40000 ALTER TABLE `videogenre` DISABLE KEYS */;
-/*!40000 ALTER TABLE `videogenre` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `videometadata`
---
-
-DROP TABLE IF EXISTS `videometadata`;
-CREATE TABLE `videometadata` (
-  `intid` int(10) unsigned NOT NULL auto_increment,
-  `title` varchar(128) NOT NULL,
-  `director` varchar(128) NOT NULL,
-  `plot` text,
-  `rating` varchar(128) NOT NULL,
-  `inetref` varchar(32) NOT NULL,
-  `year` int(10) unsigned NOT NULL,
-  `userrating` float NOT NULL,
-  `length` int(10) unsigned NOT NULL,
-  `showlevel` int(10) unsigned NOT NULL,
-  `filename` text NOT NULL,
-  `coverfile` text NOT NULL,
-  `childid` int(11) NOT NULL default '-1',
-  `browse` tinyint(1) NOT NULL default '1',
-  `playcommand` varchar(255) default NULL,
-  `category` int(10) unsigned NOT NULL default '0',
-  PRIMARY KEY  (`intid`),
-  KEY `director` (`director`),
-  KEY `title` (`title`),
-  KEY `title_2` (`title`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `videometadata`
---
-
-LOCK TABLES `videometadata` WRITE;
-/*!40000 ALTER TABLE `videometadata` DISABLE KEYS */;
-/*!40000 ALTER TABLE `videometadata` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `videometadatacountry`
---
-
-DROP TABLE IF EXISTS `videometadatacountry`;
-CREATE TABLE `videometadatacountry` (
-  `idvideo` int(10) unsigned NOT NULL,
-  `idcountry` int(10) unsigned NOT NULL,
-  KEY `idvideo` (`idvideo`),
-  KEY `idcountry` (`idcountry`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `videometadatacountry`
---
-
-LOCK TABLES `videometadatacountry` WRITE;
-/*!40000 ALTER TABLE `videometadatacountry` DISABLE KEYS */;
-/*!40000 ALTER TABLE `videometadatacountry` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `videometadatagenre`
---
-
-DROP TABLE IF EXISTS `videometadatagenre`;
-CREATE TABLE `videometadatagenre` (
-  `idvideo` int(10) unsigned NOT NULL,
-  `idgenre` int(10) unsigned NOT NULL,
-  KEY `idvideo` (`idvideo`),
-  KEY `idgenre` (`idgenre`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `videometadatagenre`
---
-
-LOCK TABLES `videometadatagenre` WRITE;
-/*!40000 ALTER TABLE `videometadatagenre` DISABLE KEYS */;
-/*!40000 ALTER TABLE `videometadatagenre` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `videosource`
---
-
-DROP TABLE IF EXISTS `videosource`;
-CREATE TABLE `videosource` (
-  `sourceid` int(10) unsigned NOT NULL auto_increment,
-  `name` varchar(128) NOT NULL default '',
-  `xmltvgrabber` varchar(128) default NULL,
-  `userid` varchar(128) NOT NULL default '',
-  `freqtable` varchar(16) NOT NULL default 'default',
-  `lineupid` varchar(64) default NULL,
-  `password` varchar(64) default NULL,
-  `useeit` smallint(6) NOT NULL default '0',
-  PRIMARY KEY  (`sourceid`),
-  UNIQUE KEY `name` (`name`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `videosource`
---
-
-LOCK TABLES `videosource` WRITE;
-/*!40000 ALTER TABLE `videosource` DISABLE KEYS */;
-/*!40000 ALTER TABLE `videosource` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `videotypes`
---
-
-DROP TABLE IF EXISTS `videotypes`;
-CREATE TABLE `videotypes` (
-  `intid` int(10) unsigned NOT NULL auto_increment,
-  `extension` varchar(128) NOT NULL,
-  `playcommand` varchar(255) NOT NULL,
-  `f_ignore` tinyint(1) default NULL,
-  `use_default` tinyint(1) default NULL,
-  PRIMARY KEY  (`intid`)
-) ENGINE=MyISAM AUTO_INCREMENT=10 DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `videotypes`
---
-
-LOCK TABLES `videotypes` WRITE;
-/*!40000 ALTER TABLE `videotypes` DISABLE KEYS */;
-INSERT INTO `videotypes` VALUES (1,'txt','',1,0),(2,'log','',1,0),(3,'mpg','Internal',0,0),(4,'avi','',0,1),(5,'vob','Internal',0,0),(6,'mpeg','Internal',0,0),(7,'VIDEO_TS','Internal',0,0),(8,'iso','Internal',0,0),(9,'img','Internal',0,0);
-/*!40000 ALTER TABLE `videotypes` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `websites`
---
-
-DROP TABLE IF EXISTS `websites`;
-CREATE TABLE `websites` (
-  `grp` varchar(255) NOT NULL,
-  `dsc` varchar(255) default NULL,
-  `url` varchar(255) NOT NULL,
-  `updated` int(10) unsigned default NULL,
-  PRIMARY KEY  (`url`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `websites`
---
-
-LOCK TABLES `websites` WRITE;
-/*!40000 ALTER TABLE `websites` DISABLE KEYS */;
-/*!40000 ALTER TABLE `websites` ENABLE KEYS */;
-UNLOCK TABLES;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
--- Dump completed on 2008-02-21 14:41:35
diff --git a/abs/mv-core/mythdb-initial/mythdb.install b/abs/mv-core/mythdb-initial/mythdb.install
deleted file mode 100755
index bc1db20..0000000
--- a/abs/mv-core/mythdb-initial/mythdb.install
+++ /dev/null
@@ -1,31 +0,0 @@
-mydate=`date +%m-%d-%y`
-HOST=`hostname`
-post_install() {
-#echo backup the old database
-	mysqldump mythconverg   >/data/database/mythconverg.${mydate}.sql 
-#	echo dropping the old database
-	mysql -u root -e 'drop database mythconverg;' 
-        mysql -u root -e 'create database mythconverg;'  
-	echo installing the default database
-	if [  $HOST = 'myhost' ]
-	then
-           cp /data/database/mc.sql.initial /data/database/mc.sql.fixed
-	   cp /data/database/permissions.sql  /data/database/permissions.sql.fixed
-	else
-	    sed -e "s/myhost/$HOST/g" /data/database/mc.sql.initial > /data/database/mc.sql.fixed
-	    sed -e "s/myhost/$HOST/g" /data/database/permissions.sql > /data/database/permissions.sql.fixed
-
-	fi
-		
-	mysql mythconverg < /data/database/mc.sql.fixed 2>/dev/null 
-	mysql < /data/database/permissions.sql.fixed 2>/dev/null 
-
-	rm /data/database/mc.sql.initial
-}
-post_upgrade() {
-	echo "nothing to do"
-}
-
-op=$1 
-shift 
-$op $*
diff --git a/abs/mv-core/mythdb-initial/permissions.sql b/abs/mv-core/mythdb-initial/permissions.sql
deleted file mode 100755
index acb4673..0000000
--- a/abs/mv-core/mythdb-initial/permissions.sql
+++ /dev/null
@@ -1,11 +0,0 @@
- 
-GRANT ALL ON mythconverg.* TO mythtv@localhost IDENTIFIED BY "mythtv";
-GRANT ALL ON mythconverg.* TO mythtv@"%" IDENTIFIED BY "mythtv";
-GRANT ALL ON mythconverg.* TO mythtv@myhost IDENTIFIED BY "mythtv";
-GRANT FILE ON *.* TO 'mythtv'@'%';
-FLUSH PRIVILEGES;
-GRANT CREATE TEMPORARY TABLES ON mythconverg.* TO mythtv@localhost IDENTIFIED BY "mythtv";
-GRANT CREATE TEMPORARY TABLES ON mythconverg.* TO mythtv@'%' IDENTIFIED BY "mythtv";
-GRANT CREATE TEMPORARY TABLES ON mythconverg.* TO mythtv@myhost IDENTIFIED BY "mythtv";
-FLUSH PRIVILEGES;
-ALTER DATABASE mythconverg DEFAULT CHARACTER SET latin1;
diff --git a/abs/mv-core/mythtv-status/PKGBUILD b/abs/mv-core/mythtv-status/PKGBUILD
deleted file mode 100755
index 4b1a007..0000000
--- a/abs/mv-core/mythtv-status/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-pkgname=mythtv-status	
-pkgver=0.9.0
-pkgrel=5
-
-pkgdesc="displays myth status in motd"
-#depends=(perl-xml-libxml perl-mime-tools perl-mailtools perl-net-upnp)
-depends=(perl-xml-libxml perl-mime-parser perl-mailtools perl-net-upnp)
-arch=('i686')
-source=(mythtv-status.cron  http://www.etc.gen.nz/projects/mythtv/tarballs/$pkgname-$pkgver.tar.gz) 
-install=mythtv-status.install
-build() {
-        MVDIR=$startdir/pkg/usr/MythVantage/bin
-	mkdir -p $MVDIR
-	cd $startdir/src/$pkgname-$pkgver
-	cd bin
-	cp -p * $MVDIR/
-	cd $startdir
-        #install -m 0755 mythtv-status $MVDIR/mythtv-status
-        install -m 0755 mythtv-status.cron $MVDIR/mythtv-status.cron
-}
-
diff --git a/abs/mv-core/mythtv-status/mythtv-status.cron b/abs/mv-core/mythtv-status/mythtv-status.cron
deleted file mode 100644
index 088b87c..0000000
--- a/abs/mv-core/mythtv-status/mythtv-status.cron
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-. /etc/profile
-mythtv-status --noschedule-conflicts  > /etc/motd
- 
diff --git a/abs/mv-core/mythtv-status/mythtv-status.install b/abs/mv-core/mythtv-status/mythtv-status.install
deleted file mode 100644
index 304015a..0000000
--- a/abs/mv-core/mythtv-status/mythtv-status.install
+++ /dev/null
@@ -1,51 +0,0 @@
-# This is a default template for a post-install scriptlet.  You can
-# remove any functions you don't need (and this header).
-
-# arg 1:  the new package version
-pre_install() {
-/bin/true
-}
-
-# arg 1:  the new package version
-post_install() {
-MVDIR=/usr/MythVantage/bin
-	
-	
-	if [ ! -e /etc/cron.tenminutes ]
-	then
-		mkdir /etc/cron.tenminutes
-	fi
-	ln -s $MVDIR/mythtv-status.cron  /etc/cron.tenminutes/mythtv-status.cron
-
-
-
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-pre_upgrade() {
-  /bin/true
-
-
-
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-	post_install
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  /bin/true
-}
-
-# arg 1:  the old package version
-post_remove() {
-  /bin/true
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/mv-core/mythvantage-live/PKGBUILD b/abs/mv-core/mythvantage-live/PKGBUILD
deleted file mode 100644
index 1039b71..0000000
--- a/abs/mv-core/mythvantage-live/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-pkgname=mythvantage-live
-pkgver=5.3.3
-pkgrel=10
-provides="linhes-live"
-pkgdesc="components for the Live System."
-
-depends=()
-arch=( i586 i686 x86_64 )
-license=('GPL')
-
-build() {
-    # setup the local environment:
-    local rDir=bin  eDir=etc  lDir=lib  sDir=session-save  oDir=opt/$pkgname
-    local srcDir=${startdir}/src   pkgDir=${startdir}/pkg
-    local insDir=${pkgDir}/$oDir   proDir=${pkgDir}/${eDir}/profile.d
-
-    mkdir -p $pkgDir $insDir $proDir
-    cp -dr ${startdir}/$eDir $pkgDir
-    local pthDir=
-    echo 'export PATH=${PATH}:'"/$oDir/$rDir" > ${proDir}/${pkgname}.sh
-    cp -dr ${startdir}/$lDir $pkgDir
-    cp -dr ${startdir}/$rDir $insDir
-    [ -d ${startdir}/$sDir ] && cp -dr ${startdir}/$sDir $insDir
-    chown -R root.root $pkgDir
-    return 0
-}
-
-# End
-#change hook1 to wait for usb cdroms
-#removed the word cdrom from sysinit
\ No newline at end of file
diff --git a/abs/mv-core/mythvantage-live/bin/gen_fstab b/abs/mv-core/mythvantage-live/bin/gen_fstab
deleted file mode 100755
index db36546..0000000
--- a/abs/mv-core/mythvantage-live/bin/gen_fstab
+++ /dev/null
@@ -1,122 +0,0 @@
-#! /bin/sh
-#
-# gen_fstab  - make new fstab for larch live system based on detected devices
-#
-# Author: Michael Towers <gradgrind[at]online[dot]de>
-#
-# This file is part of the larch project.
-#
-#    larch is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation; either version 2 of the License, or
-#    (at your option) any later version.
-#
-#    larch is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with larch; if not, write to the Free Software Foundation, Inc.,
-#    51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-#
-#----------------------------------------------------------------------------
-# 2007.12.17
-
-# Note that the results are, by default, not copied into place
-# They end up here:
-DEST="/tmp/fstab"
-MNT="/tmp/mnt"
-
-# However, passing '-l' as command-line option will install them.
-# The old fstab will then be backed up to fstab~.
-LOAD=""
-if [ "$1" = "-l" ]; then LOAD="-l"; fi
-
-if [ -n "$( df | grep " ${MNT}" )" ]; then
-    echo "ERROR: Mounted filesystem at/within ${MNT}"
-    exit 1
-fi
-mkdir -p ${MNT}
-rm -rf ${MNT}/*
-
-tmpfile="/tmp/fstab2"
-: >${tmpfile}
-
-echo "# fstab generated by gen_fstab" >${DEST}
-echo "#<file system>   <dir>         <type>      <options>    <dump> <pass>" >>${DEST}
-echo >>${DEST}
-
-echo "none            /dev/pts      devpts      defaults        0     0" >>${DEST}
-echo "none            /dev/shm      tmpfs       defaults        0     0" >>${DEST}
-echo >>${DEST}
-
-# Get all other partitions
-sfdisk -d | grep "^/dev/" | sed "s|\(.*\):.*Id=\(..\).*|\1 \2|" | \
-    while read dev id; do
-        # Ignore if id is "Extended" or "LVM", these are not usable partitions
-        if [ "${id}" = "5" -o "${id}" = "8e" ]; then continue; fi
-        # See if swap
-        if [ "${id}" = "82" ]; then
-            printf "%-12s %-12s %-8s defaults,noatime 0     0\n" \
-                ${dev} swap swap >>${DEST}
-            continue
-        fi
-        removable=""
-        part=$( basename ${dev} )
-        if [ $( cat /sys/block/${part:0:3}/removable 2>/dev/null ) -ne 0 ]; then
-            removable="_rmv"
-        fi
-        mountdir=${part}${removable}
-        printf "%-12s %-12s %-8s user,noauto,noatime 0     0\n" \
-                ${dev} /mnt/${mountdir} auto >>${tmpfile}
-        mkdir -p ${MNT}/${mountdir}
-    done
-
-# LVM
-for lvmd in $( ls /dev/mapper 2>/dev/null | grep -v control ); do
-    printf "%-30s %-22s %-8s user,noauto,noatime 0     0\n" \
-           /dev/mapper/${lvmd} /mnt/${lvmd} auto >>${tmpfile}
-    mkdir -p ${MNT}/${lvmd}
-done
-
-echo >>${DEST}
-cat ${tmpfile} >>${DEST}
-rm ${tmpfile}
-echo >>${DEST}
-
-# CD devices
-for dev in $( cat /proc/sys/dev/cdrom/info 2>/dev/null | head -n 3 | \
-        tail -n 1 | cut -d ":" -f 2 ); do
-    mountdir="${dev}_cd"
-    mkdir ${MNT}/${mountdir}
-    printf "%-12s %-12s %-8s user,noauto,exec,unhide 0     0\n" \
-            /dev/${dev} /mnt/${mountdir} auto >>${DEST}
-done
-
-echo >>${DEST}
-echo "# This would do for a floppy" >>${DEST}
-echo "#/dev/fd0        /mnt/floppy    vfat,ext2 rw,user,noauto    0     0" >>${DEST}
-echo "#    +   mkdir /mnt/floppy" >>${DEST}
-echo >>${DEST}
-echo "# E.g. for USB storage:" >>${DEST}
-echo "#/dev/sdb1        /mnt/usb      auto      rw,user,noauto   0     0" >>${DEST}
-echo "#    +   mkdir /mnt/usb" >>${DEST}
-
-if [ -n "${LOAD}" ]; then
-    # test if the script is started by root user. If not, exit
-    if [ $UID -ne 0 ]; then
-        echo "Only root can run ${APP}"; exit 1
-    fi
-
-    cp -b ${DEST} /etc/fstab
-    # Delete removeable mount points which are not currently mounted
-    for m in $( ls /mnt | grep ^[hs]d ); do
-        if [ -z "$( df | grep " /mnt/${m}$" )" ]; then
-            rmdir /mnt/${m}
-        fi
-    done
-    for m in $( ls ${MNT} ); do
-        mkdir -p /mnt/${m}
-    done
-fi
diff --git a/abs/mv-core/mythvantage-live/bin/km b/abs/mv-core/mythvantage-live/bin/km
deleted file mode 100755
index 386d966..0000000
--- a/abs/mv-core/mythvantage-live/bin/km
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/bin/sh
-# $Id: km,v 1.2 2005/12/13 04:14:53 judd Exp $
-# Modified by gradgrind to deal only with i386 keymaps
-#     and BASEDIR changed
-#  - also saves results to /etc/rc.conf
-
-# test if the script is started by root user. If not, exit
-if [ $UID -ne 0 ]; then
-    echo "This should be run as root"; exit 1
-fi
-
-ANSWER="/tmp/.km"
-BASEDIR="/usr/share/kbd"
-
-domenu()
-{
-	menutype=$1 ; shift
-	text=$1     ; shift
-	height=$1   ; shift
-	width=$1    ; shift
-	mheight=$1  ; shift
-	
-	dialog --cancel-label "Skip" --$menutype "$text" $height $width $mheight $*
-}
-
-if [ ! -d $BASEDIR/keymaps ]; then
-	echo "Cannot load keymaps, as none were found in $BASEDIR/keymaps" >&2
-	exit 1
-else
-	echo "Scanning for keymaps..."
-	KEYMAPS=
-	for t in qwerty qwertz azerty dvorak; do
-	    for i in `find $BASEDIR/keymaps/i386/$t -follow -name "*.gz"`; do
-		fn=`echo $i | sed "s|$BASEDIR/keymaps/i386/||"`
-		KEYMAPS="$KEYMAPS $fn -"
-	    done
-	done
-	domenu menu "Select A Keymap" 22 60 16 $KEYMAPS 2>$ANSWER
-	keymap=`cat $ANSWER`
-fi
-
-if [ ! -d $BASEDIR/consolefonts ]; then
-	echo "Cannot load consolefonts, as none were found in $BASEDIR/consolefonts" >&2
-else
-	echo "Scanning for fonts..."
-	FONTS=
-	for i in `find $BASEDIR/consolefonts -follow -name "*.gz"`; do
-		fn=`echo $i | sed "s|$BASEDIR/consolefonts/||"`
-		FONTS="$FONTS $fn -"
-	done
-	domenu menu "Select A Console Font" 22 60 16 $FONTS 2>$ANSWER
-	font=`cat $ANSWER`
-fi
-
-if [ "$keymap" ]; then
-	echo "Loading keymap: $keymap"
-	loadkeys -q $BASEDIR/keymaps/i386/$keymap
-	sed -i "s|^KEYMAP=.*|KEYMAP=\"$( echo $keymap | \
-	       cut -d'.' -f1 )\"|" /etc/rc.conf
-fi
-
-if [ "$font" ]; then
-	echo "Loading font: $font"
-	for i in `seq 1 4`; do
-		if [ -d /dev/vc ]; then
-			setfont $BASEDIR/consolefonts/$font -C /dev/vc/${i}
-		else
-			setfont $BASEDIR/consolefonts/$font -C /dev/tty${i}
-		fi
-	done
-	sed -i "s|^CONSOLEFONT=.*|CONSOLEFONT=\"$( echo $font | \
-	       cut -d'.' -f1 )\"|" /etc/rc.conf
-fi
-
-exit 0
-
diff --git a/abs/mv-core/mythvantage-live/etc/live-shutdown b/abs/mv-core/mythvantage-live/etc/live-shutdown
deleted file mode 100644
index 75c540d..0000000
--- a/abs/mv-core/mythvantage-live/etc/live-shutdown
+++ /dev/null
@@ -1,90 +0,0 @@
-# Functions used by rc.shutdown
-# Modified versions for mythvantage live systems
-
-f_saveclock ()
-{
-    :
-}
-
-f_swapoff ()
-{
-    ############################# Include session saving functions
-#    . /opt/mythvantage-live/session-save/shutdown2
-#    if [ -f /tmp/checkse ]; then
-#        . /tmp/checkse
-#    else
-#        checkse
-#    fi
-
-    if [ -n "${saving}" ] && ! session_save; then
-        echo
-        echo "If you know what you are doing, you may be able to recover"
-        echo "something from this unpleasant situation."
-        echo
-        echo "You may use the command line to investigate further ..."
-        echo
-        echo "When finished please enter 'exit', the shutdown process will"
-        echo "then continue."
-        sh -i
-    fi
-
-    #############################
-
-    stat_busy "Deactivating Swap"
-    /sbin/swapoff -a
-    stat_done
-}
-
-f_remountro ()
-{
-    bootdev=`cat /.livesys/bootdevice`
-    echo "Boot device was $bootdev"
-    #bootdev=`basename $bootdev`
-    for i in `ls  /dev/cd/*`
-    do
-        cdrom=`readlink -f $i`
-        if [ x$cdrom = x$bootdev ]
-        then
-            ejectdev=$cdrom
-	    break
-        fi
-        
-    done
-    lspci |grep -q VMware
-    if [ !   $? = 0 ]
-    then
-        if [ -n "${ejectdev}" ]
-        then
-            echo "Ejecting CD $ejectdev"
-            eject ${ejectdev}
-            echo "========================================"
-            echo "Tray will retract after 10 seconds"
-            for timer in `seq -w 10 -1 0`
-            do
-                #echo -n  $timer '\x08'
-                echo -ne   "\t"$timer '\010\010\010\010'
-                sleep 1
-            done
-            echo
-            echo "========================================"
-            eject -t ${ejectdev}
-            echo
-            echo "It's safe to switch the computer off now"
-            #echo -ne "Press Enter to continue"
-            #read junk
-        else
-            echo "Boot device is not a cdrom, no need to eject"
-        fi
-    else
-        echo "VMWARE detected, not ejecting the CD"
-    fi
-}
-#Preloads these commands so we can eject the CD.
-#
-seq --help >/dev/null 2>&1
-eject --help >/dev/null 2>&1
-halt --help >/dev/null 2>&1
-poweroff --help >/dev/null 2>&1
-reboot --help >/dev/null 2>&1
-
-# End
diff --git a/abs/mv-core/mythvantage-live/etc/live-sysinit b/abs/mv-core/mythvantage-live/etc/live-sysinit
deleted file mode 100644
index 4cf36f2..0000000
--- a/abs/mv-core/mythvantage-live/etc/live-sysinit
+++ /dev/null
@@ -1,73 +0,0 @@
-# Functions used by rc.sysinit
-# Modified versions for mythvantage live systems
-
-f_header ()
-{
-    cR='\e[31m' cY='\e[1;33m'  cN='\e[0m'  cW='\e[1;37m'
-    echo " "
-    printsep
-    printf "   ${cR}MythVantage ${cY}Installation${cN}/${cY}Live${cW} CDROM${cN}. "
-    printsep
-    echo " "
-}
-
-f_fscheck ()
-{
-    stat_busy "Initializing /etc/mtab"
-    #/bin/mount -n -o remount,rw /
-
-    /bin/rm -f /etc/mtab*
-
-    # Make entries for aufs/unionfs, tmpfs and live medium in /etc/mtab
-    grep "^aufs */ " /proc/mounts >>/etc/mtab
-    grep "^unionfs */ " /proc/mounts >>/etc/mtab
-    grep "^tmpfs */.livesys " /proc/mounts >>/etc/mtab
-    if [ -d /.livesys/medium/live ]; then
-        grep " /.livesys/medium " /proc/mounts >>/etc/mtab
-    fi
-
-    f_mountlocal
-    stat_done
-
-    if [ -z "$( cat /etc/fstab | grep "^#KEEP" )" ]; then
-        stat_busy "Generating fresh /etc/fstab"
-        /opt/mythvantage-live/bin/gen_fstab -l
-        stat_done
-    fi
-
-    # now mount all the local filesystems
-    stat_busy "Mounting Local Filesystems"
-    /bin/mount -a -t $NETFS
-    stat_done
-}
-
-f_swapon ()
-{
-    #+*** Copy session-save flag-file (if it exists)
-    [ -f /live/nosave ] && cp /live/nosave /.livesys
-    #-***
-
-    #*** Conditional swap activation
-    if [ -e /.livesys/swapon ]; then
-        status "Activating Swap" /sbin/swapon -a
-    fi
-}
-f_loadmodules()
-{
-    CMDLINE=$(cat /proc/cmdline)
-    echo $CMDLINE | grep -q modules
-    if [ $? -eq 0 ]
-    then
-        TEMPVAR=${CMDLINE#* modules=}
-        CMDMODULES=${TEMPVAR%% *}
-        mymod=`echo $CMDMODULES|/bin/sed 's|-|_|g' |/bin/sed 's|,| |g'`
-        stat_busy "Loading CMD module"
-        for mod in $mymod
-        do
-              /sbin/modprobe $mod
-        done
-        stat_done
-    fi
-
-
-}
diff --git a/abs/mv-core/mythvantage-live/etc/loginroot b/abs/mv-core/mythvantage-live/etc/loginroot
deleted file mode 100755
index e3153c6..0000000
--- a/abs/mv-core/mythvantage-live/etc/loginroot
+++ /dev/null
@@ -1,3 +0,0 @@
-#! /bin/sh
-login -f root
-# End
diff --git a/abs/mv-core/mythvantage-live/etc/rc.shutdown-live b/abs/mv-core/mythvantage-live/etc/rc.shutdown-live
deleted file mode 100755
index 58988f3..0000000
--- a/abs/mv-core/mythvantage-live/etc/rc.shutdown-live
+++ /dev/null
@@ -1,168 +0,0 @@
-#!/bin/bash
-#
-# /etc/rc.shutdown
-#
-
-###
-# Based on initscripts 2008.05-1
-###
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-###############################################################
-### These functions have been separated out, so that they can be
-### replaced in mythvantage live systems.
-
-f_saveclock ()
-{
-    stat_busy "Saving System Clock"
-    if [ "$TIMEZONE" != "" -a -e "/usr/share/zoneinfo/$TIMEZONE" ]; then
-        /bin/rm -f /etc/localtime
-        /bin/cp "/usr/share/zoneinfo/$TIMEZONE" /etc/localtime
-    fi
-
-    HWCLOCK_PARAMS="--systohc"
-    if [ "$HARDWARECLOCK" = "UTC" ]; then
-        HWCLOCK_PARAMS="$HWCLOCK_PARAMS --utc"
-    else
-        HWCLOCK_PARAMS="$HWCLOCK_PARAMS --localtime"
-    fi
-    if [ "$USEDIRECTISA" = "yes" -o "$USEDIRECTISA" = "YES" ]; then
-        HWCLOCK_PARAMS="$HWCLOCK_PARAMS --directisa"
-    fi
-    /sbin/hwclock $HWCLOCK_PARAMS
-    stat_done
-}
-
-f_swapoff ()
-{
-    stat_busy "Deactivating Swap"
-    /sbin/swapoff -a
-    stat_done
-}
-
-f_remountro ()
-{
-    stat_busy "Remounting Root Filesystem Read-only"
-    /bin/mount -n -o remount,ro /
-    stat_done
-}
-
-###############################################################
-
-### Override above functions if running mythvantage live system
-[ -f /etc/live-shutdown ] && . /etc/live-shutdown
-
-# avoid staircase effect
-/bin/stty onlcr
-
-echo " "
-printhl "Initiating Shutdown..."
-echo " "
-
-# avoid NIS hanging syslog-ng on shutdown by unsetting the domainname
-if [ -x /bin/domainname ]; then
-    /bin/domainname ""
-fi
-
-if [ -x /etc/rc.local.shutdown ]; then
-    /etc/rc.local.shutdown
-fi
-
-if [ "$PREVLEVEL" = "3" -o "$PREVLEVEL" = "5" ]; then
-    # Shutdown daemons
-    let i=${#DAEMONS[@]}
-    while [ $i -ge 0 ]; do
-        if [ "${DAEMONS[$i]:0:1}" != '!' ]; then
-            ck_daemon ${DAEMONS[$i]#@} || /etc/rc.d/${DAEMONS[$i]#@} stop
-        fi
-        let i=i-1
-    done
-    # find any leftover daemons and shut them down in reverse order
-    if [ -d /var/run/daemons ]; then
-        for daemon in $(/bin/ls -1t /var/run/daemons); do
-            /etc/rc.d/$daemon stop
-        done
-    fi
-fi
-
-# Terminate all processes
-stat_busy "Sending SIGTERM To Processes"
-/sbin/killall5 -15 &> /dev/null
-/bin/sleep 5
-stat_done
-
-stat_busy "Sending SIGKILL To Processes"
-/sbin/killall5 -9 &> /dev/null
-/bin/sleep 1
-stat_done
-
-stat_busy "Saving Random Seed"
-/bin/dd if=/dev/urandom of=/var/run/random-seed count=1 bs=512 2> /dev/null
-stat_done
-
-#F Save system time
-f_saveclock
-
-# removing psmouse module to fix some reboot issues on newer laptops
-/sbin/modprobe -r psmouse >/dev/null 2>&1
-
-# Write to wtmp file before unmounting
-/sbin/halt -w
-
-#F Deactivate swaps
-f_swapoff
-
-stat_busy "Unmounting Filesystems"
-/bin/umount -a -t noramfs,notmpfs,nosysfs,noproc
-stat_done
-
-# Kill non-root encrypted partition mappings
-if [ -f /etc/crypttab -a -n "$(/bin/grep -v ^# /etc/crypttab | /bin/grep -v ^$)" ]; then
-    stat_busy "Deactivating encrypted volumes:"
-    CS=/sbin/cryptsetup.static
-    do_uncrypt() {
-        if [ $# -ge 3 ]; then
-            stat_append "${1}.."
-            $CS remove $1 >/dev/null 2>&1
-            if [ $? -ne 0 ]; then
-                stat_append "failed "
-            else
-                stat_append "ok "
-            fi
-        fi
-    }
-    while read line; do
-        eval do_uncrypt "$line"
-    done </etc/crypttab
-    stat_done
-fi
-
-if [ "$USELVM" = "yes" -o "$USELVM" = "YES" ]; then
-    if [ -x /sbin/lvm -a -d /sys/block ]; then
-        stat_busy "Deactivating LVM2 groups"
-        /sbin/lvm vgchange --ignorelockingfailure -an >/dev/null 2>&1
-        stat_done
-    fi
-fi
-
-#F Remount / ro
-f_remountro
-#Eject the CD
-
-# Power off or reboot
-if [ "$RUNLEVEL" = "0" ]; then
-    printsep
-    printhl "${C_H2}POWER OFF"
-    /sbin/poweroff -d -f -h -i
-else
-    printsep
-    printhl "${C_H2}REBOOTING"
-    # if kexec is installed and a kernel is loaded, use it
-    [ -x /sbin/kexec ] && /sbin/kexec -e > /dev/null 2>&1
-    /sbin/reboot -d -f -i
-fi
-
-# vim: set ts=2 sw=2 noet:
-# End
diff --git a/abs/mv-core/mythvantage-live/etc/rc.sysinit-live b/abs/mv-core/mythvantage-live/etc/rc.sysinit-live
deleted file mode 100755
index b3b91de..0000000
--- a/abs/mv-core/mythvantage-live/etc/rc.sysinit-live
+++ /dev/null
@@ -1,469 +0,0 @@
-#!/bin/bash
-#
-# /etc/rc.sysinit
-#
-
-###
-# Based on initscripts 2008.05-1
-###
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-###############################################################
-### These functions have been separated out, so that they can be
-### replaced in mythvantage live systems.
-
-f_header ()
-{
-    echo " "
-    printhl "Arch Linux $C_OTHER(${C_H2}Core Dump$C_OTHER)\n"
-    printhl "${C_H2}http://www.archlinux.org"
-    printhl "Copyright 2002-2007 Judd Vinet"
-    printhl "Copyright 2007-2008 Aaron Griffin"
-    printhl "Distributed under the GNU General Public License (GPL)"
-    printsep
-}
-
-f_fscheck ()
-{
-    status "Mounting Root Read-only" /bin/mount -n -o remount,ro /
-
-    if [ -x /sbin/fsck ]; then
-        stat_busy "Checking Filesystems"
-        if /bin/grep -qw quiet /proc/cmdline; then
-            /sbin/fsck -A -T -C -a -t $NETFS $FORCEFSCK >/dev/null 2>&1
-        else
-            /sbin/fsck -A -T -C -a -t $NETFS $FORCEFSCK 2>/dev/null
-        fi
-        fsckret=$?
-        if [ ${fsckret} -gt 1 ]; then
-            stat_fail
-            if [ $((${fsckret}&2)) -eq 2 ]; then
-                echo
-                echo "********************** REBOOT REQUIRED *********************"
-                echo "*                                                          *"
-                echo "* The system will be rebooted automatically in 15 seconds. *"
-                echo "*                                                          *"
-                echo "************************************************************"
-                echo
-                /bin/sleep 15
-            else
-                echo
-                echo "*****************  FILESYSTEM CHECK FAILED  ****************"
-                echo "*                                                          *"
-                echo "*  Please repair manually and reboot. Note that the root   *"
-                echo "*  file system is currently mounted read-only. To remount  *"
-                echo "*  it read-write type: mount -n -o remount,rw /            *"
-                echo "*  When you exit the maintenance shell the system will     *"
-                echo "*  reboot automatically.                                   *"
-                echo "*                                                          *"
-                echo "************************************************************"
-                echo
-                /sbin/sulogin -p
-            fi
-            echo "Automatic reboot in progress..."
-            /bin/umount -a
-            /bin/mount -n -o remount,ro /
-            /sbin/reboot -f
-            exit 0
-        fi
-        stat_done
-    fi
-
-    stat_busy "Mounting Local Filesystems"
-    /bin/mount -n -o remount,rw /
-    /bin/rm -f /etc/mtab*
-    # make sure / gets written to /etc/mtab
-    /bin/mount -o remount,rw /
-
-    f_mountlocal
-    stat_done
-}
-
-f_mountlocal ()
-{
-    # Write /proc, /sys and /dev to /etc/mtab
-    if [ -e /proc/mounts ]; then
-        /bin/grep -e "/proc " -e "/sys " -e "/dev " /proc/mounts >> /etc/mtab
-    fi
-    # now mount all the local filesystems
-    /bin/mount -a -t $NETFS
-}
-
-f_swapon ()
-{
-    status "Activating Swap" /sbin/swapon -a
-}
-
-###############################################################
-
-### Override above functions if running mythvantage live system
-[ -f /etc/live-sysinit ] && . /etc/live-sysinit
-
-#F Print header
-f_header
-
-# mount /proc, /sys and our RAM /dev
-/bin/mount -n -t ramfs none /dev
-/bin/mount -n -t proc none /proc
-/bin/mount -n -t sysfs none /sys
-
-# Create our default nodes that minilogd may need
-/bin/mknod /dev/null c 1 3
-/bin/mknod /dev/zero c 1 5
-/bin/mknod /dev/console c 5 1
-
-# More initial /dev setup that udev doesn't do
-/bin/ln -snf /proc/self/fd /dev/fd
-/bin/ln -snf /proc/self/fd/0 /dev/stdin
-/bin/ln -snf /proc/self/fd/1 /dev/stdout
-/bin/ln -snf /proc/self/fd/2 /dev/stderr
-/bin/ln -snf /proc/kcore /dev/core
-/bin/mkdir /dev/pts
-/bin/mkdir /dev/shm
-
-# start up our mini logger until syslog takes over
-/sbin/minilogd
-
-# anything more serious than KERN_WARNING goes to the console
-# 'verbose' cmdline parameter enables more messages
-if /bin/grep -q " verbose" /proc/cmdline; then
-    /bin/dmesg -n 8
-else
-    /bin/dmesg -n 3
-fi
-
-# enable rtc access
-/sbin/modprobe rtc-cmos >/dev/null 2>&1
-RTC_MAJOR=$(/bin/grep -w rtc /proc/devices 2>/dev/null); RTC_MAJOR="${RTC_MAJOR%% *}"
-if [ -n "$RTC_MAJOR" ]; then
-    /bin/mkdir /dev/misc/
-    /bin/mknod /dev/misc/rtc0 c $RTC_MAJOR 0
-    /bin/ln -s /dev/misc/rtc0 /dev/rtc
-fi
-
-HWCLOCK_PARAMS="--hctosys"
-if [ "$HARDWARECLOCK" = "UTC" ]; then
-    HWCLOCK_PARAMS="$HWCLOCK_PARAMS --utc"
-else
-    HWCLOCK_PARAMS="$HWCLOCK_PARAMS --localtime"
-fi
-if [ "$USEDIRECTISA" = "yes" -o "$USEDIRECTISA" = "YES" ]; then
-    HWCLOCK_PARAMS="$HWCLOCK_PARAMS --directisa"
-fi
-
-# Set clock early to fix some bugs with filesystem checks
-# Clock is set again later to match rc.conf
-if [ -f /etc/localtime ]; then
-    /sbin/hwclock $HWCLOCK_PARAMS --noadjfile
-fi
-
-echo > /proc/sys/kernel/hotplug
-
-if [ -x /sbin/udevadm -a -d /sys/block ]; then
-    # We have udev and /sys appears to be mounted, use UDev
-    #status "Starting UDev Daemon" /etc/start_udev init
-
-    stat_busy "Starting UDev Daemon"
-    /sbin/udevd --daemon
-    stat_done
-else
-    # Static /dev, our last resort
-    status "Using static /dev filesystem" true
-fi
-
-# Load modules from the MODULES array defined in rc.conf
-if ! [ "$load_modules" = "off" ]; then
-    if [ -f /proc/modules ]; then
-############Added by jm to load modules from /proc/cmdline
-	f_loadmodules
-##############
-        stat_busy "Loading Modules"
-        for mod in "${MODULES[@]}"; do
-            if [ "$mod" = "${mod#!}" ]; then
-                /sbin/modprobe $mod
-            fi
-        done
-        stat_done
-    fi
-    if [ -d /proc/acpi ]; then
-        stat_busy "Loading standard ACPI modules"
-        ACPI_MODULES="ac battery button fan processor thermal"
-        k="$(echo $BLACKLIST ${MOD_BLACKLIST[@]} | /bin/sed 's|-|_|g')"
-        j="$(echo ${MODULES[@]} | /bin/sed 's|-|_|g')"
-        #add disabled MODULES (!) to blacklist - much requested feature
-        for m in ${j}; do
-                [ "$m" != "${m#!}" ] && k="${k} ${m#!}"
-        done
-        # add disablemodules= from commandline to blacklist
-        k="${k} $(echo ${disablemodules} | /bin/sed 's|-|_|g' | /bin/sed 's|,| |g')"
-        for n in ${ACPI_MODULES}; do
-            if ! echo ${k} | /bin/grep "\<$n\>" 2>&1 >/dev/null; then
-                /sbin/modprobe $n > /dev/null 2>&1
-            fi
-        done
-        stat_done
-    fi
-fi
-
-# run udev uevents
-if /bin/pidof -o %PPID /sbin/udevd >/dev/null; then
-    #status "Loading UDev uevents" /etc/start_udev uevents
-    stat_busy "Loading UDev uevents"
-    udevstart="$(/bin/date +%s%0N)"
-    /sbin/udevadm trigger
-    /sbin/udevadm settle
-    stat_done
-    udevend="$(/bin/date +%s%0N)"
-    printhl "   UDev uevent processing time: $((($udevend-$udevstart)/1000000))ms"
-fi
-
-# bring up the loopback interface
-if [ -d /sys/class/net/lo ]; then
-    stat_busy "Bringing up loopback interface"
-    /sbin/ifconfig lo 127.0.0.1 up
-    if [ $? -ne 0 ]; then
-        stat_fail
-    else
-        stat_done
-    fi
-fi
-
-# If necessary, find md devices and manually assemble RAID arrays
-if [ -f /etc/mdadm.conf -a "$(/bin/grep ^ARRAY /etc/mdadm.conf 2>/dev/null)" ]; then
-    # udev won't create these md nodes, so we do it ourselves
-    for dev in $(/bin/grep ^ARRAY /etc/mdadm.conf | /bin/awk '{print $2}'); do
-        path=$(echo $dev | /bin/sed 's|/[^/]*$||')
-        node=$(echo $dev | /bin/sed "s|^$path/||")
-        minor=$(echo $node | /bin/sed 's|^[^0-9]*||')
-        [ ! -e $path/$node ] && /bin/mknod $path/$node b 9 $minor
-    done
-    status "Activating RAID arrays" /sbin/mdadm --assemble --scan
-fi
-
-if [ "$USELVM" = "yes" -o "$USELVM" = "YES" ]; then
-    if [ -x /sbin/lvm -a -d /sys/block ]; then
-        # Kernel 2.6.x, LVM2 groups
-        /sbin/modprobe -q dm-mod 2>/dev/null
-        stat_busy "Activating LVM2 groups"
-        /sbin/lvm vgscan --ignorelockingfailure --mknodes >/dev/null
-        /sbin/lvm vgchange --ignorelockingfailure -a y >/dev/null
-        if [ $? -ne 0 ]; then
-            stat_fail
-        else
-            stat_done
-        fi
-    fi
-fi
-
-# Set up non-root encrypted partition mappings
-if [ -f /etc/crypttab -a -n "$(/bin/grep -v ^# /etc/crypttab | /bin/grep -v ^$)" ]; then
-    /sbin/modprobe -q dm-mod 2>/dev/null
-    stat_busy "Unlocking encrypted volumes:"
-    csfailed=0
-    CS=/sbin/cryptsetup.static
-    do_crypt() {
-        if [ $# -ge 3 ]; then
-            cname="$1"
-            csrc="$2"
-            cpass="$3"
-            shift 3
-            copts="$*"
-            stat_append "${cname}.."
-            # For some fun reason, the parameter ordering varies for
-            # LUKS and non-LUKS devices.  Joy.
-            if [ "${cpass}" = "SWAP" ]; then
-                # This is DANGEROUS! The only possible safety check
-                # is to not proceed in case we find a LUKS device
-                # This may cause dataloss if it is not used carefully
-                if $CS isLuks $csrc 2>/dev/null; then
-                    false
-                else
-                    $CS -d /dev/urandom $copts create $cname $csrc >/dev/null
-                    if [ $? -eq 0 ]; then
-                        stat_append "creating swapspace.."
-                        /sbin/mkswap -L $cname /dev/mapper/$cname >/dev/null
-                    fi
-                fi
-            elif [ "${cpass}" = "ASK" ]; then
-                printf "\nOpening '${cname}' volume:\n"
-
-                if $CS isLuks $csrc 2>/dev/null; then
-                    $CS $copts luksOpen $csrc $cname < /dev/console
-                else
-                    $CS $copts create $cname $csrc < /dev/console
-                fi
-            elif [ "${cpass:0:1}" != "/" ]; then
-                if $CS isLuks $csrc 2>/dev/null; then
-                    echo "$cpass" | $CS $copts luksOpen $csrc $cname >/dev/null
-                else
-                    echo "$cpass" | $CS $copts create $cname $csrc >/dev/null
-                fi
-            else
-                if $CS isLuks $csrc 2>/dev/null; then
-                    $CS -d $cpass $copts luksOpen $csrc $cname >/dev/null
-                else
-                    $CS -d $cpass $copts create $cname $csrc >/dev/null
-                fi
-            fi
-            if [ $? -ne 0 ]; then
-                csfailed=1
-                stat_append "failed "
-            else
-                stat_append "ok "
-            fi
-        fi
-    }
-    while read line; do
-        eval do_crypt "$line"
-    done </etc/crypttab
-    if [ $csfailed -eq 0 ]; then
-        stat_done
-    else
-        stat_fail
-    fi
-    # Maybe someone has LVM on an encrypted block device
-    if [ "$USELVM" = "yes" -o "$USELVM" = "YES" ]; then
-        if [ -x /sbin/lvm -a -d /sys/block ]; then
-            /sbin/lvm vgscan --ignorelockingfailure --mknodes >/dev/null
-            /sbin/lvm vgchange --ignorelockingfailure -a y >/dev/null
-        fi
-    fi
-fi
-
-FORCEFSCK=
-[ -f /forcefsck ] && FORCEFSCK="-- -f"
-NETFS="nonfs,nonfs4,nosmbfs,nocifs,nocodafs,noncpfs,nosysfs,noshfs,nofuse,nofuseblk"
-
-#F Check filesystems
-f_fscheck
-
-#F Activate swaps
-f_swapon
-
-stat_busy "Configuring System Clock"
-if [ ! -f /var/lib/hwclock/adjtime ]; then
-    echo "0.0 0 0.0" > /var/lib/hwclock/adjtime
-fi
-if [ "$TIMEZONE" != "" -a -e "/usr/share/zoneinfo/$TIMEZONE" ]; then
-    /bin/rm -f /etc/localtime
-    /bin/cp "/usr/share/zoneinfo/$TIMEZONE" /etc/localtime
-fi
-
-/sbin/hwclock $HWCLOCK_PARAMS
-stat_done
-
-if [ -f /var/run/random-seed ]; then
-    stat_busy "Initializing Random Seed"
-    /bin/cat /var/run/random-seed >/dev/urandom
-    stat_done
-fi
-
-stat_busy "Removing Leftover Files"
-/bin/rm -f /etc/nologin &>/dev/null
-/bin/rm -f /etc/shutdownpid &>/dev/null
-/bin/rm -f /var/lock/* &>/dev/null
-/bin/rm -rf /tmp/* /tmp/.* &>/dev/null
-/bin/rm -f /forcefsck &>/dev/null
-(cd /var/run && /usr/bin/find . ! -type d -exec /bin/rm -f -- {} \; )
-: > /var/run/utmp
-# Keep {x,k,g}dm happy with xorg
-/bin/mkdir /tmp/.ICE-unix && /bin/chmod 1777 /tmp/.ICE-unix
-/bin/mkdir /tmp/.X11-unix && /bin/chmod 1777 /tmp/.X11-unix
-stat_done
-
-#status "Updating Shared Library Links" /sbin/ldconfig
-
-if [ "$HOSTNAME" != "" ]; then
-    status "Setting Hostname: $HOSTNAME" /bin/hostname $HOSTNAME
-fi
-
-# Set the NIS domain name, if necessary
-[ -f /etc/conf.d/nisdomainname ] && . /etc/conf.d/nisdomainname
-if [ "$NISDOMAINNAME" != "" ]; then
-    status "Setting NIS Domain Name: $NISDOMAINNAME" /bin/nisdomainname $NISDOMAINNAME
-fi
-
-status "Updating Module Dependencies" /sbin/depmod -A
-
-# Flush old locale settings
-: >/etc/profile.d/locale.sh
-/bin/chmod 755 /etc/profile.d/locale.sh
-# Set user defined locale
-[ -z "$LOCALE" ] && LOCALE="en_US"
-stat_busy "Setting Locale: $LOCALE"
-echo "export LANG=$LOCALE" >>/etc/profile.d/locale.sh
-stat_done
-
-if echo "$LOCALE" | /bin/grep -qi utf ; then
-    stat_busy "Setting Consoles to UTF-8 mode"
-    # UTF-8 consoles are default since 2.6.24 kernel
-    # this code is needed not only for older kernels,
-    # but also when user has set vt.default_utf8=0 but LOCALE is *.UTF-8.
-    /usr/bin/kbd_mode -u
-    for i in $(/usr/bin/seq 0 63); do
-        printf "\e%%G" > /dev/vc/${i}
-    done
-    # the $CONSOLE check helps us avoid this when running scripts from cron
-    echo 'if [ "$CONSOLE" = "" -a "$TERM" = "linux" -a -t 1 ]; then printf "\e%%G"; fi' >>/etc/profile.d/locale.sh
-    stat_done
-    [ -n "$KEYMAP" ] && status "Loading Keyboard Map: $KEYMAP" /bin/loadkeys -q -u $KEYMAP
-else
-    stat_busy "Setting Consoles to legacy mode"
-    # make non-UTF-8 consoles work on 2.6.24 and newer kernels
-    /usr/bin/kbd_mode -a
-    for i in $(/usr/bin/seq 0 63); do
-        printf "\e%%@" > /dev/vc/${i}
-    done
-    # the $CONSOLE check helps us avoid this when running scripts from cron
-    echo 'if [ "$CONSOLE" = "" -a "$TERM" = "linux" -a -t 1 ]; then printf "\e%%@"; fi' >>/etc/profile.d/locale.sh
-    stat_done
-    [ -n "$KEYMAP" ] && status "Loading Keyboard Map: $KEYMAP" /bin/loadkeys -q $KEYMAP
-fi
-
-if [ -n "$CONSOLEFONT" ]; then
-    stat_busy "Loading Console Font: $CONSOLEFONT"
-    #CONSOLEMAP in UTF-8 shouldn't be used
-    if [ -n "$CONSOLEMAP" ] && echo "$LOCALE" | /bin/grep -qi utf ; then
-        CONSOLEMAP=""
-    fi
-    for i in $(/usr/bin/seq 0 63); do
-        if [ -n "$CONSOLEMAP" ]; then
-            /usr/bin/setfont -m $CONSOLEMAP $CONSOLEFONT -C /dev/vc/${i} >/dev/null 2>&1
-        else
-            /usr/bin/setfont $CONSOLEFONT -C /dev/vc/${i} >/dev/null 2>&1
-        fi
-    done
-    if [ $? -ne 0 ]; then
-        stat_fail
-    else
-        for i in $(/usr/bin/seq 0 63); do
-            printf "\e(K" > /dev/vc/${i}
-        done
-        # the $CONSOLE check helps us avoid this when running scripts from cron
-        echo 'if [ "$CONSOLE" = "" -a "$TERM" = "linux" -a -t 1 ]; then printf "\e(K"; fi' >>/etc/profile.d/locale.sh
-        stat_done
-    fi
-fi
-
-# Adding persistent network/cdrom generated rules
-if [ -f "/dev/.udev/tmp-rules--70-persistent-cd.rules" ]; then
-    stat_busy "Adding persistent cdrom udev rules"
-    /bin/cat /dev/.udev/tmp-rules--70-persistent-cd.rules >> /etc/udev/rules.d/70-persistent-cd.rules
-    stat_done
-fi
-if [ -f "/dev/.udev/tmp-rules--70-persistent-net.rules" ]; then
-    stat_busy "Adding persistent network udev rules"
-    /bin/cat /dev/.udev/tmp-rules--70-persistent-net.rules >> /etc/udev/rules.d/70-persistent-net.rules
-    stat_done
-fi
-
-# Save our dmesg output from this boot
-if [ -f /var/log/dmesg.log ]; then
-    /bin/rm /var/log/dmesg.log
-fi
-/bin/dmesg > /var/log/dmesg.log
-
-# vim: set ts=2 noet:
-# End
diff --git a/abs/mv-core/mythvantage-live/etc/ulogin b/abs/mv-core/mythvantage-live/etc/ulogin
deleted file mode 100755
index 085c431..0000000
--- a/abs/mv-core/mythvantage-live/etc/ulogin
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-
-# ulogin  - A script for autologin of a selected user (and more)
-#-----------------------------------------------------------------
-# 2008.04.06
-
-user=$( cat /tmp/newuser 2>/dev/null )
-
-rm -f /tmp/newuser
-rm -f /tmp/xlogout
-
-if [ -n "${user}" ]; then
-    login -f ${user}
-else
-    # offer choice of user
-    ulist="$( cat /etc/passwd | grep ':/home/.*sh$' )"
-    echo -e "\nLogin a user or quit:"
-    echo "   0 : root"
-    echo "   1 : REBOOT"
-    echo "   2 : HALT"
-
-    i=2
-    for entry in ${ulist}; do
-        i=$(( ${i} + 1 ))
-        user="$( echo ${entry} | cut -d':' -f1 )"
-        users[${i}]=${user}
-        printf "%4d : %s\n" ${i} ${user}
-    done
-    while true; do
-        read -p "Enter a number from 0 to ${i} : " n
-        if [ "${n}" = 0 ]; then
-            login -f root
-        elif [ "${n}" = 1 ]; then
-            exec reboot
-        elif [ "${n}" = 2 ]; then
-            exec halt
-        elif [ -n "$( echo "${n}" | grep "^[0-9]\+$" )" ] && \
-                [ -n "${users[${n}]}" ]; then
-            login -f ${users[${n}]}
-        else
-            echo "  *** Invalid choice ..."
-            continue
-        fi
-        break
-    done
-fi
-
-if grep "r" /tmp/xlogout &>/dev/null; then
-    reboot
-elif grep "h" /tmp/xlogout &>/dev/null; then
-    halt
-fi
-
-# This file is only needed for shutting down
-rm -f /tmp/checkse
-
-# End
diff --git a/abs/mv-core/mythvantage-live/lib/initcpio/gen_larch_init b/abs/mv-core/mythvantage-live/lib/initcpio/gen_larch_init
deleted file mode 100755
index d834e8f..0000000
--- a/abs/mv-core/mythvantage-live/lib/initcpio/gen_larch_init
+++ /dev/null
@@ -1,12 +0,0 @@
-#! /bin/bash
-
-# gen_larch_init
-#
-# Author: Michael Towers <gradgrind[at]online[dot]de>
-
-# Create an initramfs for a larch live system
-#  $1  - kernel version
-
-# The cpio.gz image is generated in larch.img
-
-/sbin/mkinitcpio -c /lib/initcpio/mkinitcpio.conf -k $1 -g larch.img
diff --git a/abs/mv-core/mythvantage-live/lib/initcpio/hooks/larch1 b/abs/mv-core/mythvantage-live/lib/initcpio/hooks/larch1
deleted file mode 100644
index 88ccc3e..0000000
--- a/abs/mv-core/mythvantage-live/lib/initcpio/hooks/larch1
+++ /dev/null
@@ -1,125 +0,0 @@
-# vim: set ft=sh:
-
-# larch1 -  live 'hook' for mkinitcpio: set up tmpfs and find boot device
-
-# Author: Michael Towers (gradgrind) <mt.42@web.de>
-#
-# This file is part of the larch project.
-#
-#    larch is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation; either version 2 of the License, or
-#    (at your option) any later version.
-#
-#    larch is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with larch; if not, write to the Free Software Foundation, Inc.,
-#    51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-#
-#----------------------------------------------------------------------------
-#2008.02.11
-
-# Replacement for msg which includes leading and trailing spaces
-msg_ () { [ "${quiet}" != "y" ] && echo "$@"; }
-
-# Try to mount a disk, partition or cdrom and look for the file
-# 'larchboot' in the /larch directory.
-# If LiveCD system found in the device, return 0, else return 1
-# and leave the device mounted.
-# $1 = device name (e.g. "/dev/hda2")
-# $2 = directory where devices will be mounted
-#
-test_live_data_dir ()
-{
-    /bin/mount -r -t iso9660 "$1" $2 >/dev/null 2>/dev/null || \
-    /bin/mount -r -t vfat -o noatime,nodiratime "$1" $2 >/dev/null 2>/dev/null || \
-    /bin/mount -r -t ext2 -o noatime,nodiratime "$1" $2 >/dev/null 2>/dev/null
-    if [ $? -eq 0 ]; then
-        if [ -f "$2/larch/larchboot" ]; then
-            LDEV="$1"
-            msg_ " ... found at $1"
-            return 0
-        else
-            /bin/umount $2 2>/dev/null
-            msg_ " ... $1 mounted, but no 'larch/larchboot' found"
-        fi
-    else
-        msg_ "  ... not $1"
-    fi
-    return 1
-}
-
-run_hook ()
-{
-    msg_ ":: Creating writeable filesystem (tmpfs)"
-    /bin/mkdir "/tfs"
-    # Boot option copy-to-ram (c2r)
-    if [ "${c2r}" = "y" ]; then
-        TFSSIZE="90%"
-    else
-        TFSSIZE="60%"
-    fi
-    /bin/mount -t tmpfs -o "size=${TFSSIZE}" tmpfs "/tfs"
-
-    # Directory for test mounts (and then for live CD)
-    cdmount="/livecd"
-    /bin/mkdir "${cdmount}"
-
-    # look for livecd data directory, first try ${root}
-    LDEV="${root}"
-    if [ "x${LDEV}" != "x" ]; then
-        /bin/mount -r -t iso9660 "${LDEV}" "${cdmount}" >/dev/null 2>/dev/null || \
-        /bin/mount -r -t vfat -o noatime,nodiratime "${LDEV}" "${cdmount}" >/dev/null 2>/dev/null || \
-        /bin/mount -r -t ext2 -o noatime,nodiratime "${LDEV}" "${cdmount}" >/dev/null 2>/dev/null
-        if [ $? -eq 0 ]; then
-            if [ -d "${cdmount}/larch" ]; then
-                msg_ ":: larch system at ${LDEV}"
-            else
-                /bin/umount "${cdmount}" 2>/dev/null
-                echo "!! No larch system at ${LDEV}"
-                LDEV=""
-            fi
-        else
-            echo "!! Couldn't mount ${LDEV}"
-            LDEV=""
-        fi
-    fi
-
-    # then try cdroms
-    if [ "x${LDEV}" = "x" ]; then
-        msg_ ":: Looking for boot device"
-        cdroms=$( /bin/cat /proc/sys/dev/cdrom/info | { while read a b c; do
-                if [ "${a}" = "drive" -a "${b}" = "name:" ]; then
-                    echo "${c}"
-                    break
-                fi
-            done
-        } )
-        for i in ${cdroms}; do
-            test_live_data_dir "/dev/${i}" "${cdmount}"
-            if [ $? -eq 0 ]; then break; fi
-        done
-    fi
-
-    # test USB devices (and disks) repeatedly until timed out
-    if [ "x${LDEV}" = "x" ]; then
-        msg_ ":: Searching for usb (and disk) devices .."
-        for i in 1 2 3 4 5; do
-            msg_ " :wait ${i} :::"
-            /bin/sleep ${i}
-            for d in /dev/sd[a-z][0-9]*; do
-                test_live_data_dir "${d}" "${cdmount}"
-                if [ $? -eq 0 ]; then break 2; fi
-            done
-            msg_ ":: Searching for usb cdroms .."
-            for d in /dev/sr[0-9]*; do
-                test_live_data_dir "${d}" "${cdmount}"
-                if [ $? -eq 0 ]; then break 2; fi
-            done
-        done
-    fi
-}
diff --git a/abs/mv-core/mythvantage-live/lib/initcpio/hooks/larch2 b/abs/mv-core/mythvantage-live/lib/initcpio/hooks/larch2
deleted file mode 100644
index 74b4e64..0000000
--- a/abs/mv-core/mythvantage-live/lib/initcpio/hooks/larch2
+++ /dev/null
@@ -1,33 +0,0 @@
-# larch2 -  live 'hook' for mkinitcpio: unionfs specific
-
-# Author: Michael Towers (gradgrind) <mt.42@web.de>
-#
-# This file is part of the larch project.
-#
-#    larch is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation; either version 2 of the License, or
-#    (at your option) any later version.
-#
-#    larch is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with larch; if not, write to the Free Software Foundation, Inc.,
-#    51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-#
-#----------------------------------------------------------------------------
-#2007.12.13
-
-run_hook ()
-{
-    #!!! --- unionfs specific
-    # Need unionfs module
-    /bin/modprobe unionfs
-    ovlmnt="ro"
-    bropt="dirs="
-    sqfmnt="ro"
-    utype="unionfs"
-}
diff --git a/abs/mv-core/mythvantage-live/lib/initcpio/hooks/larch2_aufs b/abs/mv-core/mythvantage-live/lib/initcpio/hooks/larch2_aufs
deleted file mode 100644
index ac8e40b..0000000
--- a/abs/mv-core/mythvantage-live/lib/initcpio/hooks/larch2_aufs
+++ /dev/null
@@ -1,33 +0,0 @@
-# larch2_aufs -  live 'hook' for mkinitcpio: aufs specific
-
-# Author: Michael Towers (gradgrind) <mt.42@web.de>
-#
-# This file is part of the larch project.
-#
-#    larch is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation; either version 2 of the License, or
-#    (at your option) any later version.
-#
-#    larch is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with larch; if not, write to the Free Software Foundation, Inc.,
-#    51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-#
-#----------------------------------------------------------------------------
-# 2008.02.29
-
-run_hook ()
-{
-   #!!! --- aufs specific
-    # Need aufs module
-    /bin/modprobe aufs
-    ovlmnt="rr+wh"
-    sqfmnt="rr"
-    bropt="br:"
-    utype="aufs"
-}
diff --git a/abs/mv-core/mythvantage-live/lib/initcpio/hooks/larch3 b/abs/mv-core/mythvantage-live/lib/initcpio/hooks/larch3
deleted file mode 100644
index b301aa9..0000000
--- a/abs/mv-core/mythvantage-live/lib/initcpio/hooks/larch3
+++ /dev/null
@@ -1,196 +0,0 @@
-# larch3 -  live 'hook' for mkinitcpio:
-#                 deal with c2r,
-#                 mount base system,
-#                 load overlay,
-#                 set up unioned root filesystem.
-#                 Also manages overlay merging.
-
-# Author: Michael Towers <gradgrind[at]online[dot]de>
-#
-# This file is part of the larch project.
-#
-#    larch is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation; either version 2 of the License, or
-#    (at your option) any later version.
-#
-#    larch is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
-#
-#    You should have received a copy of the GNU General Public License
-#    along with larch; if not, write to the Free Software Foundation, Inc.,
-#    51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-#
-#----------------------------------------------------------------------------
-# 2008.04.04
-
-run_hook ()
-{
-    if [ "x${LDEV}" = "x" ]; then
-        err "Sorry, couldn't find boot medium ..."
-        break="y"
-        return
-    fi
-
-    /sbin/modprobe loop
-
-    # Path to compressed base system
-    sysSqf=${cdmount}/system.sqf
-
-    ovlpath=${cdmount}
-
-    # A possibility to use alternative files:
-    if [ -f ${cdmount}/larch/boot-init ]; then
-        . ${cdmount}/larch/boot-init
-    fi
-
-    # Path to compressed 'modifications' archive
-    modsSqf=${ovlpath}/mods.sqf
-    # Default overlay file and directory
-    overlay=${ovlpath}/overlay.ovl
-
-    # Make union root
-    /bin/mkdir /union
-
-    # Deal with new archives
-    if [ -f ${overlay}_ ]; then
-        /bin/mount -o remount,rw ${LDEV} ${cdmount}
-        /bin/mv ${overlay} ${overlay}~
-        /bin/mv ${overlay}_ ${overlay}
-
-        if [ -f ${modsSqf}_ ]; then
-            /bin/mv ${modsSqf} ${modsSqf}~
-            /bin/mv ${modsSqf}_ ${modsSqf}
-        fi
-        /bin/mount -o remount,ro ${LDEV} ${cdmount}
-    fi
-
-    # Boot option copy-to-ram (c2r)
-    if [ "${c2r}" = "y" ]; then
-        msg_ ":: Copying base system to RAM, this will take a while ..."
-        /bin/cat ${sysSqf} > /tfs/system.sqf
-        if [ $? -ne 0 ]; then
-            err "Sorry, not enough RAM"
-            break="y"
-            return
-        fi
-        sysSqf=/tfs/system.sqf
-
-        msg_ ":: Copying mods archive to RAM, this might take a while ..."
-        /bin/cat ${modsSqf} > /tfs/mods.sqf
-        if [ $? -ne 0 ]; then
-            err "Sorry, not enough RAM"
-            break="y"
-            return
-        fi
-        modsSqf=/tfs/mods.sqf
-
-        # force use of swap (if available)
-        :> /tfs/swapon
-
-    elif [ "${swap}" = "y" ]; then
-        :> /tfs/swapon
-    fi
-
-    msg_ ":: Mounting squashed images"
-    /bin/mkdir /tfs/system
-    #added sleep for 3 seconds, because well i don't know but it seems to fix things
-    sleep 3
-    # The klibc mount command doesn't support '-o loop'
-    /bin/losetup /dev/loop0 ${sysSqf}
-    /bin/mount -r -t squashfs /dev/loop0 /tfs/system
-
-    # Make stuff in 'system' available by providing the loader and
-    # library path
-    ldli=$( cd /tfs/system; echo lib/ld-linux*.so.2 )
-    /bin/ln -s /tfs/system/${ldli} /${ldli}
-    export LD_LIBRARY_PATH=/tfs/system/lib:/tfs/system/usr/lib
-
-    /bin/mkdir /tfs/mods
-    
-    # The klibc mount command doesn't support '-o loop'
-    /bin/losetup /dev/loop1 ${modsSqf}
-    /bin/mount -r -t squashfs /dev/loop1 /tfs/mods
-
-    # Unpack the overlay
-
-    msg_ ":: Initializing writable layer for union (overlay)"
-    /tfs/system/usr/bin/lzop -d < ${overlay} | \
-            /tfs/system/bin/tar -C /tfs -xf -
-
-    # Copy the installation tidy-up script (for removing custom live-only stuff),
-    # and any other files in 'larch/copy' directory
-    if [ -d ${ovlpath}/larch/copy ]; then
-        cd ${ovlpath}/larch/copy
-        for f in *; do
-            cat ${f} >/tfs/${f}
-        done
-    fi
-
-    msg_ ":: Setting up union file system"
-
-    layers="/tfs/overlay=rw:/tfs/mods=${ovlmnt}:/tfs/system=${sqfmnt}"
-    /bin/mount -t ${utype} -o ${bropt}${layers} ${utype} /union
-
-    echo "${utype}" > /tfs/utype
-
-    # Minimal device nodes needed before udev does its work
-    /bin/mkdir /union/dev
-    /bin/mknod /union/dev/console c 5 1
-    /bin/mknod /union/dev/null c 1 3
-    /bin/mknod /union/dev/zero c 1 5
-
-    # Make special directories
-    /bin/mkdir -m 1777 /union/tmp
-    /bin/mkdir /union/media
-    /bin/mkdir /union/sys
-    /bin/mkdir /union/proc
-
-    # Make the tmpfs stuff accessible within the union
-    /bin/mkdir /union/.livesys
-    /bin/mount -o bind /tfs /union/.livesys
-
-    /bin/mkdir /union/.livesys/medium
-
-    /bin/mount -o bind /tfs/system /union/.livesys/system
-    /bin/mount -o bind /tfs/overlay /union/.livesys/overlay
-    /bin/mount -o bind ${cdmount} /union/.livesys/medium
-
-    if [ "x${modsSqf}" != "x" ]; then
-        /bin/mount -o move /tfs/mods /union/.livesys/mods
-    fi
-
-    # Remember the boot device
-    echo "${LDEV}" > /tfs/bootdevice
-
-    if [ "${c2r}" = "y" ]; then
-        # Set flag to inform system of copy-to-ram
-        :> /tfs/c2r
-
-        # Unmount boot device
-        /bin/umount ${cdmount}
-    fi
-
-    msg_ ":: End of live system set-up"
-
-    # Now some tweaks to alter 'init' actions from non-larch hooks, etc.
-    # Override rootdelay from usb hook
-    if [ "x${larchdelay}" = "x"  ]; then
-        # To avoid spurious udevd pid numbers
-        export rootdelay=1
-    else
-        # Allow adjustment via boot option
-        export rootdelay=${larchdelay}
-    fi
-    # root must be set to something or other, even though larch doesn't
-    # need it ...
-    export root="/dev/loop0"
-}
-
-#######
-# The actual root switch occurs later, when 'init' execs 'kinit'.
-# I handle this by overwriting the 'kinit' binary with my own script.
-# This will unmount dev, sys and proc and then exec run-init.
-#######
diff --git a/abs/mv-core/mythvantage-live/lib/initcpio/install/larch1 b/abs/mv-core/mythvantage-live/lib/initcpio/install/larch1
deleted file mode 100644
index 56baf48..0000000
--- a/abs/mv-core/mythvantage-live/lib/initcpio/install/larch1
+++ /dev/null
@@ -1,15 +0,0 @@
-install ()
-{
-    MODULES="vfat isofs ext2 ext3 nls_cp437"
-    BINARIES=""
-    FILES=""
-    SCRIPT="larch1"
-}
-
-help ()
-{
-cat<<HELPEOF
-  This hook deals with booting a larch live CD. It is the first larch hook,
-creating a tmpfs and seeking the boot medium.
-HELPEOF
-}
diff --git a/abs/mv-core/mythvantage-live/lib/initcpio/install/larch2 b/abs/mv-core/mythvantage-live/lib/initcpio/install/larch2
deleted file mode 100644
index a906227..0000000
--- a/abs/mv-core/mythvantage-live/lib/initcpio/install/larch2
+++ /dev/null
@@ -1,15 +0,0 @@
-install ()
-{
-    MODULES="unionfs"
-    BINARIES=""
-    FILES=""
-    SCRIPT="larch2"
-}
-
-help ()
-{
-cat<<HELPEOF
-  This hook deals with booting a larch live CD. It handles selection of the
-desired unioning file system, here unionfs.
-HELPEOF
-}
diff --git a/abs/mv-core/mythvantage-live/lib/initcpio/install/larch2_aufs b/abs/mv-core/mythvantage-live/lib/initcpio/install/larch2_aufs
deleted file mode 100644
index 0e19de9..0000000
--- a/abs/mv-core/mythvantage-live/lib/initcpio/install/larch2_aufs
+++ /dev/null
@@ -1,15 +0,0 @@
-install ()
-{
-    MODULES="aufs"
-    BINARIES=""
-    FILES=""
-    SCRIPT="larch2_aufs"
-}
-
-help ()
-{
-cat<<HELPEOF
-  This hook deals with booting a larch live CD. It handles selection of the
-desired unioning file system, here aufs.
-HELPEOF
-}
diff --git a/abs/mv-core/mythvantage-live/lib/initcpio/install/larch3 b/abs/mv-core/mythvantage-live/lib/initcpio/install/larch3
deleted file mode 100644
index 7dad03c..0000000
--- a/abs/mv-core/mythvantage-live/lib/initcpio/install/larch3
+++ /dev/null
@@ -1,18 +0,0 @@
-install ()
-{
-    MODULES="squashfs loop reiserfs"
-    BINARIES=""
-    FILES=""
-    SCRIPT="larch3"
-#    add_file "/lib/initcpio/kinit" "/bin/kinit"  ##### This doesn't work, so:
-    sed -i 's|.*/usr/lib/klibc/bin/kinit\.shared.*||' "${FILELIST}"
-    sed -i 's|/usr/lib/klibc/bin/kinit|/lib/initcpio/kinit|' "${FILELIST}"
-}
-
-help ()
-{
-cat<<HELPEOF
-  This hook deals with booting a larch live CD. It is the last larch hook,
-setting up the tmpfs root file system.
-HELPEOF
-}
diff --git a/abs/mv-core/mythvantage-live/lib/initcpio/kinit b/abs/mv-core/mythvantage-live/lib/initcpio/kinit
deleted file mode 100755
index 7c86f4b..0000000
--- a/abs/mv-core/mythvantage-live/lib/initcpio/kinit
+++ /dev/null
@@ -1,6 +0,0 @@
-#! /bin/sh
-
-umount /sys
-umount /proc
-umount /dev
-exec run-init -c /dev/console /union /sbin/init ${CMDLINE}
diff --git a/abs/mv-core/mythvantage-live/lib/initcpio/mkinitcpio.conf b/abs/mv-core/mythvantage-live/lib/initcpio/mkinitcpio.conf
deleted file mode 100644
index 79cca21..0000000
--- a/abs/mv-core/mythvantage-live/lib/initcpio/mkinitcpio.conf
+++ /dev/null
@@ -1,54 +0,0 @@
-# vim:set ft=sh
-# MODULES
-# The following modules are loaded before any boot hooks are
-# run.  Advanced users may wish to specify all system modules
-# in this array.  For instance:
-#     MODULES="piix ide_disk reiserfs"
-MODULES=""
-
-# BINARIES
-# This setting includes, into the CPIO image, and additional
-# binaries a given user may wish.  This is run first, so may
-# be used to override the actual binaries used in a given hook.
-# (Existing files are NOT overwritten is already added)
-# BINARIES are dependancy parsed, so you may safely ignore libraries
-#BINARIES=""
-
-# FILES
-# This setting is similar to BINARIES above, however, files are added
-# as-is and are not parsed in anyway.  This is useful for config files.
-# Some users may wish to include modprobe.conf for custom module options,
-# like so:
-#    FILES="/etc/modprobe.conf"
-FILES=""
-
-# HOOKS
-# This is the most important setting in this file.  The HOOKS control the
-# modules and scripts added to the image, and what happens at boot time.
-# Order is important, and it is recommended that you do not change the
-# order in which HOOKS are added.  Run 'mkinitcpio -H <hook name>' for
-# help on a given hook.
-# 'base' is _required_ unless you know precisely what you are doing.
-# 'udev' is _required_ in order to automatically load modules
-# 'modload' may be used in place of 'udev', but is not recommended
-# 'filesystems' is _required_ unless you specify your fs modules in MODULES
-# Examples:
-#    This setup specifies all modules in the MODULES setting above.
-#    No raid, lvm, or encrypted root is needed.
-#    HOOKS="base"
-#
-#    This setup will autodetect all modules for your system and should
-#    work as a sane default
-#    HOOKS="base udev autodetect ide scsi sata filesystems"
-#
-#    This setup will generate a 'full' image which supports most systems.
-#    No autodetection is done.
-#    HOOKS="base udev ide scsi sata usb filesystems"
-#
-#    This setup assembles an ide raid array with an encrypted root FS.
-#    Note: See 'mkinitcpio -H raid' for more information on raid devices.
-#    HOOKS="base udev ide filesystems raid encrypt"
-#
-#    This setup loads an LVM volume group on a usb device.
-#    HOOKS="base udev usb filesystems lvm"
-HOOKS="base udev pata scsi sata usb larch1 larch2___aufs___ larch3"
diff --git a/abs/mv-core/ncid/PKGBUILD b/abs/mv-core/ncid/PKGBUILD
deleted file mode 100644
index e1bab5c..0000000
--- a/abs/mv-core/ncid/PKGBUILD
+++ /dev/null
@@ -1,63 +0,0 @@
-pkgname=ncid
-pkgver=0.71
-pkgrel=2
-pkgdesc="daemon to display callerid"
-url="http://ncid.sourceforge.net/"
-license=""
-depends=(ghosd python)
-makedepends=()
-conflicts=()
-replaces=()
-backup=()
-arch=('i686')
-install=ncid.install
- #wget http://internap.dl.sourceforge.net/sourceforge/ncid/ncid-0.71-src.tar.gz
-
-source=(http://internap.dl.sourceforge.net/sourceforge/ncid/$pkgname-$pkgver-src.tar.gz  ncidd.conf ncid.conf ncid.py ncidpermissions.sql ncid.sql)
-md5sums=()
-
-build() {
-cd $startdir/src/$pkgname
-#cd $startdir/src/
-  ./configure --prefix=/usr
-  make clean
-  make package  || return 1
-  mkdir -p $startdir/pkg/usr/bin
-  mkdir -p $startdir/pkg/usr/sbin
-  mkdir -p $startdir/pkg/etc/ncid
-  cp $startdir/*.conf $startdir/pkg/etc/ncid
-  install -m 755 ncidd $startdir/pkg/usr/sbin
-  install -m 755 ncid $startdir/pkg/usr/bin
-
-  mkdir -p $startdir/pkg/usr/share/man/man1
-  mkdir -p $startdir/pkg/usr/share/man/man5
-  mkdir -p $startdir/pkg/usr/share/man/man8
-   cd man
-  install -m 644 ncid.1 ncidscripts.1 ncidtools.1 $startdir/pkg/usr/share/man/man1
-  install -m 644 ncid.conf.5 ncidd.conf.5 ncidd.alias.5 ncidscript.conf.5 $startdir/pkg/usr/share/man/man5
-  install -m 644 ncidd.8 $startdir/pkg/usr/share/man/man8
-   cd -
-   mkdir -p $startdir/pkg/var/log
-   touch $startdir/pkg/var/log/cidcall.log
-cd scripts 
-
-mkdir -p $startdir/pkg/usr/share/ncid/
-install -m 755 $startdir/src/ncid-osd $startdir/pkg/usr/share/ncid
-install -m 755 ncidrotate ncid-page ncid-samba ncid-speak $startdir/pkg/usr/share/ncid
-install -m 644 README $startdir/pkg/usr/share/ncid/
-cd -
-cd tools
-mkdir -p $startdir/pkg/usr/bin
-install -m 755  cidlog cidalias cidlogupd  $startdir/pkg/usr/bin
-cd -
-install -m 755  $startdir/src/ncid.py   $startdir/pkg/usr/bin
-
-
-install -m 755 -D  $startdir/src/ncid.sql  $startdir/pkg/tmp/ncid.sql
-install -m755 -D $startdir/src/ncidpermissions.sql  $startdir/pkg/tmp/ncidpermissions.sql  
-chmod 777 $startdir/pkg/tmp
-  #make DESTDIR=$startdir/pkg install
-  #mkdir -p $startdir/pkg/usr/local/bin
-#  cp putfifo $startdir/pkg/usr/local/bin/
-#  cp onscreend $startdir/pkg/usr/local/bin/ 
-}
diff --git a/abs/mv-core/ncid/cid.sh b/abs/mv-core/ncid/cid.sh
deleted file mode 100755
index 43167c1..0000000
--- a/abs/mv-core/ncid/cid.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-#CID: *DATE*10152007*TIME*0950*LINE*-*NMBR*4144229767*MESG*NONE*NAME*BORKOWSKI,MICHA*
-while read line ; do
-#	echo $line
-	NUMBER=`echo $line | cut -d* -f9`
-	NAME=`echo $line | cut -d* -f13`
-	/usr/bin/notify.py PHN $NUMBER
-	/usr/bin/notify.py PH2 $NAME
-
-
-done 
diff --git a/abs/mv-core/ncid/ncid-osd b/abs/mv-core/ncid/ncid-osd
deleted file mode 100644
index e115561..0000000
--- a/abs/mv-core/ncid/ncid-osd
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-#set -x
-# most of this program is taken from nciduser by Mace Moneta
-# requires festival: http://www.cstr.ed.ac.uk/projects/festival
-
-# input is 4 lines obtained from ncid using the "-all" option
-# input: DATE\nTIME\nNUMBER\nNAME
-# ncid calls a external program with the "--call-prog" option
-# default program: /usr/share/ncid/ncid-page
-#
-# ncid usage examples:
-#   ncid --all --call-prog
-#   ncid --all --call-prog --program ncid-osd
-#   ncid --no-gui --all --call-prog --program ncid-osd
-
-read CIDDATE
-read CIDTIME
-read CIDNMBR
-read CIDNAME
-#CIDNAME="test name" 
-#CIDNMBR="(414) 282 5011"
-ConfigDir=/etc/ncid
-ConfigFile=$ConfigDir/ncidscript.conf
-info="$CIDNMBR $CIDNAME"
-osdClient.pl  localhost 5000 "$info:::SYS"
-exit 0
diff --git a/abs/mv-core/ncid/ncid.conf b/abs/mv-core/ncid/ncid.conf
deleted file mode 100644
index 91c3167..0000000
--- a/abs/mv-core/ncid/ncid.conf
+++ /dev/null
@@ -1,59 +0,0 @@
-# tcl/tk configuration file
-
-# Directory NCID uses to find the helper scripts
-set ProgDir     /usr/share/ncid
-
-# default helper script
-set EXTPROG     ncid-osd
-
-# Set Host to the NCID server address
-# Host defaults to 127.0.0.1
-set Host        127.0.0.1
-#set Host        192.168.1.5
-
-# The NCID port default is 3333
-set Port        3333
-
-# If the connection to the server is lost,
-# try every Delay seconds to reconnect
-# The Default: 60
-set Delay       20
-
-# If set to 1, display raw data received from the NCID server
-# If set to 0, do not display raw data received from the NCID server
-# Default: 0
-set Raw         0
-
-# If set to 1, output: date time number name
-# If set to 0, output: name number
-# Default: 0
-set All         1
-
-# If set to 1, display formatted CID, and CID log file on connect
-# If set to 0, ddo not isplay formatted CID, and CID log file on connect
-# Default: 0
-set Verbose     0
-
-# If set to 1, display information in terminal progran or external program
-# If set to 0, display information using a GUI
-# Default: 0
-set NoGUI       1
-
-# output name and number to external program
-# Default: 0
-set Callprog    1
-
-# ring number to call external program
-# Default: 0
-set CallOnRing  0
-
-# external called program
-set Program     [list $ProgDir/$EXTPROG]
-
-# TiVo Flag: send output in format to use OUT2OSD
-# Default: 0
-set TivoFlag    0
-
-# Message Flag: send messages to output modules
-# Default: 0
-set MsgFlag     0
\ No newline at end of file
diff --git a/abs/mv-core/ncid/ncid.install b/abs/mv-core/ncid/ncid.install
deleted file mode 100755
index e000b3b..0000000
--- a/abs/mv-core/ncid/ncid.install
+++ /dev/null
@@ -1,17 +0,0 @@
-
-post_install() {
-	
-        mysql -u root -e 'create database ncid;'  
-	echo installing the default database
-	mysql ncid < /tmp/ncid.sql 
-	mysql < /tmp/ncidpermissions.sql
-	rm /tmp/ncid.sql
-	rm /tmp/ncidpermissions.sql
-}
-post_upgrade() {
-	echo "nothing to do"
-}
-
-op=$1 
-shift 
-$op $*
diff --git a/abs/mv-core/ncid/ncid.py b/abs/mv-core/ncid/ncid.py
deleted file mode 100755
index 7ffcefe..0000000
--- a/abs/mv-core/ncid/ncid.py
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/python
-
-import MySQLdb
-import sys
-import getopt
-import socket
-import os
-db = MySQLdb.connect(host="127.0.0.1", user="mythtv", passwd="mythtv", db="mythconverg")
-cdb = MySQLdb.connect(host="127.0.0.1", user="mythtv", passwd="mythtv", db="ncid")
-#log to logger?
-
-
-
-#log to db
-
-def main(argv):
-
-    DATE=sys.stdin.readline().strip()
-    TIME=sys.stdin.readline().strip()
-    NUMBER=sys.stdin.readline().strip()
-    NAME=sys.stdin.readline().strip()
-
-
-    #print "start of line"
-    #print DATE
-    #print TIME
-    #print NUMBER
-    #print NAME
-    #print "$$$$$$$$$$$$$$$$$$"
-
-#notify
-
-
-    # create a cursor
-    cursor = db.cursor()
-    # execute SQL statement
-    cursor.execute("SELECT DISTINCT(hostname) from settings where not hostname is NULL")
-    result = cursor.fetchall()
-
-    port1=str(5000)
-    port2=str(5001)
-
-
-    message = NAME + " :::" + "PHN"
-    message2 = NUMBER + " :::" + "PH2"
-    for row in result:
-        os.system("/usr/bin/osdClient.pl  " + row[0] + "  " +  port1   + "   "+  "\"" +  message + "\""  + " 2>/dev/null  &" )
-        os.system("/usr/bin/osdClient.pl  " + row[0] + "  " +  port2   + "   "+  "\"" +  message2 + "\""  + " 2>/dev/null  &" )
-        #print ("/usr/bin/osdClient.pl  " + row[0] + "  " +  port2   + "   "+  "\"" +  message2 + "\""  + " 2>/dev/null  &" )
-
-
-    ncursor=cdb.cursor()
-    ncursor.execute ("""INSERT INTO cid (date,time,name,number)   VALUES     ('%s', '%s','%s','%s');"""         %(DATE,TIME,NAME,NUMBER )        )
-
-
-
-if __name__ == "__main__":
-    main(sys.argv[1:])
-
diff --git a/abs/mv-core/ncid/ncid.sql b/abs/mv-core/ncid/ncid.sql
deleted file mode 100644
index 556b4ba..0000000
--- a/abs/mv-core/ncid/ncid.sql
+++ /dev/null
@@ -1,51 +0,0 @@
--- MySQL dump 10.11
---
--- Host: localhost    Database: ncid
--- ------------------------------------------------------
--- Server version	5.0.27
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
---
--- Table structure for table `cid`
---
-
-DROP TABLE IF EXISTS `cid`;
-CREATE TABLE `cid` (
-  `id` int(11) NOT NULL auto_increment,
-  `date` varchar(36) NOT NULL default '',
-  `time` varchar(32) default NULL,
-  `name` varchar(32) default NULL,
-  `number` varchar(32) default NULL,
-  `ts` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
-  PRIMARY KEY  (`id`)
-) ENGINE=MyISAM AUTO_INCREMENT=17 DEFAULT CHARSET=latin1;
-
---
--- Dumping data for table `cid`
---
-
-LOCK TABLES `cid` WRITE;
-/*!40000 ALTER TABLE `cid` DISABLE KEYS */;
-/*!40000 ALTER TABLE `cid` ENABLE KEYS */;
-UNLOCK TABLES;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
--- Dump completed on 2007-10-29 14:36:50
diff --git a/abs/mv-core/ncid/ncidclient.sh b/abs/mv-core/ncid/ncidclient.sh
deleted file mode 100755
index 0d2be3f..0000000
--- a/abs/mv-core/ncid/ncidclient.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-ncid --no-gui --all  --call-prog --program /usr/bin/ncid.py 127.0.0.1 3333
-
diff --git a/abs/mv-core/ncid/ncidd.conf b/abs/mv-core/ncid/ncidd.conf
deleted file mode 100644
index daa2e79..0000000
--- a/abs/mv-core/ncid/ncidd.conf
+++ /dev/null
@@ -1,143 +0,0 @@
-# ncid - Network CallerID Server Config File
-
-################################
-# Definitions and Line formats #
-################################
-
-# lines can be blank, or start with the words: send, set #
-#
-# A line is divided into words, separated by spaces
-#
-# A word is either a string of non-blank characters, everything
-# between double quotes, or an equal sign.
-#
-# SEND LINE FORMAT:
-#   send DATATYPE [DATATYPE] ...
-#        where DATATYPE = cidlog, cidinfo
-#
-# SET LINE FORMAT:
-#   set ITEM = VALUE [ITEM = VALUE] ...
-#       where ITEM = cidalias, cidlog, datalog, initcid, initstr,
-#                    lockfile, port, ttyclocal, ttyport, ttyspeed,
-#                    nomodem
-
-############################
-# Log and Info for Clients #
-############################
-
-# Send the call log to a client when connected
-# The default is not to send the call log file
-send cidlog
-
-# Send call info (LINE and RING) to a client at each ring
-# The default is not to send the call info line
-send cidinfo
-
-############################
-# NCID Communications Port #
-############################
-
-# The default TCP/IP port is 3333
- set port = 3333
-
-#######################
-# Alias and Log Files #
-#######################
-
-# The default CID alias file: /etc/ncid/ncidd.alias
-# set cidalias = /etc/ncid/ncidd.alias
-
-# The default CID call log file: /var/log/cidcall.log
-# the log file must exist, ncidd will not create it
-# (also make the change in /etc/logrotate.d/ncidd
-#  and also /etc/ncid/ncidrotate.conf)
-# set cidlog = /var/log/cidcall.log
-
-# The default tty data log file: /var/log/ciddata.log
-# the log file must exist, ncidd will not create it
-#  (also make the change in /etc/logrotate.d/ncidd
-#   and also /etc/ncid/ncidrotate.conf)
-# set datalog = /var/log/ciddata.log
-
-#####################
-# TTY Configuration #
-#####################
-
-# The default tty port: /dev/modem
-# set ttyport = /dev/cu.modem # Macintosh OS X
- set ttyport = /dev/ttyS1
-
-# The default tty port speed: 19200
-# The tty speed can be one of: 38400, 19200, 9600, 4800
-# set ttyspeed = 4800 # NetCallerID port speed
-
-# Ignore tty control signals for internal modems and 3 wire serial cables
-#   Disable tty control signals: ttyclocal = 1
-#   Enable tty control signals: ttyclocal = 0 (default)
-# set ttyclocal = 1
-
-# The lockfile name is generated automatically
-# If tty port is /dev/modem, lockfile is: /var/lock/LCK..modem
-# set lockfile = /var/lock/LCK..ttyS0
-
-#####################
-# Modem or No Modem #
-#####################
-
-# Obtain CallerID from a CID device or a modem
-#  device: nomodem = 1 (do not send AT commands)
-#  modem: nomodem = 0 (default - send AT commands)
-# set nomodem = 1
-
-########################
-# Modem Initialization #
-########################
-
-# The default modem initialization is: "AT Z S0=0 E1 V1 Q0"
-# set initstr = "ATE1V1Q0"
-#
-# Alternate modem initialization string
-# set initstr = "AT&FE1V1Q0+VIP"
-
-# Addon strings to set modem for Distinctive Ring:
-#   http://www.modemsite.com/56k/dring.asp
-#
-# 3Com/USR/TI chipset: ATS41=1
-#   Reported Ring Codes: RING A, RING B, RING C
-# Rockwell/Conexant chipset: AT-SDR=7
-#   Reported Ring Codes: RING 1, RING 2, RING 3
-# Lucent/Agere chipset: AT+VDR=1,0
-#   Reported DROF/DRON messages: DRON=5 DROF=11, DRON=5 DROF=34
-#
-# Example adds 3Com DR to the default modem initialization
-# set initstr = "ATE1V1Q0S41=1"
-
-# The default for ncidd is to try two CID strings to setup
-# CallerID: "AT+VCID=1" and if that fails: "AT#CID=1".
-# set initcid = "AT#CID=1"
-#
-# Alternate CID strings to try if default does not work:
-# set initcid = "AT+FCLASS=8;+VCID=1"
-# set initcid = "AT-STE=1;+VCID=1"
-# set initcid = "AT-STE=1;#CID=1"
-
-#################
-# TiVo Settings #
-#################
-# set ttyclocal = 1 # TiVo requires CLOCAL
-# set ttyport = /dev/ttyS1 # TiVo Modem Port
-# set lockfile = /var/tmp/modemlock # needed for TiVo Modem Port
-#
-# To use a modem on the TiVo serial port
-#   Tivo (stereo mini jack) ->
-#   -> (stereo mini plug) TiVo serial cable (9-pin male) ->
-#   -> (9-pin Female) PC modem cable (25-pin Male ->
-#   -> (25-pin Female) Modem
-# if the modem has switches, disable DTR
-# Use this string to set the modem before attaching it to the TiVo:
-#   AT&F0&D0&B1&W
-#
-# set ttyport = /dev/ttyS3 # TiVo Serial Port
-#
-# End TiVo Settings
-
diff --git a/abs/mv-core/ncid/ncidpermissions.sql b/abs/mv-core/ncid/ncidpermissions.sql
deleted file mode 100755
index eb660fa..0000000
--- a/abs/mv-core/ncid/ncidpermissions.sql
+++ /dev/null
@@ -1,8 +0,0 @@
- 
-GRANT ALL ON ncid.* TO mythtv@localhost IDENTIFIED BY "mythtv";
-GRANT ALL ON ncid.* TO mythtv@"%" IDENTIFIED BY "mythtv";
-GRANT FILE ON *.* TO 'mythtv'@'%';
-FLUSH PRIVILEGES;
-
-FLUSH PRIVILEGES;
-ALTER DATABASE ncid DEFAULT CHARACTER SET latin1;
diff --git a/abs/mv-core/runit-scripts-mv/PKGBUILD b/abs/mv-core/runit-scripts-mv/PKGBUILD
deleted file mode 100755
index b27bed3..0000000
--- a/abs/mv-core/runit-scripts-mv/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-pkgname=runit-scripts
-pkgver=1.8.0
-pkgrel=304
-pkgdesc="collection of startup scripts for runit"
-url="http://smarden.org/runit/"
-license="BSD"
-depends=('glibc' 'util-linux' 'initscripts' 'runit' )
-makedepends=('rsync')
-conflicts=()
-replaces=()
-backup=(etc/runit/1.local)
-install=runit.install
-source=(fbsplash-runit.sh)
-arch=('i686')
-
-build() {
-  rsync -a --exclude=.svn --exclude=*~ $startdir/runitscripts $startdir/src
-  cd $startdir/src/runitscripts
-  install -d $startdir/pkg/etc/
-  install -d $startdir/pkg/etc/runit/
-  install -d $startdir/pkg/var/service
-  install -d $startdir/pkg/etc/sv
-  install -d $startdir/pkg/sbin
-  install -d $startdir/pkg/etc/rc.d/functions.d
-
-  install -m0700 1 2 3 1.local ctrlaltdel $startdir/pkg/etc/runit
-  install -m755 $startdir/src/fbsplash-runit.sh $startdir/pkg/etc/rc.d/functions.d/fbsplash-runit.sh
-  install -m0755 reboot-runit halt-runit logger $startdir/pkg/sbin
-  rsync -a --exclude=.svn services/* $startdir/pkg/etc/sv
-}
diff --git a/abs/mv-core/runit-scripts-mv/fbsplash-runit.sh b/abs/mv-core/runit-scripts-mv/fbsplash-runit.sh
deleted file mode 100755
index aa391b0..0000000
--- a/abs/mv-core/runit-scripts-mv/fbsplash-runit.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-# fbsplash function.d script #
-# Author: Greg Helton <gt@fallendusk.org> #
-
-# Who is calling? #
-CALLER=$0
-
-# splash stuff #
-. /etc/conf.d/fbsplash.conf
-. /sbin/splash-functions.sh
-
-# Redefine the stat functions #
-
-stat_runit() {
-	printf "${C_OTHER}${PREFIX_REG} ${C_MAIN}${1}${C_CLEAR} "
-	printf "${SAVE_POSITION}"
- 	deltext
-	printf "   ${C_OTHER}[${C_BUSY}BKGD${C_OTHER}]${C_CLEAR} "
-        # Load variables #
-        var_load STEP_NR MAX_STEPS RC_MULTI RC_SYSINIT RC_SHUTDOWN
-        # Only update the splash progress if we're in sysinit, multi, or shutdown. #
-                ((SPLASH_STEP_NR++))
-                SPLASH_PROGRESS=$((100*${SPLASH_STEP_NR}/${SPLASH_MAX_STEPS}))
-                SPLASH_CURRENT_PROGRESS=${SPLASH_PROGRESS}
-                splash_update_progress ${SPLASH_PROGRESS}
-                var_save STEP_NR CURRENT_PROGRESS
-
-}
diff --git a/abs/mv-core/runit-scripts-mv/runit.install b/abs/mv-core/runit-scripts-mv/runit.install
deleted file mode 100755
index adaf5ed..0000000
--- a/abs/mv-core/runit-scripts-mv/runit.install
+++ /dev/null
@@ -1,56 +0,0 @@
-# arg 1:  the new package version
-
-pre_install () {
-if [ ! -f /sbin/halt-init ]
-then
-   mv /sbin/halt  /sbin/halt-init
-   rm -f /sbin/reboot
-   rm -f /sbin/poweroff
-fi
-
-}
-
-pre_upgrade () {
-if [ ! -f /sbin/halt-init ]
-then
-   mv /sbin/halt  /sbin/halt-init
-   rm -f /sbin/reboot
-   rm -f /sbin/poweroff
-fi
-
-}
-
-post_install () {
- 
- mkdir /var/service
-  servicelist="acpid cron  frontend  lircd ntpd alsa-utils  avahi   dbus   portmap  sshd tty2 tty3"
-  for i in $servicelist
-  do
-   ln -s /etc/sv/$i /var/service/$i
-  done
-
-  ln -s /sbin/halt.script /sbin/halt
-  ln -s /sbin/reboot.script /sbin/reboot
-  ln -s /sbin/poweroff.script /sbin/poweroff
-  ln -s /sbin/halt-init /sbin/reboot.init
-  ln -s /sbin/halt-init /sbin/poweroff.init
-
-
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-
-post_upgrade(){
-  ln -s /sbin/halt.script /sbin/halt
-  ln -s /sbin/reboot.script /sbin/reboot
-  ln -s /sbin/poweroff.script /sbin/poweroff
-  ln -s /sbin/halt-init /sbin/reboot.init
-  ln -s /sbin/halt-init /sbin/poweroff.init
-
-}
-
-op=$1
-shift
-
-$op $*
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/1 b/abs/mv-core/runit-scripts-mv/runitscripts/1
deleted file mode 100755
index 79381ea..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/1
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-/etc/rc.sysinit
-. /etc/rc.conf
-. /etc/rc.d/functions
-hostname `cat /etc/hostname`
-/sbin/sysctl -p 2>/dev/null >/dev/null
-#yes it's needed the 2nd time
-/usr/MythVantage/bin/load-modules-mythvantage.sh >/dev/null
-rm /etc/dhcpc/dhcpcd*.pid  2>/dev/null
-rm -f /etc/sv/frontend/.runtime/* 2>/dev/null
-rm -f /etc/runit/reboot 2>/dev/null
-stat_busy "Starting network"
-/etc/net/scripts/network.init start 2>/var/log/network.init.error >/var/log/network.init
-stat_done
-/usr/sbin/ethtool -s  eth0 wol g 2>/dev/null
-/usr/sbin/ethtool -s  eth1 wol g 2>/dev/null
-/usr/sbin/ethtool -s  eth2 wol g 2>/dev/null
-#user added stuff for level 1 of runit
-if [ -e /etc/runit/1.local ]
-then
-    #exec the file
-    stat_busy  /etc/runit/1.local
-    /etc/runit/1.local
-    stat_done
-fi
-
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/1.local b/abs/mv-core/runit-scripts-mv/runitscripts/1.local
deleted file mode 100755
index f79a0c6..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/1.local
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-#local user startup script, run at the end of runit 1
-
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/2 b/abs/mv-core/runit-scripts-mv/runitscripts/2
deleted file mode 100755
index 079b644..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/2
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-PATH=/bin:/sbin:/usr/bin:/usr/sbin
-
-#runsvchdir default >/dev/null
-
-exec env - PATH=$PATH \
-runsvdir -P /var/service 'log: ...........................................................................................................................................................................................................................................................................................................................................................................................................'
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/3 b/abs/mv-core/runit-scripts-mv/runitscripts/3
deleted file mode 100755
index 0fa3abc..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/3
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-#
-export PREVLEVEL=3
-/etc/rc.shutdown
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/ctrlaltdel b/abs/mv-core/runit-scripts-mv/runitscripts/ctrlaltdel
deleted file mode 100755
index 2550d3c..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/ctrlaltdel
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-PATH=/bin:/usr/bin
-MSG="System is going down in 10 seconds..."
-
-# echo 'disabled.' ; exit
-touch /etc/runit/stopit
-chmod 100 /etc/runit/stopit && echo "$MSG" | wall
-/bin/sleep 10
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/halt-runit b/abs/mv-core/runit-scripts-mv/runitscripts/halt-runit
deleted file mode 100755
index 7c07b05..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/halt-runit
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-runit-init 0
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/logger b/abs/mv-core/runit-scripts-mv/runitscripts/logger
deleted file mode 100755
index 6888f6f..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/logger
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-svname=$( cd .. && basename $( pwd ) )
-if [ ! -d /var/log/$svname ]
-then
-	mkdir /var/log/$svname
-	chown root.root /var/log/$svname
-	chmod 700 /var/log/$svname
-fi
-
-exec /sbin/svlogd -tt /var/log/$svname
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/reboot-runit b/abs/mv-core/runit-scripts-mv/runitscripts/reboot-runit
deleted file mode 100755
index be831ec..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/reboot-runit
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-runit-init 6
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/finish b/abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/finish
deleted file mode 100755
index 14cd831..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/finish
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-. /etc/profile
-VIRTUAL_DISPLAY=":50"
-Xvfb_parm="$VIRTUAL_DISPLAY -screen 0 800x600x16"
-pid=`ps -eaf | grep Xvfb | grep $VIRTUAL_DISPLAY | awk '{print $2}'`
- if [ $pid ] 
- then
- 	kill -9 $pid 
-#	echo $pid
-fi
-rm -f /tmp/.X${VIRTUAL_DISPLAY}-lock
-
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/run
deleted file mode 100755
index 71ffedd..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/Xvfb/run
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-. /etc/profile
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-stat_runit "Starting XVFB"
-
-
-VIRTUAL_DISPLAY=":50"
-Xvfb_parm="$VIRTUAL_DISPLAY -screen 0 800x600x16"
-Xvfb $Xvfb_parm 
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/acpid/log/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/acpid/log/run
deleted file mode 100755
index d00b44d..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/acpid/log/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-exec 2>&1
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-#stat_runit "Starting MythBackend logger"
-/usr/bin/logger -p info -t acpid
-
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/acpid/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/acpid/run
deleted file mode 100755
index 80cc65a..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/acpid/run
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-exec 2>&1
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-stat_runit "Starting acpid"
-exec /usr/sbin/acpid  -f -c /etc/acpi/events  >2 /dev/null 1>/dev/null
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/alsa-utils/finish b/abs/mv-core/runit-scripts-mv/runitscripts/services/alsa-utils/finish
deleted file mode 100755
index d6f3897..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/alsa-utils/finish
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-exec 2>&1
-sv down alsa-utils
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/alsa-utils/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/alsa-utils/run
deleted file mode 100755
index fe5e905..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/alsa-utils/run
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-exec 2>&1
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-exec /etc/rc.d/alsa start
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/apache/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/apache/run
deleted file mode 100755
index 95d5cc4..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/apache/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-stat_runit "Starting Apache"
-
-
-exec /usr/local/apache/bin/httpd -DNO_DETACH
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/avahi/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/avahi/run
deleted file mode 100755
index b9b4905..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/avahi/run
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-exec 2>&1
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-stat_runit "Starting Avahi"
-
-
-exec /usr/sbin/avahi-daemon  >/dev/null 2>/dev/null
-
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/certmaster/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/certmaster/run
deleted file mode 100755
index 6f95abd..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/certmaster/run
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-if [ ! -e /var/log/certmaster ]
-then
-     mkdir -p /var/log/certmaster
-fi
-exec  /usr/bin/certmaster
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/cron/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/cron/run
deleted file mode 100755
index 0894236..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/cron/run
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-stat_runit "Starting Cron"
-
-
-exec 2>&1
-exec /usr/sbin/crond -f  >/dev/null 2>/dev/null
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/dbus/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/dbus/run
deleted file mode 100755
index a9af150..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/dbus/run
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-exec 2>&1
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-stat_runit "Starting dbus"
-
-
-exec /usr/bin/dbus-daemon --system --nofork 2>/dev/null >/dev/null
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/dhcpd/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/dhcpd/run
deleted file mode 100755
index 38ae40a..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/dhcpd/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-stat_runit "Starting dhcpd"
-
-
-exec /usr/sbin/dhcpd -f &> /var/log/dhcpd.log
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/dnsmasq/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/dnsmasq/run
deleted file mode 100755
index f14c51a..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/dnsmasq/run
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-exec 2>&1
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-stat_runit "Starting dns services"
-
-
-exec /usr/sbin/dnsmasq -k   >/dev/null 2>/dev/null
-
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/evrouter/finish b/abs/mv-core/runit-scripts-mv/runitscripts/services/evrouter/finish
deleted file mode 100755
index 5ebda4c..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/evrouter/finish
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-. /etc/profile
-which evrouter >/dev/null 2>/dev/null
-if [ $? = 0 ]
-then
-	DISPLAY=localhost:50 evrouter -q 
-	rm -rf /tmp/.evrouter*
-else
-	sv down evrouter
-fi
\ No newline at end of file
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/evrouter/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/evrouter/run
deleted file mode 100755
index 56f7ae6..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/evrouter/run
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-. /etc/profile
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-which evrouter >/dev/null 2>/dev/null
-if [ $? = 0 ]
-then
-
-	stat_runit "Starting evrouter"
-	ps -ef |grep -v grep|grep -q "Xvfb :50"
-	if [ ! $?  = 0 ]
-	then
-		sv start Xvfb
-	fi
-	
-	su mythtv -c "DISPLAY=localhost:50 evrouter -c /etc/evrouter.cfg -f /dev/input/event*"
-fi
-
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/frontend/finish b/abs/mv-core/runit-scripts-mv/runitscripts/services/frontend/finish
deleted file mode 100755
index 4836b44..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/frontend/finish
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-exec 2>&1
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-grep -q  noautologin /proc/cmdline
-STATUS=$?
-if  [ $STATUS = 0 ]
-then
-    chvt 2
-else
-chvt 1
-touch /etc/sv/frontend/.runtime/`date +%s`
-sleep 0.5
-ps -ef |grep "xinit /etc/X11/Sessions/STB"|grep -v grep|awk ' { print $2 } '|xargs kill  2> /dev/null
-cdate=`date`
-#numfiles=`/usr/bin/fbd  -d "$cdate" -a 10s /etc/sv/frontend/.runtime  2>/dev/null |wc -l`
-numfiles=`/usr/bin/file_time_offset.py   -s10 -d/etc/sv/frontend/.runtime`   
-
-if [ $numfiles -gt 2 ]
-then
- sv stop frontend
- rm -f /etc/sv/frontend/.runtime/*
- printhl  "    Frontend is not able to start, disabling it."
-fi
-fi
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/frontend/log/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/frontend/log/run
deleted file mode 100755
index df916cd..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/frontend/log/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-exec 2>&1
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/systemconfig
- /usr/bin/logger -p local6.info -t mythfrontend 
-
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/frontend/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/frontend/run
deleted file mode 100755
index 0c75b96..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/frontend/run
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-exec 2>&1
-sv start dbus
-sv start hal
-grep -q  noautologin /proc/cmdline
-STATUS=$?
-if  [ $STATUS = 0 ]
-then
-    sv down frontend
-    exit 0
-fi
-stat_runit "Starting MythVantage frontend"
-exec  /bin/su - mythtv -l -c STB-start
-
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/funcd/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/funcd/run
deleted file mode 100755
index e4f27d0..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/funcd/run
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-stat_runit "Starting func"
-if [ ! -e /var/log/func ]
-then
-    mkdir -p /var/log/func
-fi
-if [ ! -e /var/log/certmaster ]
-then
-    mkdir -p /var/log/certmaster
-fi
-
-
-exec  /usr/bin/funcd
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/ghosd/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/ghosd/run
deleted file mode 100755
index faf4d59..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/ghosd/run
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-exec 2>&1
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-stat_runit "Starting ghosd"
-DISPLAY=localhost:0.0 exec  /usr/bin/osdServer.pl 5000  
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/gpm/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/gpm/run
deleted file mode 100755
index c347c77..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/gpm/run
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-exec 2>&1
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-stat_runit "Starting GPM"
-
-
-. /etc/sysconfig/mouse
-exec gpm -D -m $MDEVICE -t $PROTOCOL
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/hal/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/hal/run
deleted file mode 100755
index a6d5c0e..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/hal/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-exec 2>&1
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-svwaitup dbus 2>/dev/null 1>/dev/null
-stat_runit "Starting Hal"
-exec /usr/sbin/hald --daemon=no --use-syslog 2>/dev/null >/dev/null
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/hobbit-client/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/hobbit-client/run
deleted file mode 100755
index 520f720..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/hobbit-client/run
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/sh
-#----------------------------------------------------------------------------#
-# Hobbit client bootup script.                                               #
-#                                                                            #
-# This invokes hobbitlaunch, which in turn runs the Hobbit client and any    #
-# extensions configured.                                                     #
-#                                                                            #
-# Copyright (C) 2005-2006 Henrik Storner <henrik@hswn.dk>                    #
-# "status" section (C) Scott Smith 2006                                      #
-#                                                                            #
-# This program is released under the GNU General Public License (GPL),       #
-# version 2. See the file "COPYING" for details.                             #
-#                                                                            #
-#----------------------------------------------------------------------------#
-#
-# $Id: runclient.sh,v 1.13 2006/07/14 21:25:19 henrik Rel $
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-stat_runit "Starting hobbit client"
-# Default settings for this client
-MACHINEDOTS="`uname -n`"			# This systems hostname
-BBOSTYPE="`uname -s | tr '[A-Z]' '[a-z]'`"	# This systems operating system in lowercase
-BBOSSCRIPT="hobbitclient-$BBOSTYPE.sh"
-
-# Commandline mods for the defaults
-while test "$1" != ""
-do
-	case "$1" in
-	  --hostname=*)
-	  	MACHINEDOTS="`echo $1 | sed -e 's/--hostname=//'`"
-		;;
-	  --os=*)
-	  	BBOSTYPE="`echo $1 | sed -e 's/--os=//' | tr '[A-Z]' '[a-z]'`"
-		;;
-	  --class=*)
-	        CONFIGCLASS="`echo $1 | sed -e 's/--class=//' | tr '[A-Z]' '[a-z]'`"
-		;;
-	  --help)
-	  	echo "Usage: $0 [--hostname=CLIENTNAME] [--os=rhel3|linux22] [--class=CLASSNAME] start|stop"
-		exit 0
-		;;
-	  start)
-	  	CMD=$1
-		;;
-	  stop)
-	  	CMD=$1
-		;;
-	  restart)
-	  	CMD=$1
-		;;
-	  status)
-	  	CMD=$1
-		;;
-	esac
-
-	shift
-done
-
-OLDDIR="`pwd`"
-cd "`dirname $0`"
-HOBBITCLIENTHOME="/data/srv/hobbit/client"
-cd "$OLDDIR"
-
-MACHINE="`echo $MACHINEDOTS | sed -e 's/\./,/g'`"
-
-export MACHINE MACHINEDOTS BBOSTYPE BBOSSCRIPT HOBBITCLIENTHOME CONFIGCLASS
-
-
-su nobody -c "$HOBBITCLIENTHOME/bin/hobbitlaunch --config=$HOBBITCLIENTHOME/etc/clientlaunch.cfg --log=$HOBBITCLIENTHOME/logs/clientlaunch.log --pidfile=$HOBBITCLIENTHOME/logs/clientlaunch.$MACHINEDOTS.pid --no-daemon"
-
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/hobbit/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/hobbit/run
deleted file mode 100755
index 19b8194..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/hobbit/run
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-exec 2>&1
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-stat_runit "Starting hobbit server"
-exec su nobody -c "/data/srv/hobbit/server/bin/hobbitlaunch --config=/data/srv/hobbit/server/etc/hobbitlaunch.cfg --env=/data/srv/hobbit/server/etc/hobbitserver.cfg --log=/var/log/hobbit/hobbitlaunch.log --pidfile=/var/log/hobbit/hobbitlaunch.pid --no-daemon"
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/igdaemon/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/igdaemon/run
deleted file mode 100755
index ea4f33b..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/igdaemon/run
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-exec 2>&1
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-stat_runit "Starting IguanaWorks IR daemon"
-
-
-exec /usr/bin/igdaemon --no-ids  -n -l /var/log/igdaemon.log
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/lcdd/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/lcdd/run
deleted file mode 100755
index da2258b..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/lcdd/run
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-. /etc/systemconfig
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-stat_runit "Starting lcdproc"
-
-
-exec 2>&1
-if [ x$LCDtype = xxosd ]
-then
-	DISPLAY=127.0.0.1:0 /usr/sbin/LCDd -f -c /etc/LCDd.conf 2>/dev/null >/dev/null
-else
-	exec /usr/sbin/LCDd -f -c /etc/LCDd.conf 2>/dev/null >/dev/null
-fi
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/lighttpd/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/lighttpd/run
deleted file mode 100755
index 798690c..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/lighttpd/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-stat_runit "Starting lighttpd"
-
-
-exec /usr/sbin/lighttpd -D -f /etc/lighttpd/lighttpd.conf
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/lircd/finish b/abs/mv-core/runit-scripts-mv/runitscripts/services/lircd/finish
deleted file mode 100755
index 1afc41c..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/lircd/finish
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-killall -9 lircd 2>/dev/null 
-rm -f /var/run/lirc*.pid 
-[ -e /etc/sv/lircd/.runtime ] || mkdir -p /etc/sv/lircd/.runtime
-touch /etc/sv/lircd/.runtime/`date +%s`    
-numfiles=`/usr/bin/file_time_offset.py   -s4 -d/etc/sv/lircd/.runtime ` 
-if [ $numfiles -gt 3 ]
-then
-	 rm -f /etc/sv/lircd/.runtime/* 2>/dev/null
-	 sv stop lircd
-	 printhl "    lircd is not able to start, disabling it"
-fi     
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/lircd/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/lircd/run
deleted file mode 100755
index 769c229..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/lircd/run
+++ /dev/null
@@ -1,137 +0,0 @@
-#!/bin/bash
-
-exec 2>&1
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-#since what we do may not be enough
-#if your one of those people, this is where you place your stuff
-
-LOG=/tmp/lirc.log
-
-if [ -f $LOG ]
-then
-    rm -f $LOG
-fi
-
-if [ -f /etc/runit/lirc.sh ]
-then
-    #program must not terminate.
-
-    stat_runit "Starting lirc"
-	
-    /etc/runit/lirc.sh
-else
-    . /etc/systemconfig
-    stat_runit "Starting lirc"
-
-    [ -e /etc/sv/lircd/.runtime ] || mkdir -p /etc/sv/lircd/.runtime
-
-    function dvico_detect {
-        if [ x$Remotetype = "xdvico" ] || [ x$Remotetype = "xDvico-Dual-Digital4-rev2" ]
-        then
-            RunDvico=true
-        else
-            RunDvico=false
-        fi
-    }
-
-    num_lirc=`ls -la /dev/lirc[0-9] 2>/dev/null |wc -l `
-    num_lirc=$((num_lirc-1))
-
-    serial_port=""
-
-    if [ x$ReceiverType = xSerial ]
-    then
-        serial_port=$ReceiverSerialport
-    elif [ x$HostBlasterType = xSerial ]
-    then
-        serial_port=$HostSerialPort_blasterlirc
-    fi
-
-    if [ -n "$serial_port" ]
-    then
-        #/dev/ttyS0 (COM1), port 0x3f8, irq 4
-        #/dev/ttyS1 (COM2), port 0x2f8, irq 3
-    	#/dev/ttyS2 (COM3), port 0x3e8, irq 4
-    	#/dev/ttyS3 (COM4), port 0x2e8, irq 3
-
-        case $serial_port in
-        ttyS0)
-               FLAGS="io=0x3f8  irq=4"
-               ;;
-        ttyS1)
-               FLAGS="io=0x2f8  irq=3"
-               ;;
-        ttyS2)
-               FLAGS="io=0x3e8  irq=4"
-               ;;
-        ttyS3)
-               FLAGS="io=0x2e8  irq=3"
-               ;;
-        esac
-        /usr/bin/setserial /dev/serial_port uart none
-	sleep 0.5
-        /sbin/modprobe lirc_serial $FLAGS
-	sleep 0.5
-    fi
-
-    dvico_detect
-
-    if [ x$HostBlasterType = xCommandIR -o x$ReceiverType = xCommandIR ]
-    then
-        CMD="/usr/sbin/lircd -n  --driver=commandir"
-	printhl "	Using commandir"
-        $CMD >>$LOG 2>>$LOG
-#echo $CMD
-    elif [  x$HostBlasterType = xiguanaIR-usb -o x$ReceiverType = xiguanaIR-usb ]
-    then
-	sv start igdaemon
-        CMD="/usr/sbin/lircd -n  --driver=iguanaIR"
-	printhl "       Using iguanaIR usb"
-#echo $CMD
-        $CMD >>$LOG 2>>$LOG
-    else
-        LASTCMD=""
-
-        for i in `seq 1 $num_lirc`
-        do
-            CMD="/usr/sbin/lircd -d /dev/lirc$i --output=/dev/lircd$i --pidfile=/var/run/lircd$i.pid --listen=876$i"
-	    printhl "	Device $i"
-#echo $CMD
-            $CMD >>$LOG 2>>$LOG
-            LASTCMD="--connect=localhost:876$i   $LASTCMD    "
-        done
-
-	if [ $RunDvico = "true" ]
-	then
-	    if [ x$Remotetype = "xdvico" ]
-            then
-                LCMD="/usr/sbin/lircd -n -d /dev/usb/dvicoIR --driver=dvico  --output /dev/lircd"
-            else
-                LCMD="/usr/sbin/lircd -n -d /dev/input/irremote --driver=devinput  --output /dev/lircd"
-            fi
-
-	    if [ $num_lirc -lt 0 ]
-	    then
-		# Only run Dvico
-		printhl "   Device $Remotetype"
-#echo $LCMD
-            	exec $LCMD >>$LOG 2>>$LOG
-	    elif [ $num_lirc -gt -1  ]
-	    then
-                i=$((i+1))
-                CMD="$LCMD --output=/dev/lircd$i --pidfile=/var/run/lircd$i.pid --listen=876$i"
-                $CMD >> $LOG
-                LASTCMD="--connect=localhost:876$i   $LASTCMD    "
-	        printhl "	Device Dvico"
-		/usr/sbin/lircd -n -d /dev/lirc0 --output /dev/lircd  $LASTCMD  >>$LOG 2>>$LOG
-	    fi
-	else
-	    LCMD="/usr/sbin/lircd -n -d /dev/lirc0 --output /dev/lircd  $LASTCMD"
-#echo $LCMD
-     	    exec $LCMD >>$LOG 2>>$LOG
-	fi
-    fi
-fi
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/mdadm/finish b/abs/mv-core/runit-scripts-mv/runitscripts/services/mdadm/finish
deleted file mode 100755
index 92782ba..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/mdadm/finish
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash

-#

-# Stop Monitoring software raid arrays

-exec 2>&1

-export TERM=linux

-. /etc/rc.conf

-. /etc/rc.d/functions

-

-PID=`pidof -o %PPID /sbin/mdadm`

-    stat_runit "Stopping mdadm RAID Monitor"

-    [ ! -z "$PID" ] && kill $PID &>/dev/null

-    if [ $? -gt 0 ]; then

-      stat_fail

-    else

-      rm_daemon mdadm

-      stat_done

-    fi

diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/mdadm/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/mdadm/run
deleted file mode 100755
index 0ab432e..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/mdadm/run
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash

-#

-# Start Monitoring software raid arrays

-exec 2>&1

-export TERM=linux

-. /etc/rc.conf

-. /etc/rc.d/functions

-

-PID=`pidof -o %PPID /sbin/mdadm`

-    stat_runit "Starting mdadm RAID Monitor"

-    if [ -z "$PID" ]; then

-       /sbin/mdadm -F -s

-    fi

-    if [ ! -z "$PID" -o $? -gt 0 ]; then

-      stat_fail

-    else

-      add_daemon mdadm

-      stat_done

-    fi

diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/mysql/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/mysql/run
deleted file mode 100755
index 6b2f95a..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/mysql/run
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-exec 2>&1
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-stat_runit "Starting Mysql"
-
-MYSQLD_ROOT="/data/srv/mysql"
-# source application-specific settings
-[ -f /etc/conf.d/mysqld ] && . /etc/conf.d/mysqld
-if [ ! `egrep '^mysql:' /etc/group` ]; then
-  stat_runit "Adding mysql group"
-  groupadd -g 89 mysql
-  
-fi
-if [ ! `egrep '^mysql:' /etc/passwd` ]; then
-  stat_runit "Adding mysql user"
-  useradd -u 89 -g mysql -d $MYSQLD_ROOT -s /bin/false mysql
-  [ -d $MYSQLD_ROOT ] && chown -R mysql.mysql $MYSQLD_ROOT
-  
-fi
-
-if [ ! -d $MYSQLD_ROOT ]; then
-  mkdir -p $MYSQLD_ROOT
-  /usr/bin/mysql_install_db --datadir=$MYSQLD_ROOT --user=mysql 2>/dev/null 1>/dev/null
-  chown -R mysql.mysql $MYSQLD_ROOT
-fi
-
-if [ ! -e /var/log/mysqld.log ]; then
-  touch /var/log/mysqld.log
-  chown mysql /var/log/mysqld.log
-fi
-
-exec /usr/sbin/mysqld --skip-name-resolve  -u mysql 2>/dev/null >/dev/null
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/mythbackend/log/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/mythbackend/log/run
deleted file mode 100755
index 6ed5184..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/mythbackend/log/run
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-exec 2>&1
- /usr/bin/logger -p local7.info -t mythbackend  
-
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/mythbackend/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/mythbackend/run
deleted file mode 100755
index 692e7db..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/mythbackend/run
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-exec 2>&1
-. /etc/profile
-. /etc/systemconfig
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-export HOME=/root
-if [ ! x$SystemType = xSlave_backend ]
-then
-	sv start mysql > /dev/null 2>/dev/null
-        #run mythfilldatabase
-        /usr/MythVantage/bin/initial_db_run &
-fi
-mkfifo /tmp/mbefifo >/dev/null 2>/dev/null
-echo "Starting mythbackend"
-	if [ -f /tmp/debug ]
-		then
-			echo "using gbd/debug"
-			gdb /usr/bin/mythbackend -x $MV_ROOT/mbegdbcommands.txt
-			bash -c "osdClient.pl localhost 5000 'Restart gdb mbe  :::SYS' "&
-			mv gdb.txt /data/home/mythtv/gdb.txt.mythbackend
-			chown mythtv:mythtv /data/home/mythtv/gdb.txt.mythbackend
-			sleep 10
-
-		else
-			exec /usr/bin/mythbackend
-		fi
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/ncid/finish b/abs/mv-core/runit-scripts-mv/runitscripts/services/ncid/finish
deleted file mode 100644
index 953a4a1..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/ncid/finish
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-exec 2>&1
-which ncid 2>/dev/null >/dev/null
-if [ ! $?  = 0 ]
-then
-	sv down ncid
-fi
-
-
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/ncid/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/ncid/run
deleted file mode 100755
index 44154c7..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/ncid/run
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-exec 2>&1
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-
-which ncid 2>/dev/null >/dev/null
-
-if [ $? = 0 ]
-then
-	if [ -f /var/service/ncidd/run ]
-	then
-		sv start ncidd
-	fi
-
-	stat_runit "Starting callerid client"
-	
-	exec /usr/bin/ncid --no-gui --all  --call-prog --program /usr/bin/ncid.py 127.0.0.1 3333
-fi
-
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/ncidd/finish b/abs/mv-core/runit-scripts-mv/runitscripts/services/ncidd/finish
deleted file mode 100644
index ab39d39..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/ncidd/finish
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-exec 2>&1
-which ncidd 2>/dev/null >/dev/null
-if [ ! $?  = 0 ]
-then
-	sv down ncid
-fi
-
-
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/ncidd/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/ncidd/run
deleted file mode 100755
index 6fff089..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/ncidd/run
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/sh
-exec 2>&1
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-which ncidd > /dev/null 2>/dev/null
-if [ $? = 0 ]
-then
-	stat_runit "Starting CallerID"
-	
-	exec /usr/sbin/ncidd -D 2>&1 
-fi
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/netfs/finish b/abs/mv-core/runit-scripts-mv/runitscripts/services/netfs/finish
deleted file mode 100755
index 43be94c..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/netfs/finish
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-exec 2>&1
-sv down netfs
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/netfs/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/netfs/run
deleted file mode 100755
index 28388b9..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/netfs/run
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-exec 2>&1
-sv start portmap
-sv start nfslock
-/etc/rc.d/netfs start
-
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/nfsd/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/nfsd/run
deleted file mode 100755
index 9665066..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/nfsd/run
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-exec 2>&1
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-stat_runit "Starting NFSD"
-
-# Make sure the statd daemon is up
-# (the statd service must ensure portmap is running first)
-svwaitup /var/service/nfslock >/dev/null 2>/dev/null
-
-source /etc/conf.d/nfs
-
-# Re-export all directories in /etc/exports
-/usr/sbin/exportfs -ra > /dev/null 2>/dev/null
-
-# start some nfsd threads
-printhl "	Using ${NFSD_OPTS} "
-/usr/sbin/rpc.nfsd  ${NFSD_OPTS} >/dev/null 2>/dev/null  
-
-# since we are running kernel 2.6 we should also
-# mount the nfsd virtual filesystem
-printhl "	mount nfsd"
-/bin/mount -t nfsd none /proc/fs/nfsd >/dev/null 2>/dev/null
-
-# Start the rpc.mountd daemon
-
-exec /usr/sbin/rpc.mountd --foreground  >/dev/null 2>/dev/null   
-
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/nfslock/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/nfslock/run
deleted file mode 100755
index 8d627ad..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/nfslock/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-exec 2>&1
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-stat_runit "Starting NFSlock"
-svwaitup portmap  >/dev/null 2>/dev/null   
-/usr/sbin/rpc.statd -F  >/dev/null 2>/dev/null   
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/nmbd/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/nmbd/run
deleted file mode 100755
index 9ed032b..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/nmbd/run
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-exec 2>&1
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-stat_runit "Starting NMBD"
-
-
-exec nmbd -F -S -d1  2>/dev/null >/dev/null
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/ntpd/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/ntpd/run
deleted file mode 100755
index 146c4e0..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/ntpd/run
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-stat_runit "Starting NTPD"
-printhl "    Fetching time"
-msg=`/usr/bin/ntpdate pool.ntp.org `
-printhl "   $msg"
-
-exec /usr/bin/ntpd -n -p /var/run/ntpd.pid 2>/dev/null
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/oss/finish b/abs/mv-core/runit-scripts-mv/runitscripts/services/oss/finish
deleted file mode 100755
index f929f39..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/oss/finish
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-exec 2>&1
-sv down oss
-
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/oss/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/oss/run
deleted file mode 100755
index fe26e3f..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/oss/run
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-exec 2>&1
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-rm -f /usr/lib/oss/starting
-#exec /etc/rc.d/alsa-utils start all
-exec /usr/sbin/soundon
-
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/portmap/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/portmap/run
deleted file mode 100755
index 9e708e6..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/portmap/run
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-exec 2>&1
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-stat_runit "Starting portmap"
-exec /sbin/portmap -d >/dev/null 2>/dev/null
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/smartd/finish b/abs/mv-core/runit-scripts-mv/runitscripts/services/smartd/finish
deleted file mode 100755
index 7b77994..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/smartd/finish
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
- . /etc/rc.conf
- . /etc/rc.d/functions
-
-     stat_runit "Stopping smartd"
-     kill -9 `pidof /usr/sbin/smartd` &>/dev/null
-     rm_daemon smartd
-     stat_done
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/smartd/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/smartd/run
deleted file mode 100755
index f3f3bf8..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/smartd/run
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-stat_runit "Starting smartd"
-/usr/sbin/smartd -n -c /etc/smartd.conf -q never &>/dev/null
-if [ $? -ne 0 ]
-then
-       stat_fail
-else
-    add_daemon smartd
-    stat_done
-fi
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/smbd/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/smbd/run
deleted file mode 100755
index b4a545b..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/smbd/run
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-exec 2>&1
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-stat_runit "Starting Samba"
-
-
-exec smbd -F -S -d3 2>/dev/null >/dev/null
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/sshd/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/sshd/run
deleted file mode 100755
index fc22e3b..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/sshd/run
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-exec 2>&1
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-stat_runit "Starting SSH"
-
-[ -f /etc/ssh/ssh_host_key ] || { /usr/bin/ssh-keygen -t rsa1 -N "" -f /etc/ssh/ssh_host_key >/dev/null; }
-    [ -f /etc/ssh/ssh_host_rsa_key ] || { /usr/bin/ssh-keygen -t rsa -N "" -f /etc/ssh/ssh_host_rsa_key >/dev/null; }
-    [ -f /etc/ssh/ssh_host_dsa_key ] || { /usr/bin/ssh-keygen -t dsa -N "" -f /etc/ssh/ssh_host_dsa_key >/dev/null; }
-
-
-exec /usr/sbin/sshd -D >/dev/null 2>/dev/null
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/syslog-ng/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/syslog-ng/run
deleted file mode 100755
index 8633a77..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/syslog-ng/run
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-exec 2>&1
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-stat_runit "Starting syslog"
-
-
-exec /usr/sbin/syslog-ng -F
-
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/tatir/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/tatir/run
deleted file mode 100755
index d6fc863..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/tatir/run
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-exec 2>&1
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-stat_runit "Starting tatir" 
-
-
-exec /usr/bin/PyroUsb.py > /dev/null
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/tftpd/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/tftpd/run
deleted file mode 100755
index 8f742ca..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/tftpd/run
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-stat_runit "Starting tftpd"
-
-
-exec /usr/sbin/in.tftpd --foreground -s /tftpboot
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/tty2/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/tty2/run
deleted file mode 100755
index 8db2924..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/tty2/run
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-stat_runit "Starting Agetty 2"
-
-exec /sbin/agetty 38400 vc/2 linux
diff --git a/abs/mv-core/runit-scripts-mv/runitscripts/services/tty3/run b/abs/mv-core/runit-scripts-mv/runitscripts/services/tty3/run
deleted file mode 100755
index bdbec66..0000000
--- a/abs/mv-core/runit-scripts-mv/runitscripts/services/tty3/run
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-export TERM=linux
-. /etc/rc.conf
-. /etc/rc.d/functions
-stat_runit "Starting Agetty 3"
-exec /sbin/agetty 38400 vc/3 linux
diff --git a/abs/mv-core/syslog-ng/PKGBUILD b/abs/mv-core/syslog-ng/PKGBUILD
deleted file mode 100644
index 9a30df6..0000000
--- a/abs/mv-core/syslog-ng/PKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-pkgname=syslog-ng
-pkgver=2.0.10
-pkgrel=1
-pkgdesc="A portable syslogd replacement with enhanced, flexible configuration scheme."
-arch=(i686 x86_64)
-license=('GPL')
-url="http://www.balabit.com/products/syslog_ng"
-makedepends=('flex' 'glib2' 'eventlog')
-depends=('tcp_wrappers' 'logrotate')
-install=('syslog.install')
-provides=('logger')
-backup=('etc/syslog-ng.conf')
-source=(http://www.balabit.com/downloads/files/syslog-ng/open-source-edition/$pkgver/source/${pkgname}_$pkgver.tar.gz \
-	syslog-ng.conf syslog-ng.logrotate syslog-ng log_care.sh)
-
-build() {
-  cd $startdir/src/$pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc \
-    --localstatedir=/var --enable-tcp-wrapper --disable-spoof-source
-  make || return 1
-  make DESTDIR=$startdir/pkg install || return 1
-  install -D -m644 ../syslog-ng.conf $startdir/pkg/etc/syslog-ng.conf
-  install -D -m644 ../syslog-ng.logrotate $startdir/pkg/etc/logrotate.d/syslog-ng
-  install -D -m755 ../syslog-ng $startdir/pkg/etc/rc.d/syslog-ng
-  install -D -m755 ../log_care.sh  $startdir/pkg/usr/bin/log_care.sh
-}
diff --git a/abs/mv-core/syslog-ng/log_care.sh b/abs/mv-core/syslog-ng/log_care.sh
deleted file mode 100755
index 7ca87b9..0000000
--- a/abs/mv-core/syslog-ng/log_care.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-. /etc/profile
-DATE=`date +%Y`
-
-echo "compressing"
-find /var/log/$DATE* -mtime  +1 -exec gzip -9 {} \;
-echo "deleteing"
-find /var/log/$DATE*  -mtime +7  -exec rm -rf {} \;
-
-hostname=`hostname`
-DATE=`date +%Y-%m-%d`
-
-  cd /var/log || exit 1
-    while read symlink target; do
-                [ -z $target ] && target=$symlink
-                    ln -sf $DATE/$hostname/$symlink $symlink
-                      done <<'EOF'
-                      maillog mail
-                      messages
-EOF
-ln -sf $DATE/myth_mtc.log myth_mtc.log
diff --git a/abs/mv-core/syslog-ng/syslog-ng b/abs/mv-core/syslog-ng/syslog-ng
deleted file mode 100755
index ab75b5e..0000000
--- a/abs/mv-core/syslog-ng/syslog-ng
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/syslog-ng`
-case "$1" in
-  start)
-    stat_busy "Starting Syslog-NG"
-    [ -z "$PID" ] && /usr/sbin/syslog-ng
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon syslog-ng
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping Syslog-NG"
-    [ ! -z "$PID" ]  && kill $PID &> /dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm -f /var/run/syslog-ng.pid
-      rm_daemon syslog-ng
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0
diff --git a/abs/mv-core/syslog-ng/syslog-ng.conf b/abs/mv-core/syslog-ng/syslog-ng.conf
deleted file mode 100644
index f71be35..0000000
--- a/abs/mv-core/syslog-ng/syslog-ng.conf
+++ /dev/null
@@ -1,129 +0,0 @@
-#
-# /etc/syslog-ng/syslog-ng.conf
-#
-
-options {
-  sync (0);
-  time_reopen (10);
-  log_fifo_size (1000);
-  long_hostnames(off); 
-  use_dns (no);
-  use_fqdn (no);
-  create_dirs (yes);
-  keep_hostname (yes);
-  perm(0655);
-  dir_perm(0755);
-  group("log");
-
-};
-
-
-source s_sys { pipe ("/proc/kmsg" log_prefix("kernel: ")); unix-stream ("/dev/log"); internal(); };
-source r_src { tcp(ip("0.0.0.0") port(514)); };
-
-destination d_cons { file("/dev/console"); };
-
-#destination d_mesg { file("/var/log/messages"); };
-
-#destination d_auth { file("/var/log/secure"); };
-#destination d_mail { file("/var/log/maillog"); };
-#destination d_spol { file("/var/log/spooler"); };
-
-#destination d_boot { file("/var/log/boot.log"); };
-
-#destination d_cron { file("/var/log/cron"); };
-destination d_mlal { usertty("*"); };
-#destination d_kernel { file("/var/log/kern"); };
-
-destination d_remote {tcp("127.0.0.1" port(514)) ;} ;
-
-destination dr_cons { file("/dev/console"); };
-destination dr_mesg { file("/var/log/$YEAR-$MONTH-$DAY/$HOST/messages"); };
-destination dr_auth { file("/var/log/$YEAR-$MONTH-$DAY/$HOST/secure"); };
-destination dr_mail { file("/var/log/$YEAR-$MONTH-$DAY/$HOST/maillog"); };
-destination dr_spol { file("/var/log/$YEAR-$MONTH-$DAY/$HOST/spooler"); };
-#destination dr_boot { file("/var/log/$YEAR-$MONTH-$DAY/$HOST/boot.log"); };
-destination dr_cron { file("/var/log/$YEAR-$MONTH-$DAY/$HOST/cron"); };
-destination dr_acpid { file("/var/log/$YEAR-$MONTH-$DAY/$HOST/acpid"); };
-destination dr_lighttpd { file("/var/log/$YEAR-$MONTH-$DAY/$HOST/lighttpd_access.log"); };
-destination dr_lighttpd_error { file("/var/log/$YEAR-$MONTH-$DAY/$HOST/lighttpd_error.log"); };
-destination dr_dnsmasq { file("/var/log/$YEAR-$MONTH-$DAY/$HOST/dnsmasq"); };
-
-destination dr_local0 { file("/var/log/$YEAR-$MONTH-$DAY/$HOST/local0"); };
-destination dr_local1 { file("/var/log/$YEAR-$MONTH-$DAY/$HOST/local1"); };
-destination dr_local2 { file("/var/log/$YEAR-$MONTH-$DAY/$HOST/local2"); };
-destination dr_local3 { file("/var/log/$YEAR-$MONTH-$DAY/$HOST/local3"); };
-destination dr_local4 { file("/var/log/$YEAR-$MONTH-$DAY/$HOST/local4"); };
-destination dr_local5 { file("/var/log/$YEAR-$MONTH-$DAY/$HOST/ncidd.log"); };
-destination dr_local6 { file("/var/log/$YEAR-$MONTH-$DAY/$HOST/mythfrontend.log"); };
-destination dr_local7 { file("/var/log/$YEAR-$MONTH-$DAY/$HOST/mythbackend.log"); };
-
-destination dr_mlal { usertty("*"); };
-destination dr_kernel { file("/var/log/$YEAR-$MONTH-$DAY/$HOST/kern"); };
-destination dr_everything { file("/var/log/$YEAR-$MONTH-$DAY/$HOST/everything"); };
-
-filter f_filter1 { facility(kern); };
-filter f_filter2 { level(info) and
-not (facility(mail) or facility(authpriv) or facility(local6) or facility(local7) or program(lighttpd) or facility(cron) or program("kernel")); };
-filter f_filter3 { facility(authpriv); };
-filter f_filter4 { facility(mail); };
-filter f_filter5 { level(emerg); };
-filter f_filter6 { facility(uucp) or
-(facility(news) and level(crit)); };
-
-#filter f_filter7 { facility(local7); };
-
-filter f_filter8 { facility(cron); };
-
-#filter f_local0 { facility(local0); };
-#filter f_local1 { facility(local1); };
-#filter f_local2 { facility(local2); };
-#filter f_local3 { facility(local3); };
-filter f_local4 { facility(local4); };
-filter f_local5 { facility(local5); };
-filter f_local6 { facility(local6); };
-filter f_local7 { facility(local7); };
-filter f_kernel { level(info) and program("kernel") and not  program(lighttpd); };
-filter f_acpid { match("acpid")  and not ( facility(syslog) or program(lighttpd) ) ; };
-filter f_lighttpd { match("lighttpd") and not facility(syslog) ; };
-filter f_lighttpd_error  { match("lighttpd") and level(error) and not facility(syslog) ; };
-filter f_dnsmasq { match("dnsmasq") and not (facility(syslog)or program(lighttpd)); };
-filter f_everything { level(debug..emerg) and not (facility(auth,authpriv,syslog) or program(lighttpd)); };
-
-
-
-#log { source(s_sys); filter(f_filter1); destination(d_cons); };
-####log { source(s_sys); filter(f_filter2); destination(d_mesg); };
-#log { source(s_sys); filter(f_filter3); destination(d_auth); };
-#log { source(s_sys); filter(f_filter4); destination(d_mail); };
-#log { source(s_sys); filter(f_filter5); destination(d_mlal); };
-#log { source(s_sys); filter(f_filter6); destination(d_spol); };
-####log { source(s_sys); filter(f_filter7); destination(d_boot); };
-#log { source(s_sys); filter(f_filter8); destination(d_cron); };
-####log { source(s_sys); filter(f_kernel); destination(d_kernel); };
-#
-##log { source(r_src); filter(f_filter1); destination(dr_cons); };
-log { source(r_src); filter(f_filter2); destination(dr_mesg); };
-log { source(r_src); filter(f_filter3); destination(dr_auth); };
-log { source(r_src); filter(f_filter4); destination(dr_mail); };
-log { source(r_src); filter(f_filter5); destination(dr_mlal); };
-log { source(r_src); filter(f_filter6); destination(dr_spol); };
-#log { source(r_src); filter(f_filter7); destination(dr_boot); };
-log { source(r_src); filter(f_filter8); destination(dr_cron); };
-#log { source(r_src); filter(f_local0); destination(dr_local0); };
-#log { source(r_src); filter(f_local1); destination(dr_local1); };
-#log { source(r_src); filter(f_local2); destination(dr_local2); };
-#log { source(r_src); filter(f_local3); destination(dr_local3); };
-log { source(r_src); filter(f_local4); destination(dr_local4); };
-log { source(r_src); filter(f_local5); destination(dr_local5); };
-log { source(r_src); filter(f_local6); destination(dr_local6); };
-log { source(r_src); filter(f_local7); destination(dr_local7); };
-log { source(r_src); filter(f_kernel); destination(dr_kernel); };
-log { source(r_src); filter(f_acpid); destination(dr_acpid); };
-log { source(r_src); filter(f_dnsmasq); destination(dr_dnsmasq); };
-log { source(r_src); filter(f_lighttpd); destination(dr_lighttpd); };
-log { source(r_src); filter(f_lighttpd_error); destination(dr_lighttpd_error); };
-log { source(r_src); filter(f_everything); destination(dr_everything); };
-log { source(s_sys); destination (d_remote); };
-#
-## vim: syntax=syslog-ng
diff --git a/abs/mv-core/syslog-ng/syslog-ng.logrotate b/abs/mv-core/syslog-ng/syslog-ng.logrotate
deleted file mode 100644
index 3316b53..0000000
--- a/abs/mv-core/syslog-ng/syslog-ng.logrotate
+++ /dev/null
@@ -1,7 +0,0 @@
-/var/log/messages.log /var/log/auth.log /var/log/mail.log /var/log/kernel.log /var/log/errors.log /var/log/daemon.log /var/log/user.log /var/log/iptables.log /var/log/everything.log /var/log/syslog.log  {
-	missingok
-	sharedscripts
-	postrotate
-		/bin/kill -HUP `cat /var/run/syslog-ng.pid 2>/dev/null`  2> /dev/null || true
-	endscript
-}
diff --git a/abs/mv-core/syslog-ng/syslog.install b/abs/mv-core/syslog-ng/syslog.install
deleted file mode 100755
index 014edbd..0000000
--- a/abs/mv-core/syslog-ng/syslog.install
+++ /dev/null
@@ -1,56 +0,0 @@
-# This is a default template for a post-install scriptlet.  You can
-# remove any functions you don't need (and this header).
-
-# arg 1:  the new package version
-pre_install() {
-  /bin/true
-}
-
-# arg 1:  the new package version
-post_install() {
-/bin/true
-
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-pre_upgrade() {
-  /bin/true
-   mv /etc/syslog-ng.conf /etc/syslog-ng.conf.old
-
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-if [ -f /etc/systemconfig ]
-then
-. /etc/systemconfig
-. /etc/profile
-#cp /etc/syslog-ng.conf.pacnew /etc/syslog-ng.conf
-COMMAND="%s/^destination d_remote.*$/destination d_remote \{tcp\(\"${dbhost}\" port\(514\)\) \;\} \;/"
-ex /etc/syslog-ng.conf <<EOF
-:$COMMAND
-:wq
-EOF
-fi
- ln -s /usr/bin/log_care.sh /etc/cron.daily/log_care.sh
-
-/bin/true
-}
-
-
-# arg 1:  the old package version
-pre_remove() {
-  /bin/true
-
-}
-
-# arg 1:  the old package version
-post_remove() {
-  /bin/true
-}
-
-op=$1
-shift
-$op $*
diff --git a/abs/mv-core/tilda/PKGBUILD b/abs/mv-core/tilda/PKGBUILD
deleted file mode 100755
index 351f944..0000000
--- a/abs/mv-core/tilda/PKGBUILD
+++ /dev/null
@@ -1,20 +0,0 @@
-# Maintainer: William Rea <sillywilly@gmail.com>
-pkgname=tilda
-pkgver=0.9.6
-pkgrel=8
-pkgdesc="Linux terminal based on classic terminals from first person shooter games."
-url="http://tilda.sourceforge.net"
-license="GPL"
-depends=('vte' 'confuse' 'libglade')
-makedepends=('gawk')
-source=(http://downloads.sourceforge.net/sourceforge/tilda/tilda-$pkgver.tar.gz tilda.patch)
-arch=('i686')
-build() {
-
-  cd $startdir/src/tilda-$pkgver/src
-  patch -p0 < $startdir/src/tilda.patch
-  cd $startdir/src/tilda-$pkgver
-  ./configure --prefix=/usr
-  make || return 1
-  make DESTDIR=$startdir/pkg install
-}
diff --git a/abs/mv-core/tilda/__changelog b/abs/mv-core/tilda/__changelog
deleted file mode 100644
index e69de29..0000000
--- a/abs/mv-core/tilda/__changelog
+++ /dev/null
diff --git a/abs/mv-core/tilda/tilda.patch b/abs/mv-core/tilda/tilda.patch
deleted file mode 100644
index 916a020..0000000
--- a/abs/mv-core/tilda/tilda.patch
+++ /dev/null
@@ -1,25 +0,0 @@
---- tilda.c.orig	2008-02-06 21:52:53.000000000 +0000
-+++ tilda.c	2008-08-04 04:52:46.000000000 +0000
-@@ -581,11 +581,12 @@
-     /* If the config file doesn't exist open up the wizard */
-     if (access (tw->config_file, R_OK) == -1)
-     {
-+        //forget the wizard, just exit
-+        exit (EXIT_SUCCESS);
-         /* We probably need a default key, too ... */
-         gchar *default_key = g_strdup_printf ("F%d", tw->instance+1);
-         config_setstr ("key", default_key);
-         g_free (default_key);
--
-         need_wizard = TRUE;
-     }
- 
-@@ -600,6 +601,8 @@
- 
-         if (!ret)
-         {
-+        //forget the wizard, just exit
-+        exit (EXIT_SUCCESS);
-             /* The key was unbindable, so we need to show the wizard */
-             show_invalid_keybinding_dialog (NULL);
-             wizard (tw);
diff --git a/abs/mv-core/webcal/PKGBUILD b/abs/mv-core/webcal/PKGBUILD
deleted file mode 100755
index efa8237..0000000
--- a/abs/mv-core/webcal/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-pkgname=webcalendar
-pkgver=1.2.b1
-pkgrel=11
-pkgdesc="Web based calendar"
-license="GPL"
-arch=('i686')
-
-url="http://www.k5n.us/webcalendar.php"
-source=(http://voxel.dl.sourceforge.net/sourceforge/webcalendar/WebCalendar-1.2.b1.tar.gz config.php settings.php send_reminders.patch createdb.sql sendreminders.sh posix.tab)
-depends="local-website"
-install=webcal.install
-
-build() {
-cd $startdir/src
-mkdir -p  $startdir/pkg/data/srv/httpd/htdocs/webcal
-mkdir -p $startdir/pkg/usr/bin
-cp $startdir/src/sendreminders.sh $startdir/pkg/usr/bin/
-chmod 755 $startdir/pkg/usr/bin/sendreminders.sh
-
-cp -rp  WebCalendar-$pkgver/* $startdir/pkg/data/srv/httpd/htdocs/webcal
-
-cp createdb.sql $startdir/pkg/data/srv/httpd/htdocs/webcal/
-cp  config.php $startdir/pkg/data/srv/httpd/htdocs/webcal/includes
-cp  settings.php $startdir/pkg/data/srv/httpd/htdocs/webcal/includes
-cp -f posix.tab $startdir/pkg/data/srv/httpd/htdocs/webcal/includes/zone.tab
-
-cd $startdir/pkg/data/srv/httpd/htdocs/webcal/tools
-
-patch -p0 < $startdir/src/send_reminders.patch
-
-chmod 755 $startdir/pkg/data/srv/httpd/htdocs/webcal/tools/send_reminders.php
-
-
-}
-
diff --git a/abs/mv-core/webcal/config.php b/abs/mv-core/webcal/config.php
deleted file mode 100644
index d803440..0000000
--- a/abs/mv-core/webcal/config.php
+++ /dev/null
@@ -1,263 +0,0 @@
-<?php
-/* This file loads configuration settings from the data file settings.php and
- * sets up some needed variables.
- *
- * The settings.php file is created during installation using the web-based db
- * setup page (install/index.php).
- *
- * <b>Note:</b>
- * DO NOT EDIT THIS FILE!
- *
- *
- * @author Craig Knudsen <cknudsen@cknudsen.com>
- * @copyright Craig Knudsen, <cknudsen@cknudsen.com>, http://www.k5n.us/cknudsen
- * @license http://www.gnu.org/licenses/gpl.html GNU GPL
- * @version $Id: config.php,v 1.75.2.9 2008/02/17 02:21:25 cknudsen Exp $
- * @package WebCalendar
- */
-
-/* Prints a fatal error message to the user along with a link to the
- * Troubleshooting section of the WebCalendar System Administrator's Guide.
- *
- * Execution is aborted.
- *
- * @param string  $error  The error message to display
- * @internal We don't normally put functions in this file. But, since this
- *           file is included before some of the others, this function either
- *           goes here or we repeat this code in multiple files.
- *           Additionally, we don't want to call too many external functions
- *           from here since we could end up calling the function that called
- *           this one.
- * NOTES: Don't call translate from here.  This function if often called
- * before translation stuff is initialized!
- */
-function die_miserable_death ( $error ) {
-  global $APPLICATION_NAME, $LANGUAGE, $login, $TROUBLE_URL;
-  // Make sure app name is set.
-  $appStr = ( empty ( $APPLICATION_NAME ) ? 'WebCalendar' : $APPLICATION_NAME );
-
-  $h2_label = $appStr . ' ' . 'Error';
-  $title = $appStr . ': ' . 'Fatal Error';
-  $trouble_label = 'Troubleshooting Help';
-  $user_BGCOLOR = '#FFFFFF';
-
-  echo <<<EOT
-<html>
-  <head><title>{$title}</title></head>
-  <body bgcolor ="{$user_BGCOLOR}">
-    <h2>{$h2_label}</h2>
-    <p>{$error}</p><hr />
-    <p><a href="{$TROUBLE_URL}" target="_blank">{$trouble_label}</a></p>
-  </body>
-</html>
-EOT;
-  exit;
-}
-
-function db_error ( $doExit = false, $sql = '' ) {
-  global $settings;
-
-  $ret = str_replace ( 'XXX', dbi_error (), translate ( 'Database error XXX.' ) )
-   . ( ! empty ( $settings['mode'] ) && $settings['mode'] == 'dev' && !
-    empty ( $sql ) ? '<br />SQL:<br />' . $sql : '' );
-
-  if ( $doExit ) {
-    echo $ret;
-    exit;
-  } else
-    return $ret;
-}
-
-/**
-  * Get the full path to a file located in the webcalendar includes
-  * directory.
-  */
-function get_full_include_path ( $filename )
-{
-  if ( preg_match ( "/(.*)config.php/", __FILE__, $matches ) ) {
-    $fileLoc = $matches[1] . $filename;
-    return $fileLoc;
-  } else {
-    // Oops.  This file is not named config.php!
-    die_miserable_death ( "Crap!  Someone renamed config.php" );
-  }
-}
-
-function do_config ( $fileLoc ) {
-  global $db_database, $db_host, $db_login, $db_password, $db_persistent,
-  $db_type, $NONUSER_PREFIX, $phpdbiVerbose, $PROGRAM_DATE, $PROGRAM_NAME,
-  $PROGRAM_URL, $PROGRAM_VERSION, $readonly, $run_mode, $settings, $single_user,
-  $single_user_login, $TROUBLE_URL, $use_http_auth, $user_inc;
-
-  $PROGRAM_VERSION = 'v1.2.b1';
-  $PROGRAM_DATE = '25 Feb 2008';
-  $PROGRAM_NAME = 'WebCalendar ' . "$PROGRAM_VERSION ($PROGRAM_DATE)";
-  $PROGRAM_URL = 'http://www.k5n.us/webcalendar.php';
-  $TROUBLE_URL = 'docs/WebCalendar-SysAdmin.html#trouble';
-
-  // Open settings file to read.
-  $settings = array ();
-  if ( file_exists ( $fileLoc ) ) {
-    $fd = @fopen ( $fileLoc, 'rb', true );
-  }
-  if ( empty ( $fd ) && defined ( '__WC_INCLUDEDIR' ) ) {
-    $fd = @fopen ( __WC_INCLUDEDIR . '/settings.php', 'rb', true );
-    if ( $fd )
-      $fileLoc = __WC_INCLUDEDIR . '/settings.php';
-  }
-  // If still empty.... use __FILE__.
-  if ( empty ( $fd ) ) {
-    $testName = get_full_include_path ( "settings.php" );
-    $fd = @fopen ( $fileLoc, 'rb', true );
-    if ( $fd )
-      $fileLoc = $testName;
-  }
-  if ( empty ( $fd ) || filesize ( $fileLoc ) == 0 ) {
-    // There is no settings.php file.
-    // Redirect user to install page if it exists.
-    if ( file_exists ( 'install/index.php' ) ) {
-      header ( 'Location: install/index.php' );
-      exit;
-    } else
-      die_miserable_death (
-        translate ( 'Could not find settings.php file...' ) );
-  }
-
-  // We don't use fgets () since it seems to have problems with Mac-formatted
-  // text files. Instead, we read in the entire file, and split the lines manually.
-  $data = '';
-  while ( ! feof ( $fd ) ) {
-    $data .= fgets ( $fd, 4096 );
-  }
-  fclose ( $fd );
-
-  // Replace any combination of carriage return (\r) and new line (\n)
-  // with a single new line.
-  $data = preg_replace ( "/[\r\n]+/", "\n", $data );
-
-  // Split the data into lines.
-  $configLines = explode ( "\n", $data );
-
-  for ( $n = 0, $cnt = count ( $configLines ); $n < $cnt; $n++ ) {
-    $buffer = trim ( $configLines[$n], "\r\n " );
-    if ( preg_match ( '/^#|\/\*/', $buffer ) || // comments
-        preg_match ( '/^<\?/', $buffer ) || // start PHP code
-        preg_match ( '/^\?>/', $buffer ) ) // end PHP code
-      continue;
-    if ( preg_match ( '/(\S+):\s*(\S+)/', $buffer, $matches ) )
-      $settings[$matches[1]] = $matches[2];
-    // echo "settings $matches[1] => $matches[2]<br />";
-  }
-  $configLines = $data = '';
-
-  // Extract db settings into global vars.
-  $db_database = $settings['db_database'];
-  $db_host = $settings['db_host'];
-  $db_login = $settings['db_login'];
-  $db_password = $settings['db_password'];
-  $db_persistent = ( preg_match ( '/(1|yes|true|on)/i',
-      $settings['db_persistent'] ) ? '1' : '0' );
-  $db_type = $settings['db_type'];
-
-  // If no db settings, then user has likely started install but not yet
-  // completed.  So, send them back to the install script.
-  if ( empty ( $db_type ) ) {
-    if ( file_exists ( 'install/index.php' ) ) {
-      header ( 'Location: install/index.php' );
-      exit;
-    } else
-      die_miserable_death (
-        translate ( 'Incomplete settings.php file...' ) );
-  }
-
-  // Use 'db_cachedir' if found, otherwise look for 'cachedir'.
-  if ( ! empty ( $settings['db_cachedir'] ) )
-    dbi_init_cache ( $settings['db_cachedir'] );
-  else
-  if ( ! empty ( $settings['cachedir'] ) )
-    dbi_init_cache ( $settings['cachedir'] );
-
-  if ( ! empty ( $settings['db_debug'] ) &&
-      preg_match ( '/(1|true|yes|enable|on)/i', $settings['db_debug'] ) )
-    dbi_set_debug ( true );
-
-  foreach ( array ( 'db_type', 'db_host', 'db_login', 'db_password' ) as $s ) {
-    if ( empty ( $settings[$s] ) )
-      die_miserable_death ( str_replace ( 'XXX', $s,
-          translate ( 'Could not find XXX defined in...' ) ) );
-  }
-
-  // Allow special settings of 'none' in some settings[] values.
-  // This can be used for db servers not using TCP port for connection.
-  $db_host = ( $db_host == 'none' ? '' : $db_host );
-  $db_password = ( $db_password == 'none' ? '' : $db_password );
-
-  $readonly = preg_match ( '/(1|yes|true|on)/i',
-    $settings['readonly'] ) ? 'Y' : 'N';
-
-  if ( empty ( $settings['mode'] ) )
-    $settings['mode'] = 'prod';
-
-  $run_mode = ( preg_match ( '/(dev)/i', $settings['mode'] ) ? 'dev' : 'prod' );
-  $phpdbiVerbose = ( $run_mode == 'dev' ) ;
-  $single_user = preg_match ( '/(1|yes|true|on)/i',
-    $settings['single_user'] ) ? 'Y' : 'N';
-
-  if ( $single_user == 'Y' )
-    $single_user_login = $settings['single_user_login'];
-
-  if ( $single_user == 'Y' && empty ( $single_user_login ) )
-    die_miserable_death ( str_replace ( 'XXX', 'single_user_login',
-        translate ( 'You must define XXX in' ) ) );
-
-  $use_http_auth = ( preg_match ( '/(1|yes|true|on)/i',
-      $settings['use_http_auth'] ) ? true : false );
-
-  // Type of user authentication.
-  $user_inc = $settings['user_inc'];
-
-  // If sqlite, the db file is in the include directory
-  if ( $db_type == 'sqlite' )
-    $db_database = get_full_include_path ( $db_database );
-
-  // Check the current installation version.
-  // Redirect user to install page if it is different from stored value.
-  // This will prevent running WebCalendar until UPGRADING.html has been
-  // read and required upgrade actions completed.
-  $c = @dbi_connect ( $db_host, $db_login, $db_password, $db_database, false );
-  if ( $c ) {
-    $rows = dbi_get_cached_rows ( 'SELECT cal_value FROM webcal_config
-       WHERE cal_setting = \'WEBCAL_PROGRAM_VERSION\'' );
-    if ( ! $rows ) {
-      // &amp; does not work here...leave it as &.
-      header ( 'Location: install/index.php?action=mismatch&version=UNKNOWN' );
-      exit;
-    } else {
-      $row = $rows[0];
-      if ( empty ( $row ) || $row[0] != $PROGRAM_VERSION ) {
-        // &amp; does not work here...leave it as &.
-        header ( 'Location: install/index.php?action=mismatch&version='
-         . ( empty ( $row ) ? 'UNKNOWN' : $row[0] ) );
-        exit;
-      }
-    }
-    dbi_close ( $c );
-  } else { // Must mean we don't have a settings.php file.
-    // NOTE: if we get a connect error when running send_reminders.php,
-    // we may want to show that error message here.
-    // &amp; does not work here...leave it as &.
-    header ( 'Location: install/index.php?action=mismatch&version=UNKNOWN' );
-    exit;
-  }
-
-  // We can add extra 'nonuser' calendars such as a holiday, corporate,
-  // departmental, etc. We need a unique prefix for these calendars
-  // so we don't get them mixed up with real logins. This prefix should be
-  // a maximum of 5 characters and should NOT change once set!
-  $NONUSER_PREFIX = '_NUC_';
-
-  if ( $single_user != 'Y' )
-    $single_user_login = '';
-}
-
-?>
diff --git a/abs/mv-core/webcal/createdb.sql b/abs/mv-core/webcal/createdb.sql
deleted file mode 100644
index e511483..0000000
--- a/abs/mv-core/webcal/createdb.sql
+++ /dev/null
@@ -1,810 +0,0 @@
--- MySQL dump 10.11
---
--- Host: localhost    Database: webcal
--- ------------------------------------------------------
--- Server version	5.0.60
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
---
--- Table structure for table `webcal_access_function`
---
-
-DROP TABLE IF EXISTS `webcal_access_function`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `webcal_access_function` (
-  `cal_login` varchar(25) collate latin1_general_ci NOT NULL,
-  `cal_permissions` varchar(64) collate latin1_general_ci NOT NULL,
-  PRIMARY KEY  (`cal_login`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
-SET character_set_client = @saved_cs_client;
-
---
--- Dumping data for table `webcal_access_function`
---
-
-LOCK TABLES `webcal_access_function` WRITE;
-/*!40000 ALTER TABLE `webcal_access_function` DISABLE KEYS */;
-/*!40000 ALTER TABLE `webcal_access_function` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `webcal_access_user`
---
-
-DROP TABLE IF EXISTS `webcal_access_user`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `webcal_access_user` (
-  `cal_login` varchar(25) collate latin1_general_ci NOT NULL,
-  `cal_other_user` varchar(25) collate latin1_general_ci NOT NULL,
-  `cal_can_view` int(11) NOT NULL default '0',
-  `cal_can_edit` int(11) NOT NULL default '0',
-  `cal_can_approve` int(11) NOT NULL default '0',
-  `cal_can_invite` char(1) collate latin1_general_ci default 'Y',
-  `cal_can_email` char(1) collate latin1_general_ci default 'Y',
-  `cal_see_time_only` char(1) collate latin1_general_ci default 'N',
-  PRIMARY KEY  (`cal_login`,`cal_other_user`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
-SET character_set_client = @saved_cs_client;
-
---
--- Dumping data for table `webcal_access_user`
---
-
-LOCK TABLES `webcal_access_user` WRITE;
-/*!40000 ALTER TABLE `webcal_access_user` DISABLE KEYS */;
-/*!40000 ALTER TABLE `webcal_access_user` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `webcal_asst`
---
-
-DROP TABLE IF EXISTS `webcal_asst`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `webcal_asst` (
-  `cal_boss` varchar(25) collate latin1_general_ci NOT NULL,
-  `cal_assistant` varchar(25) collate latin1_general_ci NOT NULL,
-  PRIMARY KEY  (`cal_boss`,`cal_assistant`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
-SET character_set_client = @saved_cs_client;
-
---
--- Dumping data for table `webcal_asst`
---
-
-LOCK TABLES `webcal_asst` WRITE;
-/*!40000 ALTER TABLE `webcal_asst` DISABLE KEYS */;
-/*!40000 ALTER TABLE `webcal_asst` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `webcal_blob`
---
-
-DROP TABLE IF EXISTS `webcal_blob`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `webcal_blob` (
-  `cal_blob_id` int(11) NOT NULL,
-  `cal_id` int(11) default NULL,
-  `cal_login` varchar(25) collate latin1_general_ci default NULL,
-  `cal_name` varchar(30) collate latin1_general_ci default NULL,
-  `cal_description` varchar(128) collate latin1_general_ci default NULL,
-  `cal_size` int(11) default NULL,
-  `cal_mime_type` varchar(50) collate latin1_general_ci default NULL,
-  `cal_type` char(1) collate latin1_general_ci NOT NULL,
-  `cal_mod_date` int(11) NOT NULL,
-  `cal_mod_time` int(11) NOT NULL,
-  `cal_blob` longblob,
-  PRIMARY KEY  (`cal_blob_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
-SET character_set_client = @saved_cs_client;
-
---
--- Dumping data for table `webcal_blob`
---
-
-LOCK TABLES `webcal_blob` WRITE;
-/*!40000 ALTER TABLE `webcal_blob` DISABLE KEYS */;
-/*!40000 ALTER TABLE `webcal_blob` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `webcal_categories`
---
-
-DROP TABLE IF EXISTS `webcal_categories`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `webcal_categories` (
-  `cat_id` int(11) NOT NULL,
-  `cat_owner` varchar(25) collate latin1_general_ci default NULL,
-  `cat_name` varchar(80) collate latin1_general_ci NOT NULL,
-  `cat_color` varchar(8) collate latin1_general_ci default NULL,
-  PRIMARY KEY  (`cat_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
-SET character_set_client = @saved_cs_client;
-
---
--- Dumping data for table `webcal_categories`
---
-
-LOCK TABLES `webcal_categories` WRITE;
-/*!40000 ALTER TABLE `webcal_categories` DISABLE KEYS */;
-/*!40000 ALTER TABLE `webcal_categories` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `webcal_config`
---
-
-DROP TABLE IF EXISTS `webcal_config`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `webcal_config` (
-  `cal_setting` varchar(50) collate latin1_general_ci NOT NULL,
-  `cal_value` varchar(100) collate latin1_general_ci default NULL,
-  PRIMARY KEY  (`cal_setting`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
-SET character_set_client = @saved_cs_client;
-
---
--- Dumping data for table `webcal_config`
---
-
-LOCK TABLES `webcal_config` WRITE;
-/*!40000 ALTER TABLE `webcal_config` DISABLE KEYS */;
-INSERT INTO `webcal_config` VALUES ('SERVER_URL','http://vmtest/webcal/'),('APPLICATION_NAME','Title'),('ADD_LINK_IN_VIEWS','N'),('ADMIN_OVERRIDE_UAC','Y'),('ALLOW_ATTACH','N'),('ALLOW_ATTACH_ANY','N'),('ALLOW_ATTACH_PART','N'),('ALLOW_COLOR_CUSTOMIZATION','Y'),('ALLOW_COMMENTS','N'),('ALLOW_COMMENTS_ANY','N'),('ALLOW_COMMENTS_PART','N'),('ALLOW_CONFLICT_OVERRIDE','Y'),('ALLOW_CONFLICTS','N'),('ALLOW_EXTERNAL_HEADER','N'),('ALLOW_EXTERNAL_USERS','N'),('ALLOW_HTML_DESCRIPTION','Y'),('ALLOW_SELF_REGISTRATION','N'),('ALLOW_USER_HEADER','N'),('ALLOW_USER_THEMES','Y'),('ALLOW_VIEW_OTHER','Y'),('APPROVE_ASSISTANT_EVENT','Y'),('AUTO_REFRESH','N'),('AUTO_REFRESH_TIME','0'),('BGCOLOR','#FFFFFF'),('BGIMAGE',''),('BGREPEAT','repeat fixed center'),('BOLD_DAYS_IN_YEAR','Y'),('CAPTIONS','#B04040'),('CATEGORIES_ENABLED','Y'),('CELLBG','#C0C0C0'),('CONFLICT_REPEAT_MONTHS','6'),('CUSTOM_HEADER','N'),('CUSTOM_SCRIPT','N'),('CUSTOM_TRAILER','N'),('DATE_FORMAT','LANGUAGE_DEFINED'),('DATE_FORMAT_MD','LANGUAGE_DEFINED'),('DATE_FORMAT_MY','LANGUAGE_DEFINED'),('DATE_FORMAT_TASK','LANGUAGE_DEFINED'),('DEMO_MODE','N'),('DISABLE_ACCESS_FIELD','N'),('DISABLE_CROSSDAY_EVENTS','N'),('DISABLE_LOCATION_FIELD','N'),('DISABLE_PARTICIPANTS_FIELD','N'),('DISABLE_POPUPS','N'),('DISABLE_PRIORITY_FIELD','N'),('DISABLE_REMINDER_FIELD','N'),('DISABLE_REPEATING_FIELD','N'),('DISABLE_URL_FIELD','Y'),('DISPLAY_ALL_DAYS_IN_MONTH','N'),('DISPLAY_CREATED_BYPROXY','Y'),('DISPLAY_DESC_PRINT_DAY','Y'),('DISPLAY_END_TIMES','N'),('DISPLAY_LOCATION','N'),('DISPLAY_LONG_DAYS','N'),('DISPLAY_MINUTES','N'),('DISPLAY_MOON_PHASES','N'),('DISPLAY_SM_MONTH','Y'),('DISPLAY_TASKS','N'),('DISPLAY_TASKS_IN_GRID','N'),('DISPLAY_UNAPPROVED','Y'),('DISPLAY_WEEKENDS','Y'),('DISPLAY_WEEKNUMBER','Y'),('EMAIL_ASSISTANT_EVENTS','Y'),('EMAIL_EVENT_ADDED','Y'),('EMAIL_EVENT_CREATE','N'),('EMAIL_EVENT_DELETED','Y'),('EMAIL_EVENT_REJECTED','Y'),('EMAIL_EVENT_UPDATED','Y'),('EMAIL_FALLBACK_FROM','youremailhere'),('EMAIL_HTML','N'),('EMAIL_MAILER','mail'),('EMAIL_REMINDER','Y'),('ENABLE_CAPTCHA','N'),('ENABLE_GRADIENTS','N'),('ENABLE_ICON_UPLOADS','N'),('ENTRY_SLOTS','144'),('EXTERNAL_NOTIFICATIONS','N'),('EXTERNAL_REMINDERS','N'),('FONTS','Arial, Helvetica, sans-serif'),('FREEBUSY_ENABLED','N'),('GENERAL_USE_GMT','Y'),('GROUPS_ENABLED','N'),('H2COLOR','#000000'),('HASEVENTSBG','#FFFF33'),('IMPORT_CATEGORIES','Y'),('LANGUAGE','none'),('LIMIT_APPTS','N'),('LIMIT_APPTS_NUMBER','6'),('LIMIT_DESCRIPTION_SIZE','N'),('MENU_DATE_TOP','Y'),('MENU_ENABLED','Y'),('MENU_THEME','default'),('MYEVENTS','#006000'),('NONUSER_AT_TOP','Y'),('NONUSER_ENABLED','Y'),('OTHERMONTHBG','#D0D0D0'),('OVERRIDE_PUBLIC','N'),('OVERRIDE_PUBLIC_TEXT','Not available'),('PARTICIPANTS_IN_POPUP','N'),('PLUGINS_ENABLED','N'),('POPUP_BG','#FFFFFF'),('POPUP_FG','#000000'),('PUBLIC_ACCESS','N'),('PUBLIC_ACCESS_ADD_NEEDS_APPROVAL','N'),('PUBLIC_ACCESS_CAN_ADD','N'),('PUBLIC_ACCESS_DEFAULT_SELECTED','N'),('PUBLIC_ACCESS_DEFAULT_VISIBLE','N'),('PUBLIC_ACCESS_OTHERS','Y'),('PUBLIC_ACCESS_VIEW_PART','N'),('PUBLISH_ENABLED','Y'),('PULLDOWN_WEEKNUMBER','N'),('REMEMBER_LAST_LOGIN','N'),('REMINDER_DEFAULT','N'),('REMINDER_OFFSET','240'),('REMINDER_WITH_DATE','N'),('REMOTES_ENABLED','N'),('REPORTS_ENABLED','N'),('REQUIRE_APPROVALS','Y'),('RSS_ENABLED','N'),('SELF_REGISTRATION_BLACKLIST','N'),('SELF_REGISTRATION_FULL','Y'),('SEND_EMAIL','N'),('SERVER_TIMEZONE','America/New_York'),('SITE_EXTRAS_IN_POPUP','N'),('SMTP_AUTH','N'),('SMTP_HOST','localhost'),('SMTP_PASSWORD',''),('SMTP_PORT','25'),('SMTP_USERNAME',''),('STARTVIEW','month.php'),('SUMMARY_LENGTH','80'),('TABLEBG','#000000'),('TEXTCOLOR','#000000'),('THBG','#FFFFFF'),('THFG','#000000'),('TIME_FORMAT','12'),('TIME_SLOTS','24'),('TIME_SPACER','&raquo;&nbsp;'),('TIMED_EVT_LEN','D'),('TIMEZONE','America/New_York'),('TODAYCELLBG','#FFFF33'),('UAC_ENABLED','N'),('USER_PUBLISH_ENABLED','Y'),('USER_PUBLISH_RW_ENABLED','Y'),('USER_RSS_ENABLED','N'),('USER_SEES_ONLY_HIS_GROUPS','Y'),('USER_SORT_ORDER','cal_lastname, cal_firstname'),('WEBCAL_PROGRAM_VERSION','v1.2.b1'),('WEEK_START','0'),('WEEKEND_START','6'),('WEEKENDBG','#D0D0D0'),('WEEKNUMBER','#FF6633'),('WORK_DAY_END_HOUR','17'),('WORK_DAY_START_HOUR','8');
-/*!40000 ALTER TABLE `webcal_config` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `webcal_entry`
---
-
-DROP TABLE IF EXISTS `webcal_entry`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `webcal_entry` (
-  `cal_id` int(11) NOT NULL,
-  `cal_group_id` int(11) default NULL,
-  `cal_ext_for_id` int(11) default NULL,
-  `cal_create_by` varchar(25) collate latin1_general_ci NOT NULL,
-  `cal_date` int(11) NOT NULL,
-  `cal_time` int(11) default NULL,
-  `cal_mod_date` int(11) default NULL,
-  `cal_mod_time` int(11) default NULL,
-  `cal_duration` int(11) NOT NULL,
-  `cal_due_date` int(11) default NULL,
-  `cal_due_time` int(11) default NULL,
-  `cal_priority` int(11) default '5',
-  `cal_type` char(1) collate latin1_general_ci default 'E',
-  `cal_access` char(1) collate latin1_general_ci default 'P',
-  `cal_name` varchar(80) collate latin1_general_ci NOT NULL,
-  `cal_location` varchar(100) collate latin1_general_ci default NULL,
-  `cal_url` varchar(100) collate latin1_general_ci default NULL,
-  `cal_completed` int(11) default NULL,
-  `cal_description` text collate latin1_general_ci,
-  PRIMARY KEY  (`cal_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
-SET character_set_client = @saved_cs_client;
-
---
--- Dumping data for table `webcal_entry`
---
-
-LOCK TABLES `webcal_entry` WRITE;
-/*!40000 ALTER TABLE `webcal_entry` DISABLE KEYS */;
-/*!40000 ALTER TABLE `webcal_entry` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `webcal_entry_categories`
---
-
-DROP TABLE IF EXISTS `webcal_entry_categories`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `webcal_entry_categories` (
-  `cal_id` int(11) NOT NULL default '0',
-  `cat_id` int(11) NOT NULL default '0',
-  `cat_order` int(11) NOT NULL default '0',
-  `cat_owner` varchar(25) collate latin1_general_ci default NULL
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
-SET character_set_client = @saved_cs_client;
-
---
--- Dumping data for table `webcal_entry_categories`
---
-
-LOCK TABLES `webcal_entry_categories` WRITE;
-/*!40000 ALTER TABLE `webcal_entry_categories` DISABLE KEYS */;
-/*!40000 ALTER TABLE `webcal_entry_categories` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `webcal_entry_ext_user`
---
-
-DROP TABLE IF EXISTS `webcal_entry_ext_user`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `webcal_entry_ext_user` (
-  `cal_id` int(11) NOT NULL default '0',
-  `cal_fullname` varchar(50) collate latin1_general_ci NOT NULL,
-  `cal_email` varchar(75) collate latin1_general_ci default NULL,
-  PRIMARY KEY  (`cal_id`,`cal_fullname`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
-SET character_set_client = @saved_cs_client;
-
---
--- Dumping data for table `webcal_entry_ext_user`
---
-
-LOCK TABLES `webcal_entry_ext_user` WRITE;
-/*!40000 ALTER TABLE `webcal_entry_ext_user` DISABLE KEYS */;
-/*!40000 ALTER TABLE `webcal_entry_ext_user` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `webcal_entry_log`
---
-
-DROP TABLE IF EXISTS `webcal_entry_log`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `webcal_entry_log` (
-  `cal_log_id` int(11) NOT NULL,
-  `cal_entry_id` int(11) NOT NULL,
-  `cal_login` varchar(25) collate latin1_general_ci NOT NULL,
-  `cal_user_cal` varchar(25) collate latin1_general_ci default NULL,
-  `cal_type` char(1) collate latin1_general_ci NOT NULL,
-  `cal_date` int(11) NOT NULL,
-  `cal_time` int(11) default NULL,
-  `cal_text` text collate latin1_general_ci,
-  PRIMARY KEY  (`cal_log_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
-SET character_set_client = @saved_cs_client;
-
---
--- Dumping data for table `webcal_entry_log`
---
-
-LOCK TABLES `webcal_entry_log` WRITE;
-/*!40000 ALTER TABLE `webcal_entry_log` DISABLE KEYS */;
-/*!40000 ALTER TABLE `webcal_entry_log` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `webcal_entry_repeats`
---
-
-DROP TABLE IF EXISTS `webcal_entry_repeats`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `webcal_entry_repeats` (
-  `cal_id` int(11) NOT NULL default '0',
-  `cal_type` varchar(20) collate latin1_general_ci default NULL,
-  `cal_end` int(11) default NULL,
-  `cal_endtime` int(11) default NULL,
-  `cal_frequency` int(11) default '1',
-  `cal_days` char(7) collate latin1_general_ci default NULL,
-  `cal_bymonth` varchar(50) collate latin1_general_ci default NULL,
-  `cal_bymonthday` varchar(100) collate latin1_general_ci default NULL,
-  `cal_byday` varchar(100) collate latin1_general_ci default NULL,
-  `cal_bysetpos` varchar(50) collate latin1_general_ci default NULL,
-  `cal_byweekno` varchar(50) collate latin1_general_ci default NULL,
-  `cal_byyearday` varchar(50) collate latin1_general_ci default NULL,
-  `cal_wkst` char(2) collate latin1_general_ci default 'MO',
-  `cal_count` int(11) default NULL,
-  PRIMARY KEY  (`cal_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
-SET character_set_client = @saved_cs_client;
-
---
--- Dumping data for table `webcal_entry_repeats`
---
-
-LOCK TABLES `webcal_entry_repeats` WRITE;
-/*!40000 ALTER TABLE `webcal_entry_repeats` DISABLE KEYS */;
-/*!40000 ALTER TABLE `webcal_entry_repeats` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `webcal_entry_repeats_not`
---
-
-DROP TABLE IF EXISTS `webcal_entry_repeats_not`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `webcal_entry_repeats_not` (
-  `cal_id` int(11) NOT NULL,
-  `cal_date` int(11) NOT NULL,
-  `cal_exdate` int(1) NOT NULL default '1',
-  PRIMARY KEY  (`cal_id`,`cal_date`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
-SET character_set_client = @saved_cs_client;
-
---
--- Dumping data for table `webcal_entry_repeats_not`
---
-
-LOCK TABLES `webcal_entry_repeats_not` WRITE;
-/*!40000 ALTER TABLE `webcal_entry_repeats_not` DISABLE KEYS */;
-/*!40000 ALTER TABLE `webcal_entry_repeats_not` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `webcal_entry_user`
---
-
-DROP TABLE IF EXISTS `webcal_entry_user`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `webcal_entry_user` (
-  `cal_id` int(11) NOT NULL default '0',
-  `cal_login` varchar(25) collate latin1_general_ci NOT NULL,
-  `cal_status` char(1) collate latin1_general_ci default 'A',
-  `cal_category` int(11) default NULL,
-  `cal_percent` int(11) NOT NULL default '0',
-  PRIMARY KEY  (`cal_id`,`cal_login`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
-SET character_set_client = @saved_cs_client;
-
---
--- Dumping data for table `webcal_entry_user`
---
-
-LOCK TABLES `webcal_entry_user` WRITE;
-/*!40000 ALTER TABLE `webcal_entry_user` DISABLE KEYS */;
-/*!40000 ALTER TABLE `webcal_entry_user` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `webcal_group`
---
-
-DROP TABLE IF EXISTS `webcal_group`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `webcal_group` (
-  `cal_group_id` int(11) NOT NULL,
-  `cal_owner` varchar(25) collate latin1_general_ci default NULL,
-  `cal_name` varchar(50) collate latin1_general_ci NOT NULL,
-  `cal_last_update` int(11) NOT NULL,
-  PRIMARY KEY  (`cal_group_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
-SET character_set_client = @saved_cs_client;
-
---
--- Dumping data for table `webcal_group`
---
-
-LOCK TABLES `webcal_group` WRITE;
-/*!40000 ALTER TABLE `webcal_group` DISABLE KEYS */;
-/*!40000 ALTER TABLE `webcal_group` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `webcal_group_user`
---
-
-DROP TABLE IF EXISTS `webcal_group_user`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `webcal_group_user` (
-  `cal_group_id` int(11) NOT NULL,
-  `cal_login` varchar(25) collate latin1_general_ci NOT NULL,
-  PRIMARY KEY  (`cal_group_id`,`cal_login`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
-SET character_set_client = @saved_cs_client;
-
---
--- Dumping data for table `webcal_group_user`
---
-
-LOCK TABLES `webcal_group_user` WRITE;
-/*!40000 ALTER TABLE `webcal_group_user` DISABLE KEYS */;
-/*!40000 ALTER TABLE `webcal_group_user` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `webcal_import`
---
-
-DROP TABLE IF EXISTS `webcal_import`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `webcal_import` (
-  `cal_import_id` int(11) NOT NULL,
-  `cal_name` varchar(50) collate latin1_general_ci default NULL,
-  `cal_date` int(11) NOT NULL,
-  `cal_type` varchar(10) collate latin1_general_ci NOT NULL,
-  `cal_login` varchar(25) collate latin1_general_ci default NULL,
-  PRIMARY KEY  (`cal_import_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
-SET character_set_client = @saved_cs_client;
-
---
--- Dumping data for table `webcal_import`
---
-
-LOCK TABLES `webcal_import` WRITE;
-/*!40000 ALTER TABLE `webcal_import` DISABLE KEYS */;
-/*!40000 ALTER TABLE `webcal_import` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `webcal_import_data`
---
-
-DROP TABLE IF EXISTS `webcal_import_data`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `webcal_import_data` (
-  `cal_import_id` int(11) NOT NULL,
-  `cal_id` int(11) NOT NULL,
-  `cal_login` varchar(25) collate latin1_general_ci NOT NULL,
-  `cal_import_type` varchar(15) collate latin1_general_ci NOT NULL,
-  `cal_external_id` varchar(200) collate latin1_general_ci default NULL,
-  PRIMARY KEY  (`cal_id`,`cal_login`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
-SET character_set_client = @saved_cs_client;
-
---
--- Dumping data for table `webcal_import_data`
---
-
-LOCK TABLES `webcal_import_data` WRITE;
-/*!40000 ALTER TABLE `webcal_import_data` DISABLE KEYS */;
-/*!40000 ALTER TABLE `webcal_import_data` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `webcal_nonuser_cals`
---
-
-DROP TABLE IF EXISTS `webcal_nonuser_cals`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `webcal_nonuser_cals` (
-  `cal_login` varchar(25) collate latin1_general_ci NOT NULL,
-  `cal_lastname` varchar(25) collate latin1_general_ci default NULL,
-  `cal_firstname` varchar(25) collate latin1_general_ci default NULL,
-  `cal_admin` varchar(25) collate latin1_general_ci NOT NULL,
-  `cal_is_public` char(1) collate latin1_general_ci NOT NULL default 'N',
-  `cal_url` varchar(255) collate latin1_general_ci default NULL,
-  PRIMARY KEY  (`cal_login`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
-SET character_set_client = @saved_cs_client;
-
---
--- Dumping data for table `webcal_nonuser_cals`
---
-
-LOCK TABLES `webcal_nonuser_cals` WRITE;
-/*!40000 ALTER TABLE `webcal_nonuser_cals` DISABLE KEYS */;
-/*!40000 ALTER TABLE `webcal_nonuser_cals` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `webcal_reminders`
---
-
-DROP TABLE IF EXISTS `webcal_reminders`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `webcal_reminders` (
-  `cal_id` int(11) NOT NULL default '0',
-  `cal_date` int(11) NOT NULL default '0',
-  `cal_offset` int(11) NOT NULL default '0',
-  `cal_related` char(1) collate latin1_general_ci NOT NULL default 'S',
-  `cal_before` char(1) collate latin1_general_ci NOT NULL default 'Y',
-  `cal_last_sent` int(11) NOT NULL default '0',
-  `cal_repeats` int(11) NOT NULL default '0',
-  `cal_duration` int(11) NOT NULL default '0',
-  `cal_times_sent` int(11) NOT NULL default '0',
-  `cal_action` varchar(12) collate latin1_general_ci NOT NULL default 'EMAIL',
-  PRIMARY KEY  (`cal_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
-SET character_set_client = @saved_cs_client;
-
---
--- Dumping data for table `webcal_reminders`
---
-
-LOCK TABLES `webcal_reminders` WRITE;
-/*!40000 ALTER TABLE `webcal_reminders` DISABLE KEYS */;
-/*!40000 ALTER TABLE `webcal_reminders` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `webcal_report`
---
-
-DROP TABLE IF EXISTS `webcal_report`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `webcal_report` (
-  `cal_login` varchar(25) collate latin1_general_ci NOT NULL,
-  `cal_report_id` int(11) NOT NULL,
-  `cal_is_global` char(1) collate latin1_general_ci NOT NULL default 'N',
-  `cal_report_type` varchar(20) collate latin1_general_ci NOT NULL,
-  `cal_include_header` char(1) collate latin1_general_ci NOT NULL default 'Y',
-  `cal_report_name` varchar(50) collate latin1_general_ci NOT NULL,
-  `cal_time_range` int(11) NOT NULL,
-  `cal_user` varchar(25) collate latin1_general_ci default NULL,
-  `cal_allow_nav` char(1) collate latin1_general_ci default 'Y',
-  `cal_cat_id` int(11) default NULL,
-  `cal_include_empty` char(1) collate latin1_general_ci default 'N',
-  `cal_show_in_trailer` char(1) collate latin1_general_ci default 'N',
-  `cal_update_date` int(11) NOT NULL,
-  PRIMARY KEY  (`cal_report_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
-SET character_set_client = @saved_cs_client;
-
---
--- Dumping data for table `webcal_report`
---
-
-LOCK TABLES `webcal_report` WRITE;
-/*!40000 ALTER TABLE `webcal_report` DISABLE KEYS */;
-/*!40000 ALTER TABLE `webcal_report` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `webcal_report_template`
---
-
-DROP TABLE IF EXISTS `webcal_report_template`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `webcal_report_template` (
-  `cal_report_id` int(11) NOT NULL,
-  `cal_template_type` char(1) collate latin1_general_ci NOT NULL,
-  `cal_template_text` text collate latin1_general_ci,
-  PRIMARY KEY  (`cal_report_id`,`cal_template_type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
-SET character_set_client = @saved_cs_client;
-
---
--- Dumping data for table `webcal_report_template`
---
-
-LOCK TABLES `webcal_report_template` WRITE;
-/*!40000 ALTER TABLE `webcal_report_template` DISABLE KEYS */;
-/*!40000 ALTER TABLE `webcal_report_template` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `webcal_site_extras`
---
-
-DROP TABLE IF EXISTS `webcal_site_extras`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `webcal_site_extras` (
-  `cal_id` int(11) NOT NULL default '0',
-  `cal_name` varchar(25) collate latin1_general_ci NOT NULL,
-  `cal_type` int(11) NOT NULL,
-  `cal_date` int(11) default '0',
-  `cal_remind` int(11) default '0',
-  `cal_data` text collate latin1_general_ci
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
-SET character_set_client = @saved_cs_client;
-
---
--- Dumping data for table `webcal_site_extras`
---
-
-LOCK TABLES `webcal_site_extras` WRITE;
-/*!40000 ALTER TABLE `webcal_site_extras` DISABLE KEYS */;
-/*!40000 ALTER TABLE `webcal_site_extras` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `webcal_timezones`
---
-
-DROP TABLE IF EXISTS `webcal_timezones`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `webcal_timezones` (
-  `tzid` varchar(100) collate latin1_general_ci NOT NULL default '',
-  `dtstart` varchar(25) collate latin1_general_ci default NULL,
-  `dtend` varchar(25) collate latin1_general_ci default NULL,
-  `vtimezone` text collate latin1_general_ci,
-  PRIMARY KEY  (`tzid`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
-SET character_set_client = @saved_cs_client;
-
---
--- Dumping data for table `webcal_timezones`
---
-
-LOCK TABLES `webcal_timezones` WRITE;
-/*!40000 ALTER TABLE `webcal_timezones` DISABLE KEYS */;
-/*!40000 ALTER TABLE `webcal_timezones` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `webcal_user`
---
-
-DROP TABLE IF EXISTS `webcal_user`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `webcal_user` (
-  `cal_login` varchar(25) collate latin1_general_ci NOT NULL,
-  `cal_passwd` varchar(32) collate latin1_general_ci default NULL,
-  `cal_lastname` varchar(25) collate latin1_general_ci default NULL,
-  `cal_firstname` varchar(25) collate latin1_general_ci default NULL,
-  `cal_is_admin` char(1) collate latin1_general_ci default 'N',
-  `cal_email` varchar(75) collate latin1_general_ci default NULL,
-  `cal_enabled` char(1) collate latin1_general_ci default 'Y',
-  `cal_telephone` varchar(50) collate latin1_general_ci default NULL,
-  `cal_address` varchar(75) collate latin1_general_ci default NULL,
-  `cal_title` varchar(75) collate latin1_general_ci default NULL,
-  `cal_birthday` int(11) default NULL,
-  `cal_last_login` int(11) default NULL,
-  PRIMARY KEY  (`cal_login`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
-SET character_set_client = @saved_cs_client;
-
---
--- Dumping data for table `webcal_user`
---
-
-LOCK TABLES `webcal_user` WRITE;
-/*!40000 ALTER TABLE `webcal_user` DISABLE KEYS */;
-INSERT INTO `webcal_user` VALUES ('Me','318b2739ddc2c16c97b33c9b04b79f3e',NULL,NULL,'Y',NULL,'Y',NULL,NULL,NULL,NULL,NULL);
-/*!40000 ALTER TABLE `webcal_user` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `webcal_user_layers`
---
-
-DROP TABLE IF EXISTS `webcal_user_layers`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `webcal_user_layers` (
-  `cal_layerid` int(11) NOT NULL default '0',
-  `cal_login` varchar(25) collate latin1_general_ci NOT NULL,
-  `cal_layeruser` varchar(25) collate latin1_general_ci NOT NULL,
-  `cal_color` varchar(25) collate latin1_general_ci default NULL,
-  `cal_dups` char(1) collate latin1_general_ci default 'N',
-  PRIMARY KEY  (`cal_login`,`cal_layeruser`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
-SET character_set_client = @saved_cs_client;
-
---
--- Dumping data for table `webcal_user_layers`
---
-
-LOCK TABLES `webcal_user_layers` WRITE;
-/*!40000 ALTER TABLE `webcal_user_layers` DISABLE KEYS */;
-/*!40000 ALTER TABLE `webcal_user_layers` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `webcal_user_pref`
---
-
-DROP TABLE IF EXISTS `webcal_user_pref`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `webcal_user_pref` (
-  `cal_login` varchar(25) collate latin1_general_ci NOT NULL,
-  `cal_setting` varchar(25) collate latin1_general_ci NOT NULL,
-  `cal_value` varchar(100) collate latin1_general_ci default NULL,
-  PRIMARY KEY  (`cal_login`,`cal_setting`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
-SET character_set_client = @saved_cs_client;
-
---
--- Dumping data for table `webcal_user_pref`
---
-
-LOCK TABLES `webcal_user_pref` WRITE;
-/*!40000 ALTER TABLE `webcal_user_pref` DISABLE KEYS */;
-INSERT INTO `webcal_user_pref` VALUES ('Me','LANGUAGE','none'),('Me','TIMEZONE','America/New_York'),('Me','DATE_FORMAT','LANGUAGE_DEFINED'),('Me','DATE_FORMAT_MY','LANGUAGE_DEFINED'),('Me','DATE_FORMAT_MD','LANGUAGE_DEFINED'),('Me','DATE_FORMAT_TASK','LANGUAGE_DEFINED'),('Me','TIME_FORMAT','12'),('Me','WEEK_START','0'),('Me','WEEKEND_START','6'),('Me','WORK_DAY_START_HOUR','8'),('Me','WORK_DAY_END_HOUR','17'),('Me','STARTVIEW','month.php'),('Me','FONTS','Arial, Helvetica, sans-serif'),('Me','DISPLAY_SM_MONTH','N'),('Me','DISPLAY_WEEKENDS','Y'),('Me','DISPLAY_LONG_DAYS','N'),('Me','DISPLAY_MINUTES','N'),('Me','DISPLAY_END_TIMES','N'),('Me','DISPLAY_ALL_DAYS_IN_MONTH','N'),('Me','DISPLAY_WEEKNUMBER','Y'),('Me','DISPLAY_TASKS','N'),('Me','DISPLAY_TASKS_IN_GRID','N'),('Me','DISPLAY_MOON_PHASES','N'),('Me','DISPLAY_UNAPPROVED','Y'),('Me','TIMED_EVT_LEN','D'),('Me','CATEGORY_VIEW','0'),('Me','DISABLE_CROSSDAY_EVENTS','N'),('Me','DISPLAY_DESC_PRINT_DAY','Y'),('Me','ENTRY_SLOTS','144'),('Me','TIME_SLOTS','24'),('Me','AUTO_REFRESH','N'),('Me','AUTO_REFRESH_TIME','0'),('Me','THEME','none'),('Me','MENU_THEME','default'),('Me','APPROVE_ASSISTANT_EVENT','Y'),('Me','DISPLAY_CREATED_BYPROXY','Y'),('Me','USER_REMOTE_ACCESS','0'),('Me','USER_PUBLISH_ENABLED','Y'),('Me','USER_PUBLISH_RW_ENABLED','Y'),('Me','FREEBUSY_ENABLED','N'),('Me','BGCOLOR','#FFFFFF'),('Me','H2COLOR','#000000'),('Me','TEXTCOLOR','#000000'),('Me','MYEVENTS','#006000'),('Me','TABLEBG','#000000'),('Me','THBG','#FFFFFF'),('Me','THFG','#000000'),('Me','CELLBG','#C0C0C0'),('Me','TODAYCELLBG','#FFFF33'),('Me','HASEVENTSBG','#FFFF33'),('Me','WEEKENDBG','#D0D0D0'),('Me','OTHERMONTHBG','#D0D0D0'),('Me','WEEKNUMBER','#FF6633'),('Me','POPUP_BG','#FFFFFF'),('Me','POPUP_FG','#000000');
-/*!40000 ALTER TABLE `webcal_user_pref` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `webcal_user_template`
---
-
-DROP TABLE IF EXISTS `webcal_user_template`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `webcal_user_template` (
-  `cal_login` varchar(25) collate latin1_general_ci NOT NULL,
-  `cal_type` char(1) collate latin1_general_ci NOT NULL,
-  `cal_template_text` text collate latin1_general_ci,
-  PRIMARY KEY  (`cal_login`,`cal_type`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
-SET character_set_client = @saved_cs_client;
-
---
--- Dumping data for table `webcal_user_template`
---
-
-LOCK TABLES `webcal_user_template` WRITE;
-/*!40000 ALTER TABLE `webcal_user_template` DISABLE KEYS */;
-/*!40000 ALTER TABLE `webcal_user_template` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `webcal_view`
---
-
-DROP TABLE IF EXISTS `webcal_view`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `webcal_view` (
-  `cal_view_id` int(11) NOT NULL,
-  `cal_owner` varchar(25) collate latin1_general_ci NOT NULL,
-  `cal_name` varchar(50) collate latin1_general_ci NOT NULL,
-  `cal_view_type` char(1) collate latin1_general_ci default NULL,
-  `cal_is_global` char(1) collate latin1_general_ci NOT NULL default 'N',
-  PRIMARY KEY  (`cal_view_id`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
-SET character_set_client = @saved_cs_client;
-
---
--- Dumping data for table `webcal_view`
---
-
-LOCK TABLES `webcal_view` WRITE;
-/*!40000 ALTER TABLE `webcal_view` DISABLE KEYS */;
-/*!40000 ALTER TABLE `webcal_view` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `webcal_view_user`
---
-
-DROP TABLE IF EXISTS `webcal_view_user`;
-SET @saved_cs_client     = @@character_set_client;
-SET character_set_client = utf8;
-CREATE TABLE `webcal_view_user` (
-  `cal_view_id` int(11) NOT NULL,
-  `cal_login` varchar(25) collate latin1_general_ci NOT NULL,
-  PRIMARY KEY  (`cal_view_id`,`cal_login`)
-) ENGINE=MyISAM DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
-SET character_set_client = @saved_cs_client;
-
---
--- Dumping data for table `webcal_view_user`
---
-
-LOCK TABLES `webcal_view_user` WRITE;
-/*!40000 ALTER TABLE `webcal_view_user` DISABLE KEYS */;
-/*!40000 ALTER TABLE `webcal_view_user` ENABLE KEYS */;
-UNLOCK TABLES;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
--- Dump completed on 2008-08-04 17:58:18
diff --git a/abs/mv-core/webcal/posix.tab b/abs/mv-core/webcal/posix.tab
deleted file mode 100644
index ca20ef0..0000000
--- a/abs/mv-core/webcal/posix.tab
+++ /dev/null
@@ -1,586 +0,0 @@
--	 - 	
--	 - 	Europe
--	 - 	Europe/Belfast
--	 - 	Europe/Paris
--	 - 	Europe/Bratislava
--	 - 	Europe/Monaco
--	 - 	Europe/Vilnius
--	 - 	Europe/Skopje
--	 - 	Europe/Chisinau
--	 - 	Europe/Nicosia
--	 - 	Europe/Rome
--	 - 	Europe/Gibraltar
--	 - 	Europe/Sarajevo
--	 - 	Europe/Budapest
--	 - 	Europe/Moscow
--	 - 	Europe/Ljubljana
--	 - 	Europe/Copenhagen
--	 - 	Europe/London
--	 - 	Europe/Simferopol
--	 - 	Europe/Andorra
--	 - 	Europe/Guernsey
--	 - 	Europe/Volgograd
--	 - 	Europe/Mariehamn
--	 - 	Europe/Luxembourg
--	 - 	Europe/Amsterdam
--	 - 	Europe/Jersey
--	 - 	Europe/Athens
--	 - 	Europe/Oslo
--	 - 	Europe/Lisbon
--	 - 	Europe/Istanbul
--	 - 	Europe/Kiev
--	 - 	Europe/Malta
--	 - 	Europe/Helsinki
--	 - 	Europe/Kaliningrad
--	 - 	Europe/Bucharest
--	 - 	Europe/Zaporozhye
--	 - 	Europe/Madrid
--	 - 	Europe/Dublin
--	 - 	Europe/Vaduz
--	 - 	Europe/Brussels
--	 - 	Europe/Sofia
--	 - 	Europe/Riga
--	 - 	Europe/Podgorica
--	 - 	Europe/Tiraspol
--	 - 	Europe/Warsaw
--	 - 	Europe/Isle_of_Man
--	 - 	Europe/Stockholm
--	 - 	Europe/Tallinn
--	 - 	Europe/Zurich
--	 - 	Europe/Berlin
--	 - 	Europe/Tirane
--	 - 	Europe/Prague
--	 - 	Europe/Uzhgorod
--	 - 	Europe/Vienna
--	 - 	Europe/Vatican
--	 - 	Europe/Zagreb
--	 - 	Europe/Samara
--	 - 	Europe/San_Marino
--	 - 	Europe/Minsk
--	 - 	Europe/Belgrade
--	 - 	EST5EDT
--	 - 	Chile
--	 - 	Chile/EasterIsland
--	 - 	Chile/Continental
--	 - 	NZ
--	 - 	CST6CDT
--	 - 	GB
--	 - 	Etc
--	 - 	Etc/GMT+6
--	 - 	Etc/GMT-1
--	 - 	Etc/GMT-3
--	 - 	Etc/GMT-9
--	 - 	Etc/GMT0
--	 - 	Etc/GMT-8
--	 - 	Etc/GMT+1
--	 - 	Etc/GMT-12
--	 - 	Etc/Greenwich
--	 - 	Etc/GMT-0
--	 - 	Etc/GMT-11
--	 - 	Etc/GMT+5
--	 - 	Etc/Universal
--	 - 	Etc/GMT+0
--	 - 	Etc/GMT-7
--	 - 	Etc/GMT-10
--	 - 	Etc/GMT-13
--	 - 	Etc/UTC
--	 - 	Etc/GMT-14
--	 - 	Etc/UCT
--	 - 	Etc/GMT-5
--	 - 	Etc/GMT-6
--	 - 	Etc/GMT+4
--	 - 	Etc/GMT+7
--	 - 	Etc/GMT+8
--	 - 	Etc/GMT+12
--	 - 	Etc/GMT+10
--	 - 	Etc/GMT
--	 - 	Etc/GMT-2
--	 - 	Etc/GMT+9
--	 - 	Etc/GMT-4
--	 - 	Etc/GMT+2
--	 - 	Etc/GMT+3
--	 - 	Etc/GMT+11
--	 - 	Etc/Zulu
--	 - 	GMT0
--	 - 	Asia
--	 - 	Asia/Kuala_Lumpur
--	 - 	Asia/Macao
--	 - 	Asia/Dushanbe
--	 - 	Asia/Pontianak
--	 - 	Asia/Katmandu
--	 - 	Asia/Rangoon
--	 - 	Asia/Saigon
--	 - 	Asia/Oral
--	 - 	Asia/Bishkek
--	 - 	Asia/Dacca
--	 - 	Asia/Brunei
--	 - 	Asia/Baku
--	 - 	Asia/Kamchatka
--	 - 	Asia/Kuching
--	 - 	Asia/Ashgabat
--	 - 	Asia/Riyadh
--	 - 	Asia/Almaty
--	 - 	Asia/Nicosia
--	 - 	Asia/Magadan
--	 - 	Asia/Ulan_Bator
--	 - 	Asia/Omsk
--	 - 	Asia/Colombo
--	 - 	Asia/Novosibirsk
--	 - 	Asia/Manila
--	 - 	Asia/Tehran
--	 - 	Asia/Gaza
--	 - 	Asia/Hovd
--	 - 	Asia/Kashgar
--	 - 	Asia/Yerevan
--	 - 	Asia/Chungking
--	 - 	Asia/Vladivostok
--	 - 	Asia/Bahrain
--	 - 	Asia/Qatar
--	 - 	Asia/Tashkent
--	 - 	Asia/Calcutta
--	 - 	Asia/Kuwait
--	 - 	Asia/Anadyr
--	 - 	Asia/Thimphu
--	 - 	Asia/Aqtobe
--	 - 	Asia/Macau
--	 - 	Asia/Vientiane
--	 - 	Asia/Ashkhabad
--	 - 	Asia/Kolkata
--	 - 	Asia/Makassar
--	 - 	Asia/Pyongyang
--	 - 	Asia/Damascus
--	 - 	Asia/Bangkok
--	 - 	Asia/Dili
--	 - 	Asia/Kabul
--	 - 	Asia/Ho_Chi_Minh
--	 - 	Asia/Riyadh87
--	 - 	Asia/Harbin
--	 - 	Asia/Shanghai
--	 - 	Asia/Istanbul
--	 - 	Asia/Tbilisi
--	 - 	Asia/Karachi
--	 - 	Asia/Amman
--	 - 	Asia/Jakarta
--	 - 	Asia/Dhaka
--	 - 	Asia/Tel_Aviv
--	 - 	Asia/Chongqing
--	 - 	Asia/Riyadh88
--	 - 	Asia/Ujung_Pandang
--	 - 	Asia/Ulaanbaatar
--	 - 	Asia/Dubai
--	 - 	Asia/Singapore
--	 - 	Asia/Taipei
--	 - 	Asia/Jayapura
--	 - 	Asia/Thimbu
--	 - 	Asia/Qyzylorda
--	 - 	Asia/Tokyo
--	 - 	Asia/Urumqi
--	 - 	Asia/Aden
--	 - 	Asia/Hong_Kong
--	 - 	Asia/Krasnoyarsk
--	 - 	Asia/Riyadh89
--	 - 	Asia/Irkutsk
--	 - 	Asia/Sakhalin
--	 - 	Asia/Choibalsan
--	 - 	Asia/Aqtau
--	 - 	Asia/Yekaterinburg
--	 - 	Asia/Jerusalem
--	 - 	Asia/Seoul
--	 - 	Asia/Samarkand
--	 - 	Asia/Beirut
--	 - 	Asia/Muscat
--	 - 	Asia/Phnom_Penh
--	 - 	Asia/Baghdad
--	 - 	Asia/Yakutsk
--	 - 	Portugal
--	 - 	W-SU
--	 - 	Greenwich
--	 - 	Eire
--	 - 	GMT-0
--	 - 	MST7MDT
--	 - 	MET
--	 - 	EST
--	 - 	Pacific
--	 - 	Pacific/Efate
--	 - 	Pacific/Fiji
--	 - 	Pacific/Norfolk
--	 - 	Pacific/Pitcairn
--	 - 	Pacific/Noumea
--	 - 	Pacific/Enderbury
--	 - 	Pacific/Ponape
--	 - 	Pacific/Midway
--	 - 	Pacific/Niue
--	 - 	Pacific/Gambier
--	 - 	Pacific/Kosrae
--	 - 	Pacific/Wake
--	 - 	Pacific/Auckland
--	 - 	Pacific/Palau
--	 - 	Pacific/Tongatapu
--	 - 	Pacific/Apia
--	 - 	Pacific/Tahiti
--	 - 	Pacific/Truk
--	 - 	Pacific/Honolulu
--	 - 	Pacific/Chatham
--	 - 	Pacific/Galapagos
--	 - 	Pacific/Pago_Pago
--	 - 	Pacific/Guam
--	 - 	Pacific/Nauru
--	 - 	Pacific/Kwajalein
--	 - 	Pacific/Wallis
--	 - 	Pacific/Tarawa
--	 - 	Pacific/Saipan
--	 - 	Pacific/Easter
--	 - 	Pacific/Fakaofo
--	 - 	Pacific/Majuro
--	 - 	Pacific/Johnston
--	 - 	Pacific/Funafuti
--	 - 	Pacific/Samoa
--	 - 	Pacific/Guadalcanal
--	 - 	Pacific/Yap
--	 - 	Pacific/Port_Moresby
--	 - 	Pacific/Kiritimati
--	 - 	Pacific/Marquesas
--	 - 	Pacific/Rarotonga
--	 - 	Japan
--	 - 	ROC
--	 - 	Universal
--	 - 	WET
--	 - 	Navajo
--	 - 	Iran
--	 - 	Factory
--	 - 	Egypt
--	 - 	MST
--	 - 	Australia
--	 - 	Australia/Queensland
--	 - 	Australia/Lindeman
--	 - 	Australia/Broken_Hill
--	 - 	Australia/Victoria
--	 - 	Australia/Darwin
--	 - 	Australia/Hobart
--	 - 	Australia/Lord_Howe
--	 - 	Australia/North
--	 - 	Australia/ACT
--	 - 	Australia/NSW
--	 - 	Australia/West
--	 - 	Australia/Tasmania
--	 - 	Australia/LHI
--	 - 	Australia/Eucla
--	 - 	Australia/Canberra
--	 - 	Australia/Melbourne
--	 - 	Australia/South
--	 - 	Australia/Currie
--	 - 	Australia/Sydney
--	 - 	Australia/Yancowinna
--	 - 	Australia/Perth
--	 - 	Australia/Adelaide
--	 - 	Australia/Brisbane
--	 - 	EET
--	 - 	GMT+0
--	 - 	Africa
--	 - 	Africa/Tunis
--	 - 	Africa/Lome
--	 - 	Africa/Asmara
--	 - 	Africa/Harare
--	 - 	Africa/Windhoek
--	 - 	Africa/Tripoli
--	 - 	Africa/Dakar
--	 - 	Africa/Mogadishu
--	 - 	Africa/Bujumbura
--	 - 	Africa/Cairo
--	 - 	Africa/Casablanca
--	 - 	Africa/Gaborone
--	 - 	Africa/Libreville
--	 - 	Africa/Porto-Novo
--	 - 	Africa/Ouagadougou
--	 - 	Africa/Lubumbashi
--	 - 	Africa/Blantyre
--	 - 	Africa/El_Aaiun
--	 - 	Africa/Conakry
--	 - 	Africa/Djibouti
--	 - 	Africa/Kampala
--	 - 	Africa/Ndjamena
--	 - 	Africa/Maseru
--	 - 	Africa/Lusaka
--	 - 	Africa/Johannesburg
--	 - 	Africa/Nouakchott
--	 - 	Africa/Ceuta
--	 - 	Africa/Malabo
--	 - 	Africa/Sao_Tome
--	 - 	Africa/Abidjan
--	 - 	Africa/Lagos
--	 - 	Africa/Kigali
--	 - 	Africa/Asmera
--	 - 	Africa/Kinshasa
--	 - 	Africa/Monrovia
--	 - 	Africa/Banjul
--	 - 	Africa/Nairobi
--	 - 	Africa/Brazzaville
--	 - 	Africa/Timbuktu
--	 - 	Africa/Bangui
--	 - 	Africa/Bamako
--	 - 	Africa/Accra
--	 - 	Africa/Dar_es_Salaam
--	 - 	Africa/Luanda
--	 - 	Africa/Bissau
--	 - 	Africa/Douala
--	 - 	Africa/Khartoum
--	 - 	Africa/Freetown
--	 - 	Africa/Maputo
--	 - 	Africa/Niamey
--	 - 	Africa/Addis_Ababa
--	 - 	Africa/Algiers
--	 - 	Africa/Mbabane
--	 - 	Atlantic
--	 - 	Atlantic/St_Helena
--	 - 	Atlantic/Faeroe
--	 - 	Atlantic/Madeira
--	 - 	Atlantic/Bermuda
--	 - 	Atlantic/South_Georgia
--	 - 	Atlantic/Cape_Verde
--	 - 	Atlantic/Faroe
--	 - 	Atlantic/Reykjavik
--	 - 	Atlantic/Jan_Mayen
--	 - 	Atlantic/Canary
--	 - 	Atlantic/Azores
--	 - 	Atlantic/Stanley
--	 - 	Hongkong
--	 - 	Poland
--	 - 	Libya
--	 - 	UTC
--	 - 	UCT
--	 - 	Israel
--	 - 	CET
--	 - 	Brazil
--	 - 	Brazil/Acre
--	 - 	Brazil/East
--	 - 	Brazil/West
--	 - 	Brazil/DeNoronha
--	 - 	ROK
--	 - 	Singapore
--	 - 	America
--	 - 	America/Tijuana
--	 - 	America/Detroit
--	 - 	America/Noronha
--	 - 	America/Santiago
--	 - 	America/Montevideo
--	 - 	America/Panama
--	 - 	America/La_Paz
--	 - 	America/Guatemala
--	 - 	America/Boa_Vista
--	 - 	America/Costa_Rica
--	 - 	America/Resolute
--	 - 	America/Scoresbysund
--	 - 	America/Denver
--	 - 	America/Whitehorse
--	 - 	America/Kentucky
--	 - 	America/Kentucky/Louisville
--	 - 	America/Kentucky/Monticello
--	 - 	America/Pangnirtung
--	 - 	America/Yellowknife
--	 - 	America/Phoenix
--	 - 	America/Martinique
--	 - 	America/Cuiaba
--	 - 	America/Lima
--	 - 	America/Winnipeg
--	 - 	America/Menominee
--	 - 	America/St_Johns
--	 - 	America/Regina
--	 - 	America/Guayaquil
--	 - 	America/Maceio
--	 - 	America/Hermosillo
--	 - 	America/Barbados
--	 - 	America/Halifax
--	 - 	America/Asuncion
--	 - 	America/Manaus
--	 - 	America/Dominica
--	 - 	America/Catamarca
--	 - 	America/Grenada
--	 - 	America/Montserrat
--	 - 	America/Mazatlan
--	 - 	America/Recife
--	 - 	America/Rosario
--	 - 	America/Iqaluit
--	 - 	America/Porto_Acre
--	 - 	America/Managua
--	 - 	America/Antigua
--	 - 	America/Indiana
--	 - 	America/Indiana/Vevay
--	 - 	America/Indiana/Tell_City
--	 - 	America/Indiana/Winamac
--	 - 	America/Indiana/Indianapolis
--	 - 	America/Indiana/Petersburg
--	 - 	America/Indiana/Knox
--	 - 	America/Indiana/Vincennes
--	 - 	America/Indiana/Marengo
--	 - 	America/Thunder_Bay
--	 - 	America/Dawson
--	 - 	America/Yakutat
--	 - 	America/Edmonton
--	 - 	America/New_York
--	 - 	America/Tortola
--	 - 	America/Nassau
--	 - 	America/Inuvik
--	 - 	America/Atikokan
--	 - 	America/St_Kitts
--	 - 	America/Fortaleza
--	 - 	America/Ensenada
--	 - 	America/Cordoba
--	 - 	America/Araguaina
--	 - 	America/Marigot
--	 - 	America/Godthab
--	 - 	America/Rio_Branco
--	 - 	America/St_Barthelemy
--	 - 	America/Knox_IN
--	 - 	America/Indianapolis
--	 - 	America/Cambridge_Bay
--	 - 	America/St_Vincent
--	 - 	America/Anguilla
--	 - 	America/Merida
--	 - 	America/Santo_Domingo
--	 - 	America/Coral_Harbour
--	 - 	America/St_Lucia
--	 - 	America/Juneau
--	 - 	America/Chicago
--	 - 	America/Toronto
--	 - 	America/Belize
--	 - 	America/Virgin
--	 - 	America/Port_of_Spain
--	 - 	America/Boise
--	 - 	America/Adak
--	 - 	America/Cancun
--	 - 	America/Curacao
--	 - 	America/Glace_Bay
--	 - 	America/Jujuy
--	 - 	America/Fort_Wayne
--	 - 	America/Caracas
--	 - 	America/Nipigon
--	 - 	America/Louisville
--	 - 	America/Anchorage
--	 - 	America/Chihuahua
--	 - 	America/Moncton
--	 - 	America/Goose_Bay
--	 - 	America/Rankin_Inlet
--	 - 	America/Dawson_Creek
--	 - 	America/Cayman
--	 - 	America/Bogota
--	 - 	America/Montreal
--	 - 	America/Monterrey
--	 - 	America/Argentina
--	 - 	America/Argentina/ComodRivadavia
--	 - 	America/Argentina/La_Rioja
--	 - 	America/Argentina/San_Juan
--	 - 	America/Argentina/Catamarca
--	 - 	America/Argentina/Cordoba
--	 - 	America/Argentina/Jujuy
--	 - 	America/Argentina/Ushuaia
--	 - 	America/Argentina/Buenos_Aires
--	 - 	America/Argentina/Tucuman
--	 - 	America/Argentina/San_Luis
--	 - 	America/Argentina/Mendoza
--	 - 	America/Argentina/Rio_Gallegos
--	 - 	America/Puerto_Rico
--	 - 	America/El_Salvador
--	 - 	America/Port-au-Prince
--	 - 	America/Miquelon
--	 - 	America/Havana
--	 - 	America/Tegucigalpa
--	 - 	America/Sao_Paulo
--	 - 	America/Buenos_Aires
--	 - 	America/Eirunepe
--	 - 	America/Nome
--	 - 	America/Cayenne
--	 - 	America/Guadeloupe
--	 - 	America/Danmarkshavn
--	 - 	America/Aruba
--	 - 	America/Porto_Velho
--	 - 	America/Campo_Grande
--	 - 	America/Paramaribo
--	 - 	America/Los_Angeles
--	 - 	America/Atka
--	 - 	America/Rainy_River
--	 - 	America/Bahia
--	 - 	America/Jamaica
--	 - 	America/Vancouver
--	 - 	America/Guyana
--	 - 	America/Shiprock
--	 - 	America/Mexico_City
--	 - 	America/St_Thomas
--	 - 	America/Belem
--	 - 	America/Mendoza
--	 - 	America/North_Dakota
--	 - 	America/North_Dakota/Center
--	 - 	America/North_Dakota/New_Salem
--	 - 	America/Blanc-Sablon
--	 - 	America/Thule
--	 - 	America/Swift_Current
--	 - 	America/Grand_Turk
--	 - 	Kwajalein
--	 - 	Turkey
--	 - 	Cuba
--	 - 	Indian
--	 - 	Indian/Antananarivo
--	 - 	Indian/Mahe
--	 - 	Indian/Chagos
--	 - 	Indian/Mauritius
--	 - 	Indian/Kerguelen
--	 - 	Indian/Christmas
--	 - 	Indian/Maldives
--	 - 	Indian/Reunion
--	 - 	Indian/Comoro
--	 - 	Indian/Mayotte
--	 - 	Indian/Cocos
--	 - 	PST8PDT
--	 - 	US
--	 - 	US/Arizona
--	 - 	US/Eastern
--	 - 	US/Pacific
--	 - 	US/Central
--	 - 	US/East-Indiana
--	 - 	US/Indiana-Starke
--	 - 	US/Pacific-New
--	 - 	US/Mountain
--	 - 	US/Aleutian
--	 - 	US/Michigan
--	 - 	US/Hawaii
--	 - 	US/Alaska
--	 - 	US/Samoa
--	 - 	HST
--	 - 	Arctic
--	 - 	Arctic/Longyearbyen
--	 - 	GMT
--	 - 	NZ-CHAT
--	 - 	GB-Eire
--	 - 	Canada
--	 - 	Canada/Eastern
--	 - 	Canada/Pacific
--	 - 	Canada/Central
--	 - 	Canada/East-Saskatchewan
--	 - 	Canada/Atlantic
--	 - 	Canada/Mountain
--	 - 	Canada/Newfoundland
--	 - 	Canada/Saskatchewan
--	 - 	Canada/Yukon
--	 - 	posix.tab
--	 - 	Jamaica
--	 - 	Antarctica
--	 - 	Antarctica/South_Pole
--	 - 	Antarctica/Casey
--	 - 	Antarctica/Rothera
--	 - 	Antarctica/Palmer
--	 - 	Antarctica/Syowa
--	 - 	Antarctica/Davis
--	 - 	Antarctica/McMurdo
--	 - 	Antarctica/DumontDUrville
--	 - 	Antarctica/Vostok
--	 - 	Antarctica/Mawson
--	 - 	Iceland
--	 - 	Mexico
--	 - 	Mexico/General
--	 - 	Mexico/BajaNorte
--	 - 	Mexico/BajaSur
--	 - 	PRC
--	 - 	Zulu
--	 - 	Mideast
--	 - 	Mideast/Riyadh87
--	 - 	Mideast/Riyadh88
--	 - 	Mideast/Riyadh89
diff --git a/abs/mv-core/webcal/send_reminders.patch b/abs/mv-core/webcal/send_reminders.patch
deleted file mode 100644
index 9076b0c..0000000
--- a/abs/mv-core/webcal/send_reminders.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- send_reminders.php.orig	2008-08-04 18:02:14.000000000 -0500
-+++ send_reminders.php	2008-08-07 15:15:28.000000000 -0500
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/php -q
-+#!/usr/bin/php -q
- <?php
- /* $Id: send_reminders.php,v 1.81.2.8 2008/02/18 17:42:02 cknudsen Exp $
-  *
-@@ -313,6 +313,10 @@
-       translate ( 'could not find event id XXX in database.' ) ) . "\n";
-     return;
-   }
-+ //Always send via ghosd
-+    $name = $row[9];
-+    $p =  system("/usr/bin/notify.py NFO \"$name\"", $retval);
-+  
- 
-   // Send mail. We send one user at a time so that we can switch
-   // languages between users if needed (as well as HTML vs plain text).
-@@ -475,7 +479,6 @@
-     }
- 
-     $subject = translate ( 'Reminder' ) . ': ' . stripslashes ( $name );
--
-     if ( $debug )
-       echo "Sending mail to $recip (in $userlang).<br />\n";
- 
-@@ -570,7 +573,9 @@
-     }
-     // Factor in repeats if set.
-     if ( $repeats > 0 && $times_sent <= $repeats )
--      $remind_time += ( $reminder['duration'] * 60 * $times_sent );
-+      $remind_time = ($reminder['duration']*60 + $lastsent  );
-+//	Don't know what this is line is doing, but the above seems better to me
-+//      $remind_time += ( $reminder['duration'] * 60 * $times_sent );
- 
-     if ( $debug )
-       echo ( empty ( $offset_msg ) ? '' : $offset_msg . '<br />' ) . '
diff --git a/abs/mv-core/webcal/sendreminders.sh b/abs/mv-core/webcal/sendreminders.sh
deleted file mode 100644
index ac99058..0000000
--- a/abs/mv-core/webcal/sendreminders.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-. /etc/profile
-cd /data/srv/httpd/htdocs/webcal/tools
-./send_reminders.php
-
diff --git a/abs/mv-core/webcal/settings.php b/abs/mv-core/webcal/settings.php
deleted file mode 100644
index c43b705..0000000
--- a/abs/mv-core/webcal/settings.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php

-/* updated via install/index.php on Mon, 04 Aug 2008 06:44:26 -1100

-install_password: a744c6d7842ac39db07f6191e31c69ce

-db_type: mysql

-db_host: localhost

-db_database: webcal

-db_login: webcal

-db_password: webcal

-db_persistent: false

-db_cachedir: /data/srv/tmp

-readonly: false

-user_inc: user.php

-use_http_auth: false

-single_user: true

-single_user_login: Me

-mode: prod

-# end settings.php */

-?>

diff --git a/abs/mv-core/webcal/webcal.install b/abs/mv-core/webcal/webcal.install
deleted file mode 100644
index 290b8b0..0000000
--- a/abs/mv-core/webcal/webcal.install
+++ /dev/null
@@ -1,30 +0,0 @@
-post_install() {
-	mkdir /data/srv/tmp
-	chmod 777 /data/srv/tmp
-        mysql -u root -e 'create database webcal;'  
-	mysql -u root -e "GRANT ALL PRIVILEGES ON *.* TO webcal@localhost IDENTIFIED BY 'webcal' WITH GRANT OPTION;"
-	echo installing the default webcal  database
-	#install tables
-	mysql webcal  <   /data/srv/httpd/htdocs/webcal/createdb.sql
-	chown -R nobody:nobody /data/srv/httpd/htdocs/webcal/
-	chmod 775 /data/srv/httpd/htdocs/webcal/includes
-	MVDIR=/usr/bin
-	ln -s $MVDIR/sendreminders.sh  /etc/cron.tenminutes/01-sendreminders.sh
-	. /etc/systemconfig
-	mysql webcal -e "update webcal_config set cal_value="\"${timezone}\"" where cal_setting='SERVER_TIMEZONE' ;"  
-	mysql webcal -e "update webcal_config set cal_value="\"${timezone}\"" where cal_setting='TIMEZONE' ;"  
-	mysql webcal -e "update webcal_user_pref  set cal_value="\"${timezone}\"" where cal_setting='TIMEZONE' ;"  
-}
-post_upgrade() {
-	echo "nothing to do"
-chown -R nobody:nobody /data/srv/httpd/htdocs/webcal/
-	chmod 775 /data/srv/httpd/htdocs/webcal/includes
-	MVDIR=/usr/bin
-	ln -s $MVDIR/sendreminders.sh  /etc/cron.tenminutes/01-sendreminders.sh
-
-
-}
-
-op=$1 
-shift 
-$op $*