Update for latest version of TDE

master
Timothy Pearson 11 years ago
parent 1936e34443
commit 80f7740fa8

@ -8,4 +8,4 @@ KDE_ICON = remote_laboratory_client
bin_PROGRAMS = remote_laboratory_client bin_PROGRAMS = remote_laboratory_client
remote_laboratory_client_SOURCES = main.cpp remotemdi.cpp remote_laboratory_client_SOURCES = main.cpp remotemdi.cpp
remote_laboratory_client_LDADD = ./views/libinstrumentview.la ../dialogs/libselectserverdlg.la $(LIB_KPARTS) $(LIB_TDEUI) remote_laboratory_client_LDADD = ./views/libinstrumentview.la ../dialogs/libselectserverdlg.la $(LIB_KPARTS) $(LIB_TDEUI)
remote_laboratory_client_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -lkmdi -ltdekrbsocket -ltqtrla remote_laboratory_client_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdemdi -ltdekrbsocket -ltqtrla

@ -1,5 +1,24 @@
//Author: Timothy Pearson <kb9vqf@pearsoncomputing.net>, (C) 2012 /*
//Copyright: See COPYING file that comes with this distribution * Remote Laboratory Workspaces Client
*
* 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 3 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.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*
* (c) 2012-2013 Timothy Pearson
* Raptor Engineering
* http://www.raptorengineeringinc.com
*/
#include "define.h" #include "define.h"
#include <kaboutdata.h> #include <kaboutdata.h>
@ -8,19 +27,19 @@
#include <kcmdlineargs.h> #include <kcmdlineargs.h>
#include <klocale.h> #include <klocale.h>
#include <kurl.h> #include <kurl.h>
#include <kconfig.h> #include <tdeconfig.h>
#include "remotemdi.h" #include "remotemdi.h"
static const KCmdLineOptions options[] = static const TDECmdLineOptions options[] =
{ {
{ "+[server]", I18N_NOOP( "Connect to remote server 'server'" ), 0 }, { "+[server]", I18N_NOOP( "Connect to remote server 'server'" ), 0 },
{ 0, 0, 0 } { 0, 0, 0 }
}; };
static KAboutData about( static TDEAboutData about(
APP_NAME, I18N_NOOP( APP_PRETTYNAME ), APP_VERSION, APP_NAME, I18N_NOOP( APP_PRETTYNAME ), APP_VERSION,
I18N_NOOP("Graphical remote laboratory client"), KAboutData::License_GPL_V2, I18N_NOOP("Graphical Remote Laboratory Workspaces Client"), TDEAboutData::License_GPL_V2,
I18N_NOOP("(C) 2012 Timothy Pearson"), 0, I18N_NOOP("(C) 2012-2013 Timothy Pearson"), 0,
"http://remotefpga.pearsoncomputing.net/", "kb9vqf@pearsoncomputing.net" ); "http://remotefpga.pearsoncomputing.net/", "kb9vqf@pearsoncomputing.net" );
@ -28,20 +47,20 @@ int main(int argc, char *argv[])
{ {
about.addAuthor("Timothy Pearson", I18N_NOOP("Author, maintainer"), "kb9vqf@pearsoncomputing.net", "http://remotefpga.pearsoncomputing.net/"); about.addAuthor("Timothy Pearson", I18N_NOOP("Author, maintainer"), "kb9vqf@pearsoncomputing.net", "http://remotefpga.pearsoncomputing.net/");
KCmdLineArgs::init(argc, argv, &about); TDECmdLineArgs::init(argc, argv, &about);
KCmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);
KApplication app; TDEApplication app;
// Read MDI settings (window positions, etc) // Read MDI settings (window positions, etc)
// FIXME // FIXME
KConfig *c = app.config(); TDEConfig *c = app.config();
// Create main window // Create main window
RemoteMDI *mainWin = new RemoteMDI(); RemoteMDI *mainWin = new RemoteMDI();
app.setMainWidget(mainWin); app.setMainWidget(mainWin);
KCmdLineArgs* const args = KCmdLineArgs::parsedArgs(); TDECmdLineArgs* const args = TDECmdLineArgs::parsedArgs();
if (args->count() > 0) { if (args->count() > 0) {
mainWin->setServerHost(args->arg(0)); mainWin->setServerHost(args->arg(0));
} }

@ -11,7 +11,7 @@ using namespace std;
#include <kapplication.h> #include <kapplication.h>
#include <klocale.h> #include <klocale.h>
#include <kdebug.h> #include <kdebug.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <tqlabel.h> #include <tqlabel.h>
@ -20,9 +20,9 @@ using namespace std;
#include <kiconloader.h> #include <kiconloader.h>
#include <kstdaction.h> #include <kstdaction.h>
#include <kstatusbar.h> #include <kstatusbar.h>
#include <kmdichildview.h> #include <tdemdichildview.h>
#include <klistbox.h> #include <tdelistbox.h>
#include <kactionclasses.h> #include <tdeactionclasses.h>
#include <kedittoolbar.h> #include <kedittoolbar.h>
#include <kkeydialog.h> #include <kkeydialog.h>
@ -44,13 +44,13 @@ RemoteMDI::RemoteMDI()
KStdAction::close(this, SLOT(closeCurrent()), actionCollection()); KStdAction::close(this, SLOT(closeCurrent()), actionCollection());
KStdAction::quit(this, SLOT(close()), actionCollection()); KStdAction::quit(this, SLOT(close()), actionCollection());
KActionCollection *const ac = actionCollection(); TDEActionCollection *const ac = actionCollection();
setStandardToolBarMenuEnabled(true); setStandardToolBarMenuEnabled(true);
KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), ac); KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT(close()), ac);
KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configToolbars()), ac); KStdAction::configureToolbars(TQT_TQOBJECT(this), TQT_SLOT(configToolbars()), ac);
KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(configKeys()), ac); KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(configKeys()), ac);
connect_action = new KAction(i18n("Connect to Server"), "connect_creating", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(connectToServer()), ac, "connect_server"); connect_action = new TDEAction(i18n("Connect to Server"), "connect_creating", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(connectToServer()), ac, "connect_server");
disconnect_action = new KAction(i18n("Disconnect from Server"), "connect_no", KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(disconnectFromServer()), ac, "disconnect_server"); disconnect_action = new TDEAction(i18n("Disconnect from Server"), "connect_no", TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(disconnectFromServer()), ac, "disconnect_server");
setMenuForSDIModeSysButtons(menuBar()); setMenuForSDIModeSysButtons(menuBar());
@ -140,13 +140,13 @@ void RemoteMDI::resizeEvent(TQResizeEvent *e) {
void RemoteMDI::processActions() { void RemoteMDI::processActions() {
// Add dynamic actions // Add dynamic actions
KActionCollection *const ac = actionCollection(); TDEActionCollection *const ac = actionCollection();
KAction* action; TDEAction* action;
ServiceType st; ServiceType st;
for (ServiceList::Iterator it(m_activeStation.services.begin()); it != m_activeStation.services.end(); ++it) { for (ServiceList::Iterator it(m_activeStation.services.begin()); it != m_activeStation.services.end(); ++it) {
st = *it; st = *it;
action = new KAction(i18n("Launch")+" "+st.name, st.clientLibrary, KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(startModule()), ac, st.clientLibrary.ascii()); action = new TDEAction(i18n("Launch")+" "+st.name, st.clientLibrary, TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(startModule()), ac, st.clientLibrary.ascii());
m_instrumentActionList.append(action); m_instrumentActionList.append(action);
} }
plugActionList("instrumentMenu_actionlist", m_instrumentActionList); plugActionList("instrumentMenu_actionlist", m_instrumentActionList);
@ -154,7 +154,7 @@ void RemoteMDI::processActions() {
} }
void RemoteMDI::startModule() { void RemoteMDI::startModule() {
const KAction* sendingAction = dynamic_cast<const KAction*>(sender()); const TDEAction* sendingAction = dynamic_cast<const TDEAction*>(sender());
if (sendingAction) { if (sendingAction) {
bool serviceFound = false; bool serviceFound = false;
ServiceType st; ServiceType st;
@ -175,7 +175,7 @@ void RemoteMDI::startModule() {
view->setName(st.clientLibrary.ascii()); view->setName(st.clientLibrary.ascii());
connect(view, SIGNAL(statusMessageSet(const TQString&)), this, SLOT(updateStatusBarWindowMessage(const TQString&))); connect(view, SIGNAL(statusMessageSet(const TQString&)), this, SLOT(updateStatusBarWindowMessage(const TQString&)));
if (st.singleInstance) { if (st.singleInstance) {
const_cast<KAction*>(sendingAction)->setEnabled(false); const_cast<TDEAction*>(sendingAction)->setEnabled(false);
} }
openNewWindow(view); openNewWindow(view);
showViewTaskBar(); showViewTaskBar();
@ -467,7 +467,7 @@ void RemoteMDI::processLockouts() {
connect_action->setEnabled(!connected); connect_action->setEnabled(!connected);
disconnect_action->setEnabled(connected); disconnect_action->setEnabled(connected);
for (TQPtrList<KAction>::Iterator it(m_instrumentActionList.begin()); it != m_instrumentActionList.end(); ++it) { for (TQPtrList<TDEAction>::Iterator it(m_instrumentActionList.begin()); it != m_instrumentActionList.end(); ++it) {
(*it)->setEnabled(connected); (*it)->setEnabled(connected);
} }
@ -588,7 +588,7 @@ void RemoteMDI::childClosed(KMdiChildView * w) {
RemoteLab::InstrumentView* view = dynamic_cast<RemoteLab::InstrumentView*>(w); RemoteLab::InstrumentView* view = dynamic_cast<RemoteLab::InstrumentView*>(w);
if (view) { if (view) {
TQString libraryName = view->name(); TQString libraryName = view->name();
for (TQPtrList<KAction>::Iterator it(m_instrumentActionList.begin()); it != m_instrumentActionList.end(); ++it) { for (TQPtrList<TDEAction>::Iterator it(m_instrumentActionList.begin()); it != m_instrumentActionList.end(); ++it) {
if ((*it)->name() == libraryName) { if ((*it)->name() == libraryName) {
(*it)->setEnabled(true); (*it)->setEnabled(true);
} }
@ -619,7 +619,7 @@ bool RemoteMDI::queryClose() {
// Save current MDI settings (window positions, etc.) // Save current MDI settings (window positions, etc.)
// FIXME // FIXME
KConfig *c = kapp->config(); TDEConfig *c = kapp->config();
c->sync(); c->sync();

@ -9,7 +9,7 @@
#endif #endif
#include <tqvaluelist.h> #include <tqvaluelist.h>
#include <kmdimainfrm.h> #include <tdemdimainfrm.h>
#include <tdekrbclientsocket.h> #include <tdekrbclientsocket.h>
@ -89,9 +89,9 @@ class RemoteMDI : public KMdiMainFrm
TQTimer *connToServerTimeoutTimer; TQTimer *connToServerTimeoutTimer;
TQTimer *masterPollTimer; TQTimer *masterPollTimer;
KAction *connect_action; TDEAction *connect_action;
KAction *disconnect_action; TDEAction *disconnect_action;
TQPtrList<KAction> m_instrumentActionList; TQPtrList<TDEAction> m_instrumentActionList;
StationType m_activeStation; StationType m_activeStation;
}; };

@ -9,7 +9,7 @@
#include <kiconloader.h> #include <kiconloader.h>
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> #include <kmessagebox.h>
#include <kmdimainfrm.h> #include <tdemdimainfrm.h>
namespace RemoteLab { namespace RemoteLab {
@ -112,12 +112,12 @@ void InstrumentView::resizeEvent(TQResizeEvent *) {
setChildSizeData(); setChildSizeData();
} }
TQPtrList<KAction> InstrumentView::menuActionList() { TQPtrList<TDEAction> InstrumentView::menuActionList() {
if (m_instrumentPart) { if (m_instrumentPart) {
return m_instrumentPart->menuActionList(); return m_instrumentPart->menuActionList();
} }
else { else {
return TQPtrList<KAction>(); return TQPtrList<TDEAction>();
} }
} }
@ -163,10 +163,10 @@ void InstrumentView::connectServer(TQString server) {
SESSION MANAGEMENT SESSION MANAGEMENT
**********************************************/ **********************************************/
void InstrumentView::saveProperties( KConfig *config ) { void InstrumentView::saveProperties( TDEConfig *config ) {
} }
void InstrumentView::readProperties( KConfig *config ) { void InstrumentView::readProperties( TDEConfig *config ) {
} }
} //namespace RemoteLab } //namespace RemoteLab

@ -4,13 +4,13 @@
#ifndef INSTRUMENTVIEW_H #ifndef INSTRUMENTVIEW_H
#define INSTRUMENTVIEW_H #define INSTRUMENTVIEW_H
#include <kconfig.h> #include <tdeconfig.h>
#include <kparts/part.h> #include <tdeparts/part.h>
#include <kmdichildview.h> #include <tdemdichildview.h>
#include <tqtrla.h> #include <tqtrla.h>
class KAction; class TDEAction;
namespace RemoteLab { namespace RemoteLab {
@ -27,11 +27,11 @@ class InstrumentView : public KMdiChildView
void connectServer(TQString server); void connectServer(TQString server);
void closeConnections(); void closeConnections();
TQPtrList<KAction> menuActionList(); TQPtrList<TDEAction> menuActionList();
protected: protected:
virtual void saveProperties(KConfig *); virtual void saveProperties(TDEConfig *);
virtual void readProperties(KConfig *); virtual void readProperties(TDEConfig *);
virtual bool queryExit(); virtual bool queryExit();
virtual void resizeEvent(TQResizeEvent *); virtual void resizeEvent(TQResizeEvent *);
virtual bool eventFilter(TQObject *o, TQEvent *e); virtual bool eventFilter(TQObject *o, TQEvent *e);

@ -41,7 +41,7 @@
<string>Please select the type of laboratory workspace you wish to use</string> <string>Please select the type of laboratory workspace you wish to use</string>
</property> </property>
</widget> </widget>
<widget class="KListView" row="2" column="0" colspan="3"> <widget class="TDEListView" row="2" column="0" colspan="3">
<column> <column>
<property name="text"> <property name="text">
<string>Workspace Services</string> <string>Workspace Services</string>

@ -7,5 +7,5 @@ KDE_ICON = libremotelab_adminconsole
# Part # Part
kde_module_LTLIBRARIES = libremotelab_adminconsole.la kde_module_LTLIBRARIES = libremotelab_adminconsole.la
libremotelab_adminconsole_la_LIBADD = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_TDEUI) $(LIB_QT) -ltdekrbsocket -ltqtrla libremotelab_adminconsole_la_LIBADD = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_TDEUI) $(LIB_QT) -ltdekrbsocket -ltqtrla
libremotelab_adminconsole_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -lkio -ltdefx libremotelab_adminconsole_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -ltdeio -ltdefx
libremotelab_adminconsole_la_SOURCES = part.cpp layout.ui terminatedlg.cpp terminatedlgbase.ui libremotelab_adminconsole_la_SOURCES = part.cpp layout.ui terminatedlg.cpp terminatedlgbase.ui

@ -34,7 +34,7 @@
<property name="orientation"> <property name="orientation">
<enum>Vertical</enum> <enum>Vertical</enum>
</property> </property>
<widget class="KListView" row="1" column="0" colspan="4"> <widget class="TDEListView" row="1" column="0" colspan="4">
<column> <column>
<property name="text"> <property name="text">
<string>Session ID</string> <string>Session ID</string>
@ -196,7 +196,7 @@
<property name="orientation"> <property name="orientation">
<enum>Vertical</enum> <enum>Vertical</enum>
</property> </property>
<widget class="KListView" row="1" column="0" colspan="4"> <widget class="TDEListView" row="1" column="0" colspan="4">
<column> <column>
<property name="text"> <property name="text">
<string>Session ID</string> <string>Session ID</string>

@ -24,12 +24,12 @@
#include "part.h" #include "part.h"
#include <kaboutdata.h> //::createAboutData() #include <kaboutdata.h> //::createAboutData()
#include <kaction.h> #include <tdeaction.h>
#include <klocale.h> #include <klocale.h>
#include <ktextedit.h> #include <ktextedit.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kmessagebox.h> //::start() #include <kmessagebox.h> //::start()
#include <kparts/genericfactory.h> #include <tdeparts/genericfactory.h>
#include <kstatusbar.h> #include <kstatusbar.h>
#include <kstdaction.h> #include <kstdaction.h>
#include <knuminput.h> #include <knuminput.h>
@ -47,7 +47,7 @@
#include <tqpushbutton.h> #include <tqpushbutton.h>
#include <tqprogressbar.h> #include <tqprogressbar.h>
#include <tqlistview.h> #include <tqlistview.h>
#include <klistview.h> #include <tdelistview.h>
#include <unistd.h> //access() #include <unistd.h> //access()
#include <stdint.h> #include <stdint.h>
@ -630,8 +630,8 @@ void AdminConsolePart::mainEventLoop() {
m_connectionMutex->unlock(); m_connectionMutex->unlock();
} }
KAboutData* AdminConsolePart::createAboutData() { TDEAboutData* AdminConsolePart::createAboutData() {
return new KAboutData( APP_NAME, I18N_NOOP( APP_PRETTYNAME ), APP_VERSION ); return new TDEAboutData( APP_NAME, I18N_NOOP( APP_PRETTYNAME ), APP_VERSION );
} }
} //namespace RemoteLab } //namespace RemoteLab

@ -29,15 +29,15 @@
#include <tqframe.h> #include <tqframe.h>
#include <tqimage.h> #include <tqimage.h>
#include <kparts/browserextension.h> #include <tdeparts/browserextension.h>
#include <kparts/statusbarextension.h> #include <tdeparts/statusbarextension.h>
#include <kparts/part.h> #include <tdeparts/part.h>
#include <kurl.h> #include <kurl.h>
#include <kled.h> #include <kled.h>
#include <tqtrla.h> #include <tqtrla.h>
class KAboutData; class TDEAboutData;
using KParts::StatusBarExtension; using KParts::StatusBarExtension;
class TraceWidget; class TraceWidget;
class TQSocket; class TQSocket;
@ -58,7 +58,7 @@ namespace RemoteLab
virtual bool openFile() { return false; } // pure virtual in the base class virtual bool openFile() { return false; } // pure virtual in the base class
virtual bool closeURL(); virtual bool closeURL();
static KAboutData *createAboutData(); static TDEAboutData *createAboutData();
public slots: public slots:
virtual bool openURL(const KURL &url); virtual bool openURL(const KURL &url);

@ -22,13 +22,13 @@
#include <klineedit.h> #include <klineedit.h>
#include <ktextedit.h> #include <ktextedit.h>
#include <knuminput.h> #include <knuminput.h>
#include <kactionselector.h> #include <tdeactionselector.h>
#include <tqlistbox.h> #include <tqlistbox.h>
#include <kpushbutton.h> #include <kpushbutton.h>
#include <tqpixmap.h> #include <tqpixmap.h>
#include <tqiconset.h> #include <tqiconset.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <tqradiobutton.h> #include <tqradiobutton.h>

@ -7,5 +7,5 @@ KDE_ICON = libremotelab_adminusermgmt
# Part # Part
kde_module_LTLIBRARIES = libremotelab_adminusermgmt.la kde_module_LTLIBRARIES = libremotelab_adminusermgmt.la
libremotelab_adminusermgmt_la_LIBADD = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_TDEUI) $(LIB_QT) -ltdekrbsocket -ltqtrla libremotelab_adminusermgmt_la_LIBADD = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_TDEUI) $(LIB_QT) -ltdekrbsocket -ltqtrla
libremotelab_adminusermgmt_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -lkio -ltdefx libremotelab_adminusermgmt_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -ltdeio -ltdefx
libremotelab_adminusermgmt_la_SOURCES = part.cpp layout.ui groupauthdlg.cpp groupauthdlgbase.ui libremotelab_adminusermgmt_la_SOURCES = part.cpp layout.ui groupauthdlg.cpp groupauthdlgbase.ui

@ -22,14 +22,14 @@
#include <klineedit.h> #include <klineedit.h>
#include <ktextedit.h> #include <ktextedit.h>
#include <knuminput.h> #include <knuminput.h>
#include <kactionselector.h> #include <tdeactionselector.h>
#include <tqlistbox.h> #include <tqlistbox.h>
#include <kpushbutton.h> #include <kpushbutton.h>
#include <tqpixmap.h> #include <tqpixmap.h>
#include <tqiconset.h> #include <tqiconset.h>
#include <tqlabel.h> #include <tqlabel.h>
#include <tqgroupbox.h> #include <tqgroupbox.h>
#include <kconfig.h> #include <tdeconfig.h>
#include <tqcheckbox.h> #include <tqcheckbox.h>
#include <tqradiobutton.h> #include <tqradiobutton.h>

@ -71,7 +71,7 @@
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
</property> </property>
<widget class="KActionSelector" row="0" column="0"> <widget class="TDEActionSelector" row="0" column="0">
<property name="name"> <property name="name">
<cstring>permissionsSelector</cstring> <cstring>permissionsSelector</cstring>
</property> </property>

@ -34,7 +34,7 @@
<property name="orientation"> <property name="orientation">
<enum>Vertical</enum> <enum>Vertical</enum>
</property> </property>
<widget class="KListView" row="1" column="0" colspan="4"> <widget class="TDEListView" row="1" column="0" colspan="4">
<column> <column>
<property name="text"> <property name="text">
<string>Group Name</string> <string>Group Name</string>
@ -157,7 +157,7 @@
<property name="orientation"> <property name="orientation">
<enum>Vertical</enum> <enum>Vertical</enum>
</property> </property>
<widget class="KListView" row="1" column="0" colspan="4"> <widget class="TDEListView" row="1" column="0" colspan="4">
<column> <column>
<property name="text"> <property name="text">
<string>Group Name</string> <string>Group Name</string>

@ -24,12 +24,12 @@
#include "part.h" #include "part.h"
#include <kaboutdata.h> //::createAboutData() #include <kaboutdata.h> //::createAboutData()
#include <kaction.h> #include <tdeaction.h>
#include <klocale.h> #include <klocale.h>
#include <ktextedit.h> #include <ktextedit.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kmessagebox.h> //::start() #include <kmessagebox.h> //::start()
#include <kparts/genericfactory.h> #include <tdeparts/genericfactory.h>
#include <kstatusbar.h> #include <kstatusbar.h>
#include <kstdaction.h> #include <kstdaction.h>
#include <knuminput.h> #include <knuminput.h>
@ -47,7 +47,7 @@
#include <tqpushbutton.h> #include <tqpushbutton.h>
#include <tqprogressbar.h> #include <tqprogressbar.h>
#include <tqlistview.h> #include <tqlistview.h>
#include <klistview.h> #include <tdelistview.h>
#include <unistd.h> //access() #include <unistd.h> //access()
#include <stdint.h> #include <stdint.h>
@ -878,8 +878,8 @@ void UserManagementPart::mainEventLoop() {
m_connectionMutex->unlock(); m_connectionMutex->unlock();
} }
KAboutData* UserManagementPart::createAboutData() { TDEAboutData* UserManagementPart::createAboutData() {
return new KAboutData( APP_NAME, I18N_NOOP( APP_PRETTYNAME ), APP_VERSION ); return new TDEAboutData( APP_NAME, I18N_NOOP( APP_PRETTYNAME ), APP_VERSION );
} }
} //namespace RemoteLab } //namespace RemoteLab

@ -29,15 +29,15 @@
#include <tqframe.h> #include <tqframe.h>
#include <tqimage.h> #include <tqimage.h>
#include <kparts/browserextension.h> #include <tdeparts/browserextension.h>
#include <kparts/statusbarextension.h> #include <tdeparts/statusbarextension.h>
#include <kparts/part.h> #include <tdeparts/part.h>
#include <kurl.h> #include <kurl.h>
#include <kled.h> #include <kled.h>
#include <tqtrla.h> #include <tqtrla.h>
class KAboutData; class TDEAboutData;
using KParts::StatusBarExtension; using KParts::StatusBarExtension;
class TraceWidget; class TraceWidget;
class TQSocket; class TQSocket;
@ -58,7 +58,7 @@ namespace RemoteLab
virtual bool openFile() { return false; } // pure virtual in the base class virtual bool openFile() { return false; } // pure virtual in the base class
virtual bool closeURL(); virtual bool closeURL();
static KAboutData *createAboutData(); static TDEAboutData *createAboutData();
public slots: public slots:
virtual bool openURL(const KURL &url); virtual bool openURL(const KURL &url);

@ -7,6 +7,6 @@ KDE_ICON = libremotelab_commanalyzer
#Part #Part
kde_module_LTLIBRARIES = libremotelab_commanalyzer.la kde_module_LTLIBRARIES = libremotelab_commanalyzer.la
libremotelab_commanalyzer_la_LIBADD = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_TDEUI) $(LIB_QT) libremotelab_commanalyzer_la_LIBADD = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_TDEUI) $(LIB_QT)
libremotelab_commanalyzer_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui -lkio -ltdefx -ltdekrbsocket -ltqtrla libremotelab_commanalyzer_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui -ltdeio -ltdefx -ltdekrbsocket -ltqtrla
libremotelab_commanalyzer_la_SOURCES = \ libremotelab_commanalyzer_la_SOURCES = \
part.cpp layout.ui part.cpp layout.ui

@ -5,10 +5,10 @@
#include "part.h" #include "part.h"
#include <kaboutdata.h> //::createAboutData() #include <kaboutdata.h> //::createAboutData()
#include <kaction.h> #include <tdeaction.h>
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> //::start() #include <kmessagebox.h> //::start()
#include <kparts/genericfactory.h> #include <tdeparts/genericfactory.h>
#include <kstatusbar.h> #include <kstatusbar.h>
#include <kstdaction.h> #include <kstdaction.h>
#include <tqfile.h> //encodeName() #include <tqfile.h> //encodeName()
@ -760,8 +760,8 @@ void CommAnalyzerPart::saRefLevelChanged(double newval) {
} }
} }
KAboutData* CommAnalyzerPart::createAboutData() { TDEAboutData* CommAnalyzerPart::createAboutData() {
return new KAboutData( APP_NAME, I18N_NOOP( APP_PRETTYNAME ), APP_VERSION ); return new TDEAboutData( APP_NAME, I18N_NOOP( APP_PRETTYNAME ), APP_VERSION );
} }
} //namespace RemoteLab } //namespace RemoteLab

@ -4,14 +4,14 @@
#ifndef REMOTELAB_COMMANALYZERPART_H #ifndef REMOTELAB_COMMANALYZERPART_H
#define REMOTELAB_COMMANALYZERPART_H #define REMOTELAB_COMMANALYZERPART_H
#include <kparts/browserextension.h> #include <tdeparts/browserextension.h>
#include <kparts/statusbarextension.h> #include <tdeparts/statusbarextension.h>
#include <kparts/part.h> #include <tdeparts/part.h>
#include <kurl.h> #include <kurl.h>
#include <tqtrla.h> #include <tqtrla.h>
class KAboutData; class TDEAboutData;
using KParts::StatusBarExtension; using KParts::StatusBarExtension;
class TraceWidget; class TraceWidget;
class TQSocket; class TQSocket;
@ -32,7 +32,7 @@ namespace RemoteLab
virtual bool openFile() { return false; } // pure virtual in the base class virtual bool openFile() { return false; } // pure virtual in the base class
virtual bool closeURL(); virtual bool closeURL();
static KAboutData *createAboutData(); static TDEAboutData *createAboutData();
public slots: public slots:
virtual bool openURL(const KURL &url); virtual bool openURL(const KURL &url);

@ -7,5 +7,5 @@ KDE_ICON = libremotelab_fpgaprogrammer
# Part # Part
kde_module_LTLIBRARIES = libremotelab_fpgaprogrammer.la kde_module_LTLIBRARIES = libremotelab_fpgaprogrammer.la
libremotelab_fpgaprogrammer_la_LIBADD = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_TDEUI) $(LIB_QT) -ltdekrbsocket -ltqtrla libremotelab_fpgaprogrammer_la_LIBADD = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_TDEUI) $(LIB_QT) -ltdekrbsocket -ltqtrla
libremotelab_fpgaprogrammer_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -lkio -ltdefx libremotelab_fpgaprogrammer_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -ltdeio -ltdefx
libremotelab_fpgaprogrammer_la_SOURCES = part.cpp layout.ui libremotelab_fpgaprogrammer_la_SOURCES = part.cpp layout.ui

@ -15,7 +15,7 @@
* with this program; if not, write to the Free Software Foundation, Inc., * with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
* *
* (c) 2012 Timothy Pearson * (c) 2012-2013 Timothy Pearson
* Raptor Engineering * Raptor Engineering
* http://www.raptorengineeringinc.com * http://www.raptorengineeringinc.com
*/ */
@ -24,12 +24,12 @@
#include "part.h" #include "part.h"
#include <kaboutdata.h> //::createAboutData() #include <kaboutdata.h> //::createAboutData()
#include <kaction.h> #include <tdeaction.h>
#include <klocale.h> #include <klocale.h>
#include <ktextedit.h> #include <ktextedit.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kmessagebox.h> //::start() #include <kmessagebox.h> //::start()
#include <kparts/genericfactory.h> #include <tdeparts/genericfactory.h>
#include <kstatusbar.h> #include <kstatusbar.h>
#include <kstdaction.h> #include <kstdaction.h>
#include <knuminput.h> #include <knuminput.h>
@ -526,8 +526,8 @@ void FPGAProgramPart::mainEventLoop() {
m_connectionMutex->unlock(); m_connectionMutex->unlock();
} }
KAboutData* FPGAProgramPart::createAboutData() { TDEAboutData* FPGAProgramPart::createAboutData() {
return new KAboutData( APP_NAME, I18N_NOOP( APP_PRETTYNAME ), APP_VERSION ); return new TDEAboutData( APP_NAME, I18N_NOOP( APP_PRETTYNAME ), APP_VERSION );
} }
} //namespace RemoteLab } //namespace RemoteLab

@ -29,15 +29,15 @@
#include <tqframe.h> #include <tqframe.h>
#include <tqimage.h> #include <tqimage.h>
#include <kparts/browserextension.h> #include <tdeparts/browserextension.h>
#include <kparts/statusbarextension.h> #include <tdeparts/statusbarextension.h>
#include <kparts/part.h> #include <tdeparts/part.h>
#include <kurl.h> #include <kurl.h>
#include <kled.h> #include <kled.h>
#include <tqtrla.h> #include <tqtrla.h>
class KAboutData; class TDEAboutData;
using KParts::StatusBarExtension; using KParts::StatusBarExtension;
class TraceWidget; class TraceWidget;
class TQSocket; class TQSocket;
@ -58,7 +58,7 @@ namespace RemoteLab
virtual bool openFile() { return false; } // pure virtual in the base class virtual bool openFile() { return false; } // pure virtual in the base class
virtual bool closeURL(); virtual bool closeURL();
static KAboutData *createAboutData(); static TDEAboutData *createAboutData();
public slots: public slots:
virtual bool openURL(const KURL &url); virtual bool openURL(const KURL &url);

@ -7,5 +7,5 @@ KDE_ICON = libremotelab_fpgaviewer
# Part # Part
kde_module_LTLIBRARIES = libremotelab_fpgaviewer.la kde_module_LTLIBRARIES = libremotelab_fpgaviewer.la
libremotelab_fpgaviewer_la_LIBADD = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_TDEUI) $(LIB_QT) -ltdekrbsocket -ltqtrla libremotelab_fpgaviewer_la_LIBADD = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_TDEUI) $(LIB_QT) -ltdekrbsocket -ltqtrla
libremotelab_fpgaviewer_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -lkio -ltdefx -lkmdi libremotelab_fpgaviewer_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -ltdeio -ltdefx -ltdemdi
libremotelab_fpgaviewer_la_SOURCES = part.cpp layout.ui libremotelab_fpgaviewer_la_SOURCES = part.cpp layout.ui

@ -24,11 +24,11 @@
#include "part.h" #include "part.h"
#include <kaboutdata.h> //::createAboutData() #include <kaboutdata.h> //::createAboutData()
#include <kaction.h> #include <tdeaction.h>
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> //::start() #include <kmessagebox.h> //::start()
#include <kparts/genericfactory.h> #include <tdeparts/genericfactory.h>
#include <kmdimainfrm.h> #include <tdemdimainfrm.h>
#include <kstatusbar.h> #include <kstatusbar.h>
#include <kstdaction.h> #include <kstdaction.h>
#include <knuminput.h> #include <knuminput.h>
@ -604,15 +604,15 @@ FPGAViewPart::FPGAViewPart(TQWidget *parentWidget, const char *widgetName, TQObj
// Create menu actions // Create menu actions
// Submenus // Submenus
KActionCollection *const ac = actionCollection(); TDEActionCollection *const ac = actionCollection();
m_modeSubMenu = new KActionMenu(i18n("Mode"), ac, "mode_submenu"); m_modeSubMenu = new TDEActionMenu(i18n("Mode"), ac, "mode_submenu");
m_menuActionList.append(m_modeSubMenu); m_menuActionList.append(m_modeSubMenu);
// Menu items // Menu items
m_modeBasicEnabled = new KToggleAction(i18n("Basic"), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(switchToBasicMode()), ac, "mode_basic_enabled"); m_modeBasicEnabled = new TDEToggleAction(i18n("Basic"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(switchToBasicMode()), ac, "mode_basic_enabled");
m_modeSubMenu->insert(m_modeBasicEnabled); m_modeSubMenu->insert(m_modeBasicEnabled);
m_modeIntermediateEnabled = new KToggleAction(i18n("Intermediate"), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(switchToIntermediateMode()), ac, "mode_intermediate_enabled"); m_modeIntermediateEnabled = new TDEToggleAction(i18n("Intermediate"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(switchToIntermediateMode()), ac, "mode_intermediate_enabled");
m_modeSubMenu->insert(m_modeIntermediateEnabled); m_modeSubMenu->insert(m_modeIntermediateEnabled);
m_modeAdvancedEnabled = new KToggleAction(i18n("Advanced"), KShortcut(), TQT_TQOBJECT(this), TQT_SLOT(switchToAdvancedMode()), ac, "mode_advanced_enabled"); m_modeAdvancedEnabled = new TDEToggleAction(i18n("Advanced"), TDEShortcut(), TQT_TQOBJECT(this), TQT_SLOT(switchToAdvancedMode()), ac, "mode_advanced_enabled");
m_modeSubMenu->insert(m_modeAdvancedEnabled); m_modeSubMenu->insert(m_modeAdvancedEnabled);
// Initialize widgets // Initialize widgets
@ -1071,7 +1071,7 @@ void FPGAViewPart::connectionStatusChangedCallback() {
processLockouts(); processLockouts();
} }
TQPtrList<KAction> FPGAViewPart::menuActionList() { TQPtrList<TDEAction> FPGAViewPart::menuActionList() {
return m_menuActionList; return m_menuActionList;
} }
@ -1510,8 +1510,8 @@ void FPGAViewPart::updateDisplay() {
} }
} }
KAboutData* FPGAViewPart::createAboutData() { TDEAboutData* FPGAViewPart::createAboutData() {
return new KAboutData( APP_NAME, I18N_NOOP( APP_PRETTYNAME ), APP_VERSION ); return new TDEAboutData( APP_NAME, I18N_NOOP( APP_PRETTYNAME ), APP_VERSION );
} }
} //namespace RemoteLab } //namespace RemoteLab

@ -29,17 +29,17 @@
#include <tqframe.h> #include <tqframe.h>
#include <tqimage.h> #include <tqimage.h>
#include <kparts/browserextension.h> #include <tdeparts/browserextension.h>
#include <kparts/statusbarextension.h> #include <tdeparts/statusbarextension.h>
#include <kparts/part.h> #include <tdeparts/part.h>
#include <kurl.h> #include <kurl.h>
#include <kled.h> #include <kled.h>
#include <kmdichildview.h> #include <tdemdichildview.h>
#include <tqtrla.h> #include <tqtrla.h>
class KAboutData; class TDEAboutData;
using KParts::StatusBarExtension; using KParts::StatusBarExtension;
class TraceWidget; class TraceWidget;
class TQSocket; class TQSocket;
@ -163,8 +163,8 @@ namespace RemoteLab
virtual bool openFile() { return false; } // pure virtual in the base class virtual bool openFile() { return false; } // pure virtual in the base class
virtual bool closeURL(); virtual bool closeURL();
static KAboutData *createAboutData(); static TDEAboutData *createAboutData();
virtual TQPtrList<KAction> menuActionList(); virtual TQPtrList<TDEAction> menuActionList();
public slots: public slots:
virtual bool openURL(const KURL &url); virtual bool openURL(const KURL &url);
@ -204,11 +204,11 @@ namespace RemoteLab
TQMutex* m_connectionMutex; TQMutex* m_connectionMutex;
TQTimer* m_updateTimer; TQTimer* m_updateTimer;
TQPtrList<KAction> m_menuActionList; TQPtrList<TDEAction> m_menuActionList;
KActionMenu* m_modeSubMenu; TDEActionMenu* m_modeSubMenu;
KToggleAction* m_modeBasicEnabled; TDEToggleAction* m_modeBasicEnabled;
KToggleAction* m_modeIntermediateEnabled; TDEToggleAction* m_modeIntermediateEnabled;
KToggleAction* m_modeAdvancedEnabled; TDEToggleAction* m_modeAdvancedEnabled;
InterfaceMode m_interfaceMode; InterfaceMode m_interfaceMode;

@ -7,6 +7,6 @@ KDE_ICON = libremotelab_scope
#Part #Part
kde_module_LTLIBRARIES = libremotelab_scope.la kde_module_LTLIBRARIES = libremotelab_scope.la
libremotelab_scope_la_LIBADD = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_TDEUI) $(LIB_QT) libremotelab_scope_la_LIBADD = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_TDEUI) $(LIB_QT)
libremotelab_scope_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui -lkio -ltdefx -ltdekrbsocket -ltqtrla libremotelab_scope_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -ltdecore -ltdeui -ltdeio -ltdefx -ltdekrbsocket -ltqtrla
libremotelab_scope_la_SOURCES = \ libremotelab_scope_la_SOURCES = \
part.cpp layout.ui part.cpp layout.ui

@ -5,11 +5,11 @@
#include "part.h" #include "part.h"
#include <kaboutdata.h> //::createAboutData() #include <kaboutdata.h> //::createAboutData()
#include <kaction.h> #include <tdeaction.h>
#include <klocale.h> #include <klocale.h>
#include <kmessagebox.h> //::start() #include <kmessagebox.h> //::start()
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kparts/genericfactory.h> #include <tdeparts/genericfactory.h>
#include <kstatusbar.h> #include <kstatusbar.h>
#include <kstdaction.h> #include <kstdaction.h>
#include <tqfile.h> //encodeName() #include <tqfile.h> //encodeName()
@ -1566,8 +1566,8 @@ void ScopePart::stopScope() {
m_runningSet = true; m_runningSet = true;
} }
KAboutData* ScopePart::createAboutData() { TDEAboutData* ScopePart::createAboutData() {
return new KAboutData( APP_NAME, I18N_NOOP( APP_PRETTYNAME ), APP_VERSION ); return new TDEAboutData( APP_NAME, I18N_NOOP( APP_PRETTYNAME ), APP_VERSION );
} }
} //namespace RemoteLab } //namespace RemoteLab

@ -4,16 +4,16 @@
#ifndef REMOTELAB_SCOPEPART_H #ifndef REMOTELAB_SCOPEPART_H
#define REMOTELAB_SCOPEPART_H #define REMOTELAB_SCOPEPART_H
#include <kparts/browserextension.h> #include <tdeparts/browserextension.h>
#include <kparts/statusbarextension.h> #include <tdeparts/statusbarextension.h>
#include <kparts/part.h> #include <tdeparts/part.h>
#include <kurl.h> #include <kurl.h>
#include <tqtrla.h> #include <tqtrla.h>
#define MAXTRACES 255 #define MAXTRACES 255
class KAboutData; class TDEAboutData;
using KParts::StatusBarExtension; using KParts::StatusBarExtension;
class TraceWidget; class TraceWidget;
class TQSocket; class TQSocket;
@ -68,7 +68,7 @@ namespace RemoteLab
virtual bool openFile() { return false; } // pure virtual in the base class virtual bool openFile() { return false; } // pure virtual in the base class
virtual bool closeURL(); virtual bool closeURL();
static KAboutData *createAboutData(); static TDEAboutData *createAboutData();
public slots: public slots:
virtual bool openURL(const KURL &url); virtual bool openURL(const KURL &url);

@ -7,5 +7,5 @@ KDE_ICON = libremotelab_sensormonitor
# Part # Part
kde_module_LTLIBRARIES = libremotelab_sensormonitor.la kde_module_LTLIBRARIES = libremotelab_sensormonitor.la
libremotelab_sensormonitor_la_LIBADD = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_TDEUI) $(LIB_QT) -ltdekrbsocket -ltqtrla libremotelab_sensormonitor_la_LIBADD = ../../widgets/libtracewidget.la ../../widgets/libfloatspinbox.la $(LIB_KFILE) $(LIB_KPARTS) $(LIB_TDEUI) $(LIB_QT) -ltdekrbsocket -ltqtrla
libremotelab_sensormonitor_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -lkio -ltdefx libremotelab_sensormonitor_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) $(LIB_TDECORE) $(LIB_TDEUI) -ltdeio -ltdefx
libremotelab_sensormonitor_la_SOURCES = part.cpp layout.ui libremotelab_sensormonitor_la_SOURCES = part.cpp layout.ui

@ -24,12 +24,12 @@
#include "part.h" #include "part.h"
#include <kaboutdata.h> //::createAboutData() #include <kaboutdata.h> //::createAboutData()
#include <kaction.h> #include <tdeaction.h>
#include <klocale.h> #include <klocale.h>
#include <ktextedit.h> #include <ktextedit.h>
#include <kfiledialog.h> #include <tdefiledialog.h>
#include <kmessagebox.h> //::start() #include <kmessagebox.h> //::start()
#include <kparts/genericfactory.h> #include <tdeparts/genericfactory.h>
#include <kstatusbar.h> #include <kstatusbar.h>
#include <kstdaction.h> #include <kstdaction.h>
#include <knuminput.h> #include <knuminput.h>
@ -984,8 +984,8 @@ void SensorMonitorPart::recallWaveforms() {
} }
} }
KAboutData* SensorMonitorPart::createAboutData() { TDEAboutData* SensorMonitorPart::createAboutData() {
return new KAboutData( APP_NAME, I18N_NOOP( APP_PRETTYNAME ), APP_VERSION ); return new TDEAboutData( APP_NAME, I18N_NOOP( APP_PRETTYNAME ), APP_VERSION );
} }
} //namespace RemoteLab } //namespace RemoteLab

@ -30,9 +30,9 @@
#include <tqimage.h> #include <tqimage.h>
#include <tqdatetime.h> #include <tqdatetime.h>
#include <kparts/browserextension.h> #include <tdeparts/browserextension.h>
#include <kparts/statusbarextension.h> #include <tdeparts/statusbarextension.h>
#include <kparts/part.h> #include <tdeparts/part.h>
#include <kurl.h> #include <kurl.h>
#include <tqtrla.h> #include <tqtrla.h>
@ -41,7 +41,7 @@
#define MAXTRACES 255 #define MAXTRACES 255
class KAboutData; class TDEAboutData;
using KParts::StatusBarExtension; using KParts::StatusBarExtension;
class TraceWidget; class TraceWidget;
class TQSocket; class TQSocket;
@ -133,7 +133,7 @@ namespace RemoteLab
virtual bool openFile() { return false; } // pure virtual in the base class virtual bool openFile() { return false; } // pure virtual in the base class
virtual bool closeURL(); virtual bool closeURL();
static KAboutData *createAboutData(); static TDEAboutData *createAboutData();
public slots: public slots:
virtual bool openURL(const KURL &url); virtual bool openURL(const KURL &url);

@ -8,5 +8,5 @@ lib_LTLIBRARIES = libtdekrbsocket.la
include_HEADERS = tdekrbclientsocket.h tdekrbserversocket.h include_HEADERS = tdekrbclientsocket.h tdekrbserversocket.h
libtdekrbsocket_la_SOURCES = tdekrbclientsocket.cpp tdekrbserversocket.cpp libtdekrbsocket_la_SOURCES = tdekrbclientsocket.cpp tdekrbserversocket.cpp
libtdekrbsocket_la_LIBADD = -lkio $(LIB_TDEUI) -lsasl2 libtdekrbsocket_la_LIBADD = $(LIB_KIO) $(LIB_TDEUI) -lsasl2
libtdekrbsocket_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries) libtdekrbsocket_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries)

@ -7,5 +7,5 @@ lib_LTLIBRARIES = libtqtrla.la
include_HEADERS = tqtrla.h include_HEADERS = tqtrla.h
libtqtrla_la_SOURCES = tqtrla.cpp libtqtrla_la_SOURCES = tqtrla.cpp
libtqtrla_la_LIBADD = -lkio $(LIB_TDEUI) libtqtrla_la_LIBADD = $(LIB_KIO) $(LIB_TDEUI)
libtqtrla_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries) $(LIB_KPARTS) -ltdekrbsocket libtqtrla_la_LDFLAGS = -avoid-version -module -no-undefined $(all_libraries) $(LIB_KPARTS) -ltdekrbsocket

@ -83,8 +83,8 @@ namespace KParts
emit(usingFixedSizeChanged(fixed)); emit(usingFixedSizeChanged(fixed));
} }
TQPtrList<KAction> RemoteInstrumentPart::menuActionList() { TQPtrList<TDEAction> RemoteInstrumentPart::menuActionList() {
return TQPtrList<KAction>(); return TQPtrList<TDEAction>();
} }
void RemoteInstrumentPart::resize(TQSize size) { void RemoteInstrumentPart::resize(TQSize size) {
@ -731,4 +731,4 @@ WorkspaceServiceAuthGroupList::iterator WorkspaceServiceAuthGroupList::findByNam
} }
} }
return it; return it;
} }

@ -26,9 +26,9 @@
#include <tqtimer.h> #include <tqtimer.h>
#include <tqdatetime.h> #include <tqdatetime.h>
#include <kaction.h> #include <tdeaction.h>
#include <kparts/part.h> #include <tdeparts/part.h>
#include <tdekrbclientsocket.h> #include <tdekrbclientsocket.h>
@ -61,7 +61,7 @@ namespace KParts
public: public:
KURL url() const { return m_url; } KURL url() const { return m_url; }
virtual bool closeURL(); virtual bool closeURL();
virtual TQPtrList<KAction> menuActionList(); virtual TQPtrList<TDEAction> menuActionList();
protected: protected:
TQStringList textForServerError(TQString shortError); TQStringList textForServerError(TQString shortError);
@ -298,4 +298,4 @@ class WorkspaceServiceAuthGroupList : public TQValueList<WorkspaceServiceAuthGro
// ============================================================================= // =============================================================================
#endif // TQTRLA_H #endif // TQTRLA_H

@ -1,4 +1,4 @@
# generated automatically by aclocal 1.11.3 -*- Autoconf -*- # generated automatically by aclocal 1.11.6 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
@ -14,8 +14,8 @@
m4_ifndef([AC_AUTOCONF_VERSION], m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
[m4_warning([this file was generated for autoconf 2.68. [m4_warning([this file was generated for autoconf 2.69.
You have another version of autoconf. It may work, but is not guaranteed to. You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely. If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])]) To do so, use the procedure documented by the package, typically `autoreconf'.])])
@ -664,7 +664,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.11' [am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro. dnl require some minimum version. Point them to the right macro.
m4_if([$1], [1.11.3], [], m4_if([$1], [1.11.6], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
]) ])
@ -680,7 +680,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.11.3])dnl [AM_AUTOMAKE_VERSION([1.11.6])dnl
m4_ifndef([AC_AUTOCONF_VERSION], m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.11.3 from Makefile.am. # Makefile.in generated by automake 1.11.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision$ # KDE tags expanded automatically by am_edit - $Revision$
# @configure_input@ # @configure_input@
@ -19,6 +19,23 @@
# the SUBDIRS is filled automatically by am_edit. If files are # the SUBDIRS is filled automatically by am_edit. If files are
# in this directory they are installed into the english dir # in this directory they are installed into the english dir
VPATH = @srcdir@ VPATH = @srcdir@
am__make_dryrun = \
{ \
am__dry=no; \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
| grep '^AM OK$$' >/dev/null || am__dry=yes;; \
*) \
for am__flg in $$MAKEFLAGS; do \
case $$am__flg in \
*=*|--*) ;; \
*n*) am__dry=yes; break;; \
esac; \
done;; \
esac; \
test $$am__dry = yes; \
}
pkgdatadir = $(datadir)/@PACKAGE@ pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@
@ -66,6 +83,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
install-pdf-recursive install-ps-recursive install-recursive \ install-pdf-recursive install-ps-recursive install-recursive \
installcheck-recursive installdirs-recursive pdf-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \
ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive distclean-recursive maintainer-clean-recursive
AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@ -192,9 +214,7 @@ LIB_KAB = @LIB_KAB@
LIB_KABC = @LIB_KABC@ LIB_KABC = @LIB_KABC@
LIB_KDED = @LIB_KDED@ LIB_KDED = @LIB_KDED@
LIB_KDNSSD = @LIB_KDNSSD@ LIB_KDNSSD = @LIB_KDNSSD@
LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_KHTML = @LIB_KHTML@
LIB_KIMPROXY = @LIB_KIMPROXY@ LIB_KIMPROXY = @LIB_KIMPROXY@
LIB_KIO = @LIB_KIO@ LIB_KIO = @LIB_KIO@
LIB_KJS = @LIB_KJS@ LIB_KJS = @LIB_KJS@
@ -210,6 +230,8 @@ LIB_QT = @LIB_QT@
LIB_QUI = @LIB_QUI@ LIB_QUI = @LIB_QUI@
LIB_SMB = @LIB_SMB@ LIB_SMB = @LIB_SMB@
LIB_TDECORE = @LIB_TDECORE@ LIB_TDECORE = @LIB_TDECORE@
LIB_TDEFILE = @LIB_TDEFILE@
LIB_TDEHTML = @LIB_TDEHTML@
LIB_TDEPIM = @LIB_TDEPIM@ LIB_TDEPIM = @LIB_TDEPIM@
LIB_TDEPRINT = @LIB_TDEPRINT@ LIB_TDEPRINT = @LIB_TDEPRINT@
LIB_TDEUI = @LIB_TDEUI@ LIB_TDEUI = @LIB_TDEUI@
@ -592,13 +614,10 @@ distdir: $(DISTFILES)
done done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \ if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \ $(am__make_dryrun) \
|| $(MKDIR_P) "$(distdir)/$$subdir" \ || test -d "$(distdir)/$$subdir" \
|| exit 1; \ || $(MKDIR_P) "$(distdir)/$$subdir" \
fi; \ || exit 1; \
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
$(am__relativize); \ $(am__relativize); \
new_distdir=$$reldir; \ new_distdir=$$reldir; \

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.11.3 from Makefile.am. # Makefile.in generated by automake 1.11.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision$ # KDE tags expanded automatically by am_edit - $Revision$
# @configure_input@ # @configure_input@
@ -16,6 +16,23 @@
@SET_MAKE@ @SET_MAKE@
VPATH = @srcdir@ VPATH = @srcdir@
am__make_dryrun = \
{ \
am__dry=no; \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
| grep '^AM OK$$' >/dev/null || am__dry=yes;; \
*) \
for am__flg in $$MAKEFLAGS; do \
case $$am__flg in \
*=*|--*) ;; \
*n*) am__dry=yes; break;; \
esac; \
done;; \
esac; \
test $$am__dry = yes; \
}
pkgdatadir = $(datadir)/@PACKAGE@ pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@
@ -48,6 +65,11 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES = CONFIG_CLEAN_VPATH_FILES =
SOURCES = SOURCES =
DIST_SOURCES = DIST_SOURCES =
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 1 #>+ 1
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@ -141,9 +163,7 @@ LIB_KAB = @LIB_KAB@
LIB_KABC = @LIB_KABC@ LIB_KABC = @LIB_KABC@
LIB_KDED = @LIB_KDED@ LIB_KDED = @LIB_KDED@
LIB_KDNSSD = @LIB_KDNSSD@ LIB_KDNSSD = @LIB_KDNSSD@
LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_KHTML = @LIB_KHTML@
LIB_KIMPROXY = @LIB_KIMPROXY@ LIB_KIMPROXY = @LIB_KIMPROXY@
LIB_KIO = @LIB_KIO@ LIB_KIO = @LIB_KIO@
LIB_KJS = @LIB_KJS@ LIB_KJS = @LIB_KJS@
@ -159,6 +179,8 @@ LIB_QT = @LIB_QT@
LIB_QUI = @LIB_QUI@ LIB_QUI = @LIB_QUI@
LIB_SMB = @LIB_SMB@ LIB_SMB = @LIB_SMB@
LIB_TDECORE = @LIB_TDECORE@ LIB_TDECORE = @LIB_TDECORE@
LIB_TDEFILE = @LIB_TDEFILE@
LIB_TDEHTML = @LIB_TDEHTML@
LIB_TDEPIM = @LIB_TDEPIM@ LIB_TDEPIM = @LIB_TDEPIM@
LIB_TDEPRINT = @LIB_TDEPRINT@ LIB_TDEPRINT = @LIB_TDEPRINT@
LIB_TDEUI = @LIB_TDEUI@ LIB_TDEUI = @LIB_TDEUI@

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.11.3 from Makefile.am. # Makefile.in generated by automake 1.11.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision$ # KDE tags expanded automatically by am_edit - $Revision$
# @configure_input@ # @configure_input@
@ -16,6 +16,23 @@
@SET_MAKE@ @SET_MAKE@
VPATH = @srcdir@ VPATH = @srcdir@
am__make_dryrun = \
{ \
am__dry=no; \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
| grep '^AM OK$$' >/dev/null || am__dry=yes;; \
*) \
for am__flg in $$MAKEFLAGS; do \
case $$am__flg in \
*=*|--*) ;; \
*n*) am__dry=yes; break;; \
esac; \
done;; \
esac; \
test $$am__dry = yes; \
}
pkgdatadir = $(datadir)/@PACKAGE@ pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@
@ -48,6 +65,11 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES = CONFIG_CLEAN_VPATH_FILES =
SOURCES = SOURCES =
DIST_SOURCES = DIST_SOURCES =
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 1 #>+ 1
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@ -141,9 +163,7 @@ LIB_KAB = @LIB_KAB@
LIB_KABC = @LIB_KABC@ LIB_KABC = @LIB_KABC@
LIB_KDED = @LIB_KDED@ LIB_KDED = @LIB_KDED@
LIB_KDNSSD = @LIB_KDNSSD@ LIB_KDNSSD = @LIB_KDNSSD@
LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_KHTML = @LIB_KHTML@
LIB_KIMPROXY = @LIB_KIMPROXY@ LIB_KIMPROXY = @LIB_KIMPROXY@
LIB_KIO = @LIB_KIO@ LIB_KIO = @LIB_KIO@
LIB_KJS = @LIB_KJS@ LIB_KJS = @LIB_KJS@
@ -159,6 +179,8 @@ LIB_QT = @LIB_QT@
LIB_QUI = @LIB_QUI@ LIB_QUI = @LIB_QUI@
LIB_SMB = @LIB_SMB@ LIB_SMB = @LIB_SMB@
LIB_TDECORE = @LIB_TDECORE@ LIB_TDECORE = @LIB_TDECORE@
LIB_TDEFILE = @LIB_TDEFILE@
LIB_TDEHTML = @LIB_TDEHTML@
LIB_TDEPIM = @LIB_TDEPIM@ LIB_TDEPIM = @LIB_TDEPIM@
LIB_TDEPRINT = @LIB_TDEPRINT@ LIB_TDEPRINT = @LIB_TDEPRINT@
LIB_TDEUI = @LIB_TDEUI@ LIB_TDEUI = @LIB_TDEUI@

@ -6,6 +6,6 @@ bin_PROGRAMS = remotefpga_adminsysctlserver
remotefpga_adminsysctlserver_SOURCES = main.cpp admin_sys_ctl.cpp remotefpga_adminsysctlserver_SOURCES = main.cpp admin_sys_ctl.cpp
remotefpga_adminsysctlserver_METASOURCES = AUTO remotefpga_adminsysctlserver_METASOURCES = AUTO
remotefpga_adminsysctlserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -ltdekrbsocket -ltqtrla remotefpga_adminsysctlserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdekrbsocket -ltqtrla
KDE_OPTIONS = nofinal KDE_OPTIONS = nofinal

@ -45,16 +45,16 @@ static const char version[] = "v0.0.1";
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
KAboutData aboutData( "remotefpga_admin_sys_ctl_server", I18N_NOOP("RemoteFPGA System Administration Control Server"), TDEAboutData aboutData( "remotefpga_admin_sys_ctl_server", I18N_NOOP("RemoteFPGA System Administration Control Server"),
version, description, KAboutData::License_GPL, version, description, TDEAboutData::License_GPL,
"(c) 2012, Timothy Pearson"); "(c) 2012, Timothy Pearson");
aboutData.addAuthor("Timothy Pearson",0, "kb9vqf@pearsoncomputing.net"); aboutData.addAuthor("Timothy Pearson",0, "kb9vqf@pearsoncomputing.net");
KCmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );
KApplication::disableAutoDcopRegistration(); TDEApplication::disableAutoDcopRegistration();
KApplication app(false, false); TDEApplication app(false, false);
KStartupInfo::appStarted(); TDEStartupInfo::appStarted();
KSimpleConfig config("remotefpga_adminsysctlserver.conf", false); KSimpleConfig config("remotefpga_adminsysctlserver.conf", false);
config.setGroup("Server"); config.setGroup("Server");

@ -214,9 +214,7 @@ LIB_KAB = @LIB_KAB@
LIB_KABC = @LIB_KABC@ LIB_KABC = @LIB_KABC@
LIB_KDED = @LIB_KDED@ LIB_KDED = @LIB_KDED@
LIB_KDNSSD = @LIB_KDNSSD@ LIB_KDNSSD = @LIB_KDNSSD@
LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_KHTML = @LIB_KHTML@
LIB_KIMPROXY = @LIB_KIMPROXY@ LIB_KIMPROXY = @LIB_KIMPROXY@
LIB_KIO = @LIB_KIO@ LIB_KIO = @LIB_KIO@
LIB_KJS = @LIB_KJS@ LIB_KJS = @LIB_KJS@
@ -232,6 +230,8 @@ LIB_QT = @LIB_QT@
LIB_QUI = @LIB_QUI@ LIB_QUI = @LIB_QUI@
LIB_SMB = @LIB_SMB@ LIB_SMB = @LIB_SMB@
LIB_TDECORE = @LIB_TDECORE@ LIB_TDECORE = @LIB_TDECORE@
LIB_TDEFILE = @LIB_TDEFILE@
LIB_TDEHTML = @LIB_TDEHTML@
LIB_TDEPIM = @LIB_TDEPIM@ LIB_TDEPIM = @LIB_TDEPIM@
LIB_TDEPRINT = @LIB_TDEPRINT@ LIB_TDEPRINT = @LIB_TDEPRINT@
LIB_TDEUI = @LIB_TDEUI@ LIB_TDEUI = @LIB_TDEUI@

@ -163,9 +163,7 @@ LIB_KAB = @LIB_KAB@
LIB_KABC = @LIB_KABC@ LIB_KABC = @LIB_KABC@
LIB_KDED = @LIB_KDED@ LIB_KDED = @LIB_KDED@
LIB_KDNSSD = @LIB_KDNSSD@ LIB_KDNSSD = @LIB_KDNSSD@
LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_KHTML = @LIB_KHTML@
LIB_KIMPROXY = @LIB_KIMPROXY@ LIB_KIMPROXY = @LIB_KIMPROXY@
LIB_KIO = @LIB_KIO@ LIB_KIO = @LIB_KIO@
LIB_KJS = @LIB_KJS@ LIB_KJS = @LIB_KJS@
@ -181,6 +179,8 @@ LIB_QT = @LIB_QT@
LIB_QUI = @LIB_QUI@ LIB_QUI = @LIB_QUI@
LIB_SMB = @LIB_SMB@ LIB_SMB = @LIB_SMB@
LIB_TDECORE = @LIB_TDECORE@ LIB_TDECORE = @LIB_TDECORE@
LIB_TDEFILE = @LIB_TDEFILE@
LIB_TDEHTML = @LIB_TDEHTML@
LIB_TDEPIM = @LIB_TDEPIM@ LIB_TDEPIM = @LIB_TDEPIM@
LIB_TDEPRINT = @LIB_TDEPRINT@ LIB_TDEPRINT = @LIB_TDEPRINT@
LIB_TDEUI = @LIB_TDEUI@ LIB_TDEUI = @LIB_TDEUI@

@ -163,9 +163,7 @@ LIB_KAB = @LIB_KAB@
LIB_KABC = @LIB_KABC@ LIB_KABC = @LIB_KABC@
LIB_KDED = @LIB_KDED@ LIB_KDED = @LIB_KDED@
LIB_KDNSSD = @LIB_KDNSSD@ LIB_KDNSSD = @LIB_KDNSSD@
LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_KHTML = @LIB_KHTML@
LIB_KIMPROXY = @LIB_KIMPROXY@ LIB_KIMPROXY = @LIB_KIMPROXY@
LIB_KIO = @LIB_KIO@ LIB_KIO = @LIB_KIO@
LIB_KJS = @LIB_KJS@ LIB_KJS = @LIB_KJS@
@ -181,6 +179,8 @@ LIB_QT = @LIB_QT@
LIB_QUI = @LIB_QUI@ LIB_QUI = @LIB_QUI@
LIB_SMB = @LIB_SMB@ LIB_SMB = @LIB_SMB@
LIB_TDECORE = @LIB_TDECORE@ LIB_TDECORE = @LIB_TDECORE@
LIB_TDEFILE = @LIB_TDEFILE@
LIB_TDEHTML = @LIB_TDEHTML@
LIB_TDEPIM = @LIB_TDEPIM@ LIB_TDEPIM = @LIB_TDEPIM@
LIB_TDEPRINT = @LIB_TDEPRINT@ LIB_TDEPRINT = @LIB_TDEPRINT@
LIB_TDEUI = @LIB_TDEUI@ LIB_TDEUI = @LIB_TDEUI@

@ -6,6 +6,6 @@ bin_PROGRAMS = remotefpga_adminsysctlserver
remotefpga_adminsysctlserver_SOURCES = main.cpp admin_user_mgmt.cpp remotefpga_adminsysctlserver_SOURCES = main.cpp admin_user_mgmt.cpp
remotefpga_adminsysctlserver_METASOURCES = AUTO remotefpga_adminsysctlserver_METASOURCES = AUTO
remotefpga_adminsysctlserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -ltdekrbsocket -ltqtrla remotefpga_adminsysctlserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdekrbsocket -ltqtrla
KDE_OPTIONS = nofinal KDE_OPTIONS = nofinal

@ -45,16 +45,16 @@ static const char version[] = "v0.0.1";
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
KAboutData aboutData( "remotefpga_admin_sys_ctl_server", I18N_NOOP("RemoteFPGA System Administration User Management Server"), TDEAboutData aboutData( "remotefpga_admin_sys_ctl_server", I18N_NOOP("RemoteFPGA System Administration User Management Server"),
version, description, KAboutData::License_GPL, version, description, TDEAboutData::License_GPL,
"(c) 2013, Timothy Pearson"); "(c) 2013, Timothy Pearson");
aboutData.addAuthor("Timothy Pearson",0, "kb9vqf@pearsoncomputing.net"); aboutData.addAuthor("Timothy Pearson",0, "kb9vqf@pearsoncomputing.net");
KCmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );
KApplication::disableAutoDcopRegistration(); TDEApplication::disableAutoDcopRegistration();
KApplication app(false, false); TDEApplication app(false, false);
KStartupInfo::appStarted(); TDEStartupInfo::appStarted();
KSimpleConfig config("remotefpga_adminusermgmtserver.conf", false); KSimpleConfig config("remotefpga_adminusermgmtserver.conf", false);
config.setGroup("Server"); config.setGroup("Server");

@ -244,9 +244,9 @@ AC_DEFUN([KDE_FIND_PATH],
AC_DEFUN([KDE_MOC_ERROR_MESSAGE], AC_DEFUN([KDE_MOC_ERROR_MESSAGE],
[ [
AC_MSG_ERROR([No Qt meta object compiler (moc) found! AC_MSG_ERROR([No TQt meta object compiler (tqmoc) found!
Please check whether you installed Qt correctly. Please check whether you installed Qt correctly.
You need to have a running moc binary. You need to have a running tqmoc binary.
configure tried to run $ac_cv_path_moc and the test didn't configure tried to run $ac_cv_path_moc and the test didn't
succeed. If configure shouldn't have tried this one, set succeed. If configure shouldn't have tried this one, set
the environment variable MOC to the right one before running the environment variable MOC to the right one before running
@ -268,8 +268,8 @@ configure.
AC_DEFUN([KDE_UIC_ERROR_MESSAGE], AC_DEFUN([KDE_UIC_ERROR_MESSAGE],
[ [
AC_MSG_WARN([No Qt ui compiler (uic) found! AC_MSG_WARN([No TQt ui compiler (tquic) found!
Please check whether you installed Qt correctly. Please check whether you installed TQt correctly.
You need to have a running uic binary. You need to have a running uic binary.
configure tried to run $ac_cv_path_uic and the test didn't configure tried to run $ac_cv_path_uic and the test didn't
succeed. If configure shouldn't have tried this one, set succeed. If configure shouldn't have tried this one, set
@ -334,7 +334,7 @@ AC_DEFUN([AC_PATH_QT_MOC_UIC],
qt_bindirs="/usr/share/qt4/bin $qt_bindirs" qt_bindirs="/usr/share/qt4/bin $qt_bindirs"
fi fi
KDE_FIND_PATH(moc, MOC, [$qt_bindirs], [KDE_MOC_ERROR_MESSAGE]) KDE_FIND_PATH(tqmoc, MOC, [$qt_bindirs], [KDE_MOC_ERROR_MESSAGE])
if test -z "$UIC_NOT_NEEDED"; then if test -z "$UIC_NOT_NEEDED"; then
if test $kde_qtver = 3; then if test $kde_qtver = 3; then
KDE_FIND_PATH(uic-tqt, UIC_PATH, [$qt_bindirs], [UIC_PATH=""]) KDE_FIND_PATH(uic-tqt, UIC_PATH, [$qt_bindirs], [UIC_PATH=""])
@ -636,7 +636,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi fi
if test -n "$trinity14ornewer"; then if test -n "$trinity14ornewer"; then
KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)]) KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)])
AC_SUBST(MAKEKDEWIDGETS) AC_SUBST(MAKEKDEWIDGETS)
@ -2007,7 +2007,7 @@ if test "$kde_qtver" = 1; then
kde_check_lib="libtdecore.la" kde_check_lib="libtdecore.la"
else else
kde_check_header="ksharedptr.h" kde_check_header="ksharedptr.h"
kde_check_lib="libkio.la" kde_check_lib="libtdeio.la"
fi fi
if test -z "$1"; then if test -z "$1"; then
@ -2198,20 +2198,20 @@ cat > conftest.$ac_ext <<EOF
#include <kapp.h> #include <kapp.h>
int main() { int main() {
printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
printf("kde_wallpaperdir=\\"%s\\"\n", printf("kde_wallpaperdir=\\"%s\\"\n",
KApplication::kde_wallpaperdir().data()); TDEApplication::kde_wallpaperdir().data());
printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
printf("kde_moduledir=\\"/tmp/dummy\\"\n"); printf("kde_moduledir=\\"/tmp/dummy\\"\n");
@ -2315,24 +2315,24 @@ if test $kde_qtver = 4; then
AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KIO, "-ltdeio")
AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc") AC_SUBST(LIB_KABC, "-lkabc")
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-lkutils") AC_SUBST(LIB_KUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim") AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-lkimproxy") AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-lkdnssd") AC_SUBST(LIB_KDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-lkunittest") AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio") AC_SUBST(LIB_KSYCOCA, "-ltdeio")
AC_SUBST(LIB_KFILE, "-lkio") AC_SUBST(LIB_TDEFILE, "-ltdeio")
elif test $kde_qtver = 3; then elif test $kde_qtver = 3; then
case $host in case $host in
*cygwin*) lib_kded="-ltdeinit_kded" ;; *cygwin*) lib_kded="-ltdeinit_kded" ;;
@ -2341,41 +2341,41 @@ elif test $kde_qtver = 3; then
AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KIO, "-ltdeio")
AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc") AC_SUBST(LIB_KABC, "-lkabc")
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-lkutils") AC_SUBST(LIB_KUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim") AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-lkimproxy") AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-lkdnssd") AC_SUBST(LIB_KDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-lkunittest") AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio") AC_SUBST(LIB_KSYCOCA, "-ltdeio")
AC_SUBST(LIB_KFILE, "-lkio") AC_SUBST(LIB_TDEFILE, "-ltdeio")
elif test $kde_qtver = 2; then elif test $kde_qtver = 2; then
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KIO, "-ltdeio")
AC_SUBST(LIB_KSYCOCA, "-lksycoca") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile") AC_SUBST(LIB_TDEFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)") AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
fi fi
]) ])
@ -2823,7 +2823,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
test "x$jpeg_incdir" = xNO && jpeg_incdir= test "x$jpeg_incdir" = xNO && jpeg_incdir=
dnl if headers _and_ libraries are missing, this is no error, and we dnl if headers _and_ libraries are missing, this is no error, and we
dnl continue with a warning (the user will get no jpeg support in khtml) dnl continue with a warning (the user will get no jpeg support in tdehtml)
dnl if only one is missing, it means a configuration error, but we still dnl if only one is missing, it means a configuration error, but we still
dnl only warn dnl only warn
if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@ -3890,7 +3890,7 @@ LIBTOOL_SHELL="libtool"
KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)" KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
AC_SUBST(KDE_PLUGIN) AC_SUBST(KDE_PLUGIN)
# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs. # This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)" KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
AC_SUBST(KDE_CHECK_PLUGIN) AC_SUBST(KDE_CHECK_PLUGIN)
@ -4949,7 +4949,8 @@ fi
PYTHONINC=-I$python_incdir PYTHONINC=-I$python_incdir
python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs" python_multiarch_libdirs="`find /usr/lib/ -maxdepth 1 -type d | xargs echo`"
python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $python_multiarch_libdirs $kde_extra_libs"
AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir) AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
if test ! -r $python_libdir/libpython$version.so; then if test ! -r $python_libdir/libpython$version.so; then
AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir) AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
@ -5810,12 +5811,6 @@ if test "x$kde_java_bindir" != "xno"; then
dnl not needed for gcj compile dnl not needed for gcj compile
if test "x$kde_java_libgcjdir" = "x"; then
if test ! -r "$kde_java_libhpidir/libhpi.so"; then
AC_MSG_ERROR([libhpi.so not found under $kde_java_libhpidir. Use --without-java.])
fi
fi
if test -n "$jni_includes"; then if test -n "$jni_includes"; then
dnl Check for JNI version dnl Check for JNI version
AC_LANG_SAVE AC_LANG_SAVE
@ -5852,8 +5847,12 @@ if test "x$kde_java_bindir" != "xno"; then
JAVAH=$kde_java_bindir/javah JAVAH=$kde_java_bindir/javah
JAR=$kde_java_bindir/jar JAR=$kde_java_bindir/jar
AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is]) AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
if test "x$kde_java_libgcjdir" = "x"; then if test "x$kde_java_libgcjdir" = "x"; then
JVMLIBS="-L$kde_java_libjvmdir -ljvm -L$kde_java_libhpidir -lhpi" if test ! -r "$kde_java_libhpidir/libhpi.so"; then
JVMLIBS="-L$kde_java_libjvmdir -ljvm"
else
JVMLIBS="-L$kde_java_libjvmdir -ljvm -L$kde_java_libhpidir -lhpi"
fi
else else
JVMLIBS="-L$kde_java_libgcjdir -lgcj" JVMLIBS="-L$kde_java_libgcjdir -lgcj"
fi fi

@ -1,4 +1,4 @@
# generated automatically by aclocal 1.11.3 -*- Autoconf -*- # generated automatically by aclocal 1.11.6 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
@ -14,8 +14,8 @@
m4_ifndef([AC_AUTOCONF_VERSION], m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
[m4_warning([this file was generated for autoconf 2.68. [m4_warning([this file was generated for autoconf 2.69.
You have another version of autoconf. It may work, but is not guaranteed to. You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely. If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])]) To do so, use the procedure documented by the package, typically `autoreconf'.])])
@ -664,7 +664,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.11' [am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro. dnl require some minimum version. Point them to the right macro.
m4_if([$1], [1.11.3], [], m4_if([$1], [1.11.6], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
]) ])
@ -680,7 +680,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.11.3])dnl [AM_AUTOMAKE_VERSION([1.11.6])dnl
m4_ifndef([AC_AUTOCONF_VERSION], m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.11.3 from Makefile.am. # Makefile.in generated by automake 1.11.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision$ # KDE tags expanded automatically by am_edit - $Revision$
# @configure_input@ # @configure_input@
@ -19,6 +19,23 @@
# the SUBDIRS is filled automatically by am_edit. If files are # the SUBDIRS is filled automatically by am_edit. If files are
# in this directory they are installed into the english dir # in this directory they are installed into the english dir
VPATH = @srcdir@ VPATH = @srcdir@
am__make_dryrun = \
{ \
am__dry=no; \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
| grep '^AM OK$$' >/dev/null || am__dry=yes;; \
*) \
for am__flg in $$MAKEFLAGS; do \
case $$am__flg in \
*=*|--*) ;; \
*n*) am__dry=yes; break;; \
esac; \
done;; \
esac; \
test $$am__dry = yes; \
}
pkgdatadir = $(datadir)/@PACKAGE@ pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@
@ -66,6 +83,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
install-pdf-recursive install-ps-recursive install-recursive \ install-pdf-recursive install-ps-recursive install-recursive \
installcheck-recursive installdirs-recursive pdf-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \
ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive distclean-recursive maintainer-clean-recursive
AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@ -192,9 +214,7 @@ LIB_KAB = @LIB_KAB@
LIB_KABC = @LIB_KABC@ LIB_KABC = @LIB_KABC@
LIB_KDED = @LIB_KDED@ LIB_KDED = @LIB_KDED@
LIB_KDNSSD = @LIB_KDNSSD@ LIB_KDNSSD = @LIB_KDNSSD@
LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_KHTML = @LIB_KHTML@
LIB_KIMPROXY = @LIB_KIMPROXY@ LIB_KIMPROXY = @LIB_KIMPROXY@
LIB_KIO = @LIB_KIO@ LIB_KIO = @LIB_KIO@
LIB_KJS = @LIB_KJS@ LIB_KJS = @LIB_KJS@
@ -210,6 +230,8 @@ LIB_QT = @LIB_QT@
LIB_QUI = @LIB_QUI@ LIB_QUI = @LIB_QUI@
LIB_SMB = @LIB_SMB@ LIB_SMB = @LIB_SMB@
LIB_TDECORE = @LIB_TDECORE@ LIB_TDECORE = @LIB_TDECORE@
LIB_TDEFILE = @LIB_TDEFILE@
LIB_TDEHTML = @LIB_TDEHTML@
LIB_TDEPIM = @LIB_TDEPIM@ LIB_TDEPIM = @LIB_TDEPIM@
LIB_TDEPRINT = @LIB_TDEPRINT@ LIB_TDEPRINT = @LIB_TDEPRINT@
LIB_TDEUI = @LIB_TDEUI@ LIB_TDEUI = @LIB_TDEUI@
@ -592,13 +614,10 @@ distdir: $(DISTFILES)
done done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \ if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \ $(am__make_dryrun) \
|| $(MKDIR_P) "$(distdir)/$$subdir" \ || test -d "$(distdir)/$$subdir" \
|| exit 1; \ || $(MKDIR_P) "$(distdir)/$$subdir" \
fi; \ || exit 1; \
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
$(am__relativize); \ $(am__relativize); \
new_distdir=$$reldir; \ new_distdir=$$reldir; \

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.11.3 from Makefile.am. # Makefile.in generated by automake 1.11.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision$ # KDE tags expanded automatically by am_edit - $Revision$
# @configure_input@ # @configure_input@
@ -16,6 +16,23 @@
@SET_MAKE@ @SET_MAKE@
VPATH = @srcdir@ VPATH = @srcdir@
am__make_dryrun = \
{ \
am__dry=no; \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
| grep '^AM OK$$' >/dev/null || am__dry=yes;; \
*) \
for am__flg in $$MAKEFLAGS; do \
case $$am__flg in \
*=*|--*) ;; \
*n*) am__dry=yes; break;; \
esac; \
done;; \
esac; \
test $$am__dry = yes; \
}
pkgdatadir = $(datadir)/@PACKAGE@ pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@
@ -48,6 +65,11 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES = CONFIG_CLEAN_VPATH_FILES =
SOURCES = SOURCES =
DIST_SOURCES = DIST_SOURCES =
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 1 #>+ 1
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@ -141,9 +163,7 @@ LIB_KAB = @LIB_KAB@
LIB_KABC = @LIB_KABC@ LIB_KABC = @LIB_KABC@
LIB_KDED = @LIB_KDED@ LIB_KDED = @LIB_KDED@
LIB_KDNSSD = @LIB_KDNSSD@ LIB_KDNSSD = @LIB_KDNSSD@
LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_KHTML = @LIB_KHTML@
LIB_KIMPROXY = @LIB_KIMPROXY@ LIB_KIMPROXY = @LIB_KIMPROXY@
LIB_KIO = @LIB_KIO@ LIB_KIO = @LIB_KIO@
LIB_KJS = @LIB_KJS@ LIB_KJS = @LIB_KJS@
@ -159,6 +179,8 @@ LIB_QT = @LIB_QT@
LIB_QUI = @LIB_QUI@ LIB_QUI = @LIB_QUI@
LIB_SMB = @LIB_SMB@ LIB_SMB = @LIB_SMB@
LIB_TDECORE = @LIB_TDECORE@ LIB_TDECORE = @LIB_TDECORE@
LIB_TDEFILE = @LIB_TDEFILE@
LIB_TDEHTML = @LIB_TDEHTML@
LIB_TDEPIM = @LIB_TDEPIM@ LIB_TDEPIM = @LIB_TDEPIM@
LIB_TDEPRINT = @LIB_TDEPRINT@ LIB_TDEPRINT = @LIB_TDEPRINT@
LIB_TDEUI = @LIB_TDEUI@ LIB_TDEUI = @LIB_TDEUI@

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.11.3 from Makefile.am. # Makefile.in generated by automake 1.11.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision$ # KDE tags expanded automatically by am_edit - $Revision$
# @configure_input@ # @configure_input@
@ -16,6 +16,23 @@
@SET_MAKE@ @SET_MAKE@
VPATH = @srcdir@ VPATH = @srcdir@
am__make_dryrun = \
{ \
am__dry=no; \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
| grep '^AM OK$$' >/dev/null || am__dry=yes;; \
*) \
for am__flg in $$MAKEFLAGS; do \
case $$am__flg in \
*=*|--*) ;; \
*n*) am__dry=yes; break;; \
esac; \
done;; \
esac; \
test $$am__dry = yes; \
}
pkgdatadir = $(datadir)/@PACKAGE@ pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@
@ -48,6 +65,11 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES = CONFIG_CLEAN_VPATH_FILES =
SOURCES = SOURCES =
DIST_SOURCES = DIST_SOURCES =
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 1 #>+ 1
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@ -141,9 +163,7 @@ LIB_KAB = @LIB_KAB@
LIB_KABC = @LIB_KABC@ LIB_KABC = @LIB_KABC@
LIB_KDED = @LIB_KDED@ LIB_KDED = @LIB_KDED@
LIB_KDNSSD = @LIB_KDNSSD@ LIB_KDNSSD = @LIB_KDNSSD@
LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_KHTML = @LIB_KHTML@
LIB_KIMPROXY = @LIB_KIMPROXY@ LIB_KIMPROXY = @LIB_KIMPROXY@
LIB_KIO = @LIB_KIO@ LIB_KIO = @LIB_KIO@
LIB_KJS = @LIB_KJS@ LIB_KJS = @LIB_KJS@
@ -159,6 +179,8 @@ LIB_QT = @LIB_QT@
LIB_QUI = @LIB_QUI@ LIB_QUI = @LIB_QUI@
LIB_SMB = @LIB_SMB@ LIB_SMB = @LIB_SMB@
LIB_TDECORE = @LIB_TDECORE@ LIB_TDECORE = @LIB_TDECORE@
LIB_TDEFILE = @LIB_TDEFILE@
LIB_TDEHTML = @LIB_TDEHTML@
LIB_TDEPIM = @LIB_TDEPIM@ LIB_TDEPIM = @LIB_TDEPIM@
LIB_TDEPRINT = @LIB_TDEPRINT@ LIB_TDEPRINT = @LIB_TDEPRINT@
LIB_TDEUI = @LIB_TDEUI@ LIB_TDEUI = @LIB_TDEUI@

@ -6,6 +6,6 @@ bin_PROGRAMS = remotefpga_authserver
remotefpga_authserver_SOURCES = main.cpp auth_conn.cpp remotefpga_authserver_SOURCES = main.cpp auth_conn.cpp
remotefpga_authserver_METASOURCES = AUTO remotefpga_authserver_METASOURCES = AUTO
remotefpga_authserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -ltdekrbsocket -ltqtrla remotefpga_authserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdekrbsocket -ltqtrla
KDE_OPTIONS = nofinal KDE_OPTIONS = nofinal

@ -692,7 +692,7 @@ AuthServer::AuthServer(TQObject* parent) :
} }
m_serverID = 0; m_serverID = 0;
KCmdLineArgs* const args = KCmdLineArgs::parsedArgs(); TDECmdLineArgs* const args = TDECmdLineArgs::parsedArgs();
if ((args) && (args->count() > 0)) { if ((args) && (args->count() > 0)) {
m_serverID = TQString(args->arg(0)).toInt(); m_serverID = TQString(args->arg(0)).toInt();
} }

@ -39,7 +39,7 @@
#include "auth_conn.h" #include "auth_conn.h"
static const KCmdLineOptions options[] = static const TDECmdLineOptions options[] =
{ {
{ "+[id]", I18N_NOOP( "Set server id to 'id'" ), 0 }, { "+[id]", I18N_NOOP( "Set server id to 'id'" ), 0 },
{ 0, 0, 0 } { 0, 0, 0 }
@ -51,17 +51,17 @@ static const char version[] = "v0.0.1";
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
KAboutData aboutData( "remotefpga_auth_server", I18N_NOOP("RemoteFPGA AuthServer"), TDEAboutData aboutData( "remotefpga_auth_server", I18N_NOOP("RemoteFPGA AuthServer"),
version, description, KAboutData::License_GPL, version, description, TDEAboutData::License_GPL,
"(c) 2012, Timothy Pearson"); "(c) 2012-2013, Timothy Pearson");
aboutData.addAuthor("Timothy Pearson",0, "kb9vqf@pearsoncomputing.net"); aboutData.addAuthor("Timothy Pearson",0, "kb9vqf@pearsoncomputing.net");
KCmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );
KCmdLineArgs::addCmdLineOptions(options); TDECmdLineArgs::addCmdLineOptions(options);
KApplication::disableAutoDcopRegistration(); TDEApplication::disableAutoDcopRegistration();
KApplication app(false, false); TDEApplication app(false, false);
KStartupInfo::appStarted(); TDEStartupInfo::appStarted();
AuthServer authsvr(0); AuthServer authsvr(0);
return app.exec(); return app.exec();

@ -636,7 +636,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi fi
if test -n "$trinity14ornewer"; then if test -n "$trinity14ornewer"; then
KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)]) KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)])
AC_SUBST(MAKEKDEWIDGETS) AC_SUBST(MAKEKDEWIDGETS)
@ -2007,7 +2007,7 @@ if test "$kde_qtver" = 1; then
kde_check_lib="libtdecore.la" kde_check_lib="libtdecore.la"
else else
kde_check_header="ksharedptr.h" kde_check_header="ksharedptr.h"
kde_check_lib="libkio.la" kde_check_lib="libtdeio.la"
fi fi
if test -z "$1"; then if test -z "$1"; then
@ -2198,20 +2198,20 @@ cat > conftest.$ac_ext <<EOF
#include <kapp.h> #include <kapp.h>
int main() { int main() {
printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
printf("kde_wallpaperdir=\\"%s\\"\n", printf("kde_wallpaperdir=\\"%s\\"\n",
KApplication::kde_wallpaperdir().data()); TDEApplication::kde_wallpaperdir().data());
printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
printf("kde_moduledir=\\"/tmp/dummy\\"\n"); printf("kde_moduledir=\\"/tmp/dummy\\"\n");
@ -2315,24 +2315,24 @@ if test $kde_qtver = 4; then
AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KIO, "-ltdeio")
AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc") AC_SUBST(LIB_KABC, "-lkabc")
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-lkutils") AC_SUBST(LIB_KUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim") AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-lkimproxy") AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-lkdnssd") AC_SUBST(LIB_KDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-lkunittest") AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio") AC_SUBST(LIB_KSYCOCA, "-ltdeio")
AC_SUBST(LIB_KFILE, "-lkio") AC_SUBST(LIB_TDEFILE, "-ltdeio")
elif test $kde_qtver = 3; then elif test $kde_qtver = 3; then
case $host in case $host in
*cygwin*) lib_kded="-ltdeinit_kded" ;; *cygwin*) lib_kded="-ltdeinit_kded" ;;
@ -2341,41 +2341,41 @@ elif test $kde_qtver = 3; then
AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KIO, "-ltdeio")
AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc") AC_SUBST(LIB_KABC, "-lkabc")
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-lkutils") AC_SUBST(LIB_KUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim") AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-lkimproxy") AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-lkdnssd") AC_SUBST(LIB_KDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-lkunittest") AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio") AC_SUBST(LIB_KSYCOCA, "-ltdeio")
AC_SUBST(LIB_KFILE, "-lkio") AC_SUBST(LIB_TDEFILE, "-ltdeio")
elif test $kde_qtver = 2; then elif test $kde_qtver = 2; then
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KIO, "-ltdeio")
AC_SUBST(LIB_KSYCOCA, "-lksycoca") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile") AC_SUBST(LIB_TDEFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)") AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
fi fi
]) ])
@ -2823,7 +2823,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
test "x$jpeg_incdir" = xNO && jpeg_incdir= test "x$jpeg_incdir" = xNO && jpeg_incdir=
dnl if headers _and_ libraries are missing, this is no error, and we dnl if headers _and_ libraries are missing, this is no error, and we
dnl continue with a warning (the user will get no jpeg support in khtml) dnl continue with a warning (the user will get no jpeg support in tdehtml)
dnl if only one is missing, it means a configuration error, but we still dnl if only one is missing, it means a configuration error, but we still
dnl only warn dnl only warn
if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@ -3890,7 +3890,7 @@ LIBTOOL_SHELL="libtool"
KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)" KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
AC_SUBST(KDE_PLUGIN) AC_SUBST(KDE_PLUGIN)
# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs. # This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)" KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
AC_SUBST(KDE_CHECK_PLUGIN) AC_SUBST(KDE_CHECK_PLUGIN)
@ -4949,7 +4949,8 @@ fi
PYTHONINC=-I$python_incdir PYTHONINC=-I$python_incdir
python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs" python_multiarch_libdirs="`find /usr/lib/ -maxdepth 1 -type d | xargs echo`"
python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $python_multiarch_libdirs $kde_extra_libs"
AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir) AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
if test ! -r $python_libdir/libpython$version.so; then if test ! -r $python_libdir/libpython$version.so; then
AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir) AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
@ -5810,12 +5811,6 @@ if test "x$kde_java_bindir" != "xno"; then
dnl not needed for gcj compile dnl not needed for gcj compile
if test "x$kde_java_libgcjdir" = "x"; then
if test ! -r "$kde_java_libhpidir/libhpi.so"; then
AC_MSG_ERROR([libhpi.so not found under $kde_java_libhpidir. Use --without-java.])
fi
fi
if test -n "$jni_includes"; then if test -n "$jni_includes"; then
dnl Check for JNI version dnl Check for JNI version
AC_LANG_SAVE AC_LANG_SAVE
@ -5852,8 +5847,12 @@ if test "x$kde_java_bindir" != "xno"; then
JAVAH=$kde_java_bindir/javah JAVAH=$kde_java_bindir/javah
JAR=$kde_java_bindir/jar JAR=$kde_java_bindir/jar
AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is]) AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
if test "x$kde_java_libgcjdir" = "x"; then if test "x$kde_java_libgcjdir" = "x"; then
JVMLIBS="-L$kde_java_libjvmdir -ljvm -L$kde_java_libhpidir -lhpi" if test ! -r "$kde_java_libhpidir/libhpi.so"; then
JVMLIBS="-L$kde_java_libjvmdir -ljvm"
else
JVMLIBS="-L$kde_java_libjvmdir -ljvm -L$kde_java_libhpidir -lhpi"
fi
else else
JVMLIBS="-L$kde_java_libgcjdir -lgcj" JVMLIBS="-L$kde_java_libgcjdir -lgcj"
fi fi

@ -1,4 +1,4 @@
# generated automatically by aclocal 1.11.3 -*- Autoconf -*- # generated automatically by aclocal 1.11.6 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
@ -14,8 +14,8 @@
m4_ifndef([AC_AUTOCONF_VERSION], m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
[m4_warning([this file was generated for autoconf 2.68. [m4_warning([this file was generated for autoconf 2.69.
You have another version of autoconf. It may work, but is not guaranteed to. You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely. If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])]) To do so, use the procedure documented by the package, typically `autoreconf'.])])
@ -664,7 +664,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.11' [am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro. dnl require some minimum version. Point them to the right macro.
m4_if([$1], [1.11.3], [], m4_if([$1], [1.11.6], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
]) ])
@ -680,7 +680,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.11.3])dnl [AM_AUTOMAKE_VERSION([1.11.6])dnl
m4_ifndef([AC_AUTOCONF_VERSION], m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.11.3 from Makefile.am. # Makefile.in generated by automake 1.11.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision$ # KDE tags expanded automatically by am_edit - $Revision$
# @configure_input@ # @configure_input@
@ -19,6 +19,23 @@
# the SUBDIRS is filled automatically by am_edit. If files are # the SUBDIRS is filled automatically by am_edit. If files are
# in this directory they are installed into the english dir # in this directory they are installed into the english dir
VPATH = @srcdir@ VPATH = @srcdir@
am__make_dryrun = \
{ \
am__dry=no; \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
| grep '^AM OK$$' >/dev/null || am__dry=yes;; \
*) \
for am__flg in $$MAKEFLAGS; do \
case $$am__flg in \
*=*|--*) ;; \
*n*) am__dry=yes; break;; \
esac; \
done;; \
esac; \
test $$am__dry = yes; \
}
pkgdatadir = $(datadir)/@PACKAGE@ pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@
@ -66,6 +83,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
install-pdf-recursive install-ps-recursive install-recursive \ install-pdf-recursive install-ps-recursive install-recursive \
installcheck-recursive installdirs-recursive pdf-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \
ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive distclean-recursive maintainer-clean-recursive
AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@ -192,9 +214,7 @@ LIB_KAB = @LIB_KAB@
LIB_KABC = @LIB_KABC@ LIB_KABC = @LIB_KABC@
LIB_KDED = @LIB_KDED@ LIB_KDED = @LIB_KDED@
LIB_KDNSSD = @LIB_KDNSSD@ LIB_KDNSSD = @LIB_KDNSSD@
LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_KHTML = @LIB_KHTML@
LIB_KIMPROXY = @LIB_KIMPROXY@ LIB_KIMPROXY = @LIB_KIMPROXY@
LIB_KIO = @LIB_KIO@ LIB_KIO = @LIB_KIO@
LIB_KJS = @LIB_KJS@ LIB_KJS = @LIB_KJS@
@ -210,6 +230,8 @@ LIB_QT = @LIB_QT@
LIB_QUI = @LIB_QUI@ LIB_QUI = @LIB_QUI@
LIB_SMB = @LIB_SMB@ LIB_SMB = @LIB_SMB@
LIB_TDECORE = @LIB_TDECORE@ LIB_TDECORE = @LIB_TDECORE@
LIB_TDEFILE = @LIB_TDEFILE@
LIB_TDEHTML = @LIB_TDEHTML@
LIB_TDEPIM = @LIB_TDEPIM@ LIB_TDEPIM = @LIB_TDEPIM@
LIB_TDEPRINT = @LIB_TDEPRINT@ LIB_TDEPRINT = @LIB_TDEPRINT@
LIB_TDEUI = @LIB_TDEUI@ LIB_TDEUI = @LIB_TDEUI@
@ -592,13 +614,10 @@ distdir: $(DISTFILES)
done done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \ if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \ $(am__make_dryrun) \
|| $(MKDIR_P) "$(distdir)/$$subdir" \ || test -d "$(distdir)/$$subdir" \
|| exit 1; \ || $(MKDIR_P) "$(distdir)/$$subdir" \
fi; \ || exit 1; \
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
$(am__relativize); \ $(am__relativize); \
new_distdir=$$reldir; \ new_distdir=$$reldir; \

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.11.3 from Makefile.am. # Makefile.in generated by automake 1.11.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision$ # KDE tags expanded automatically by am_edit - $Revision$
# @configure_input@ # @configure_input@
@ -16,6 +16,23 @@
@SET_MAKE@ @SET_MAKE@
VPATH = @srcdir@ VPATH = @srcdir@
am__make_dryrun = \
{ \
am__dry=no; \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
| grep '^AM OK$$' >/dev/null || am__dry=yes;; \
*) \
for am__flg in $$MAKEFLAGS; do \
case $$am__flg in \
*=*|--*) ;; \
*n*) am__dry=yes; break;; \
esac; \
done;; \
esac; \
test $$am__dry = yes; \
}
pkgdatadir = $(datadir)/@PACKAGE@ pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@
@ -48,6 +65,11 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES = CONFIG_CLEAN_VPATH_FILES =
SOURCES = SOURCES =
DIST_SOURCES = DIST_SOURCES =
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 1 #>+ 1
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@ -141,9 +163,7 @@ LIB_KAB = @LIB_KAB@
LIB_KABC = @LIB_KABC@ LIB_KABC = @LIB_KABC@
LIB_KDED = @LIB_KDED@ LIB_KDED = @LIB_KDED@
LIB_KDNSSD = @LIB_KDNSSD@ LIB_KDNSSD = @LIB_KDNSSD@
LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_KHTML = @LIB_KHTML@
LIB_KIMPROXY = @LIB_KIMPROXY@ LIB_KIMPROXY = @LIB_KIMPROXY@
LIB_KIO = @LIB_KIO@ LIB_KIO = @LIB_KIO@
LIB_KJS = @LIB_KJS@ LIB_KJS = @LIB_KJS@
@ -159,6 +179,8 @@ LIB_QT = @LIB_QT@
LIB_QUI = @LIB_QUI@ LIB_QUI = @LIB_QUI@
LIB_SMB = @LIB_SMB@ LIB_SMB = @LIB_SMB@
LIB_TDECORE = @LIB_TDECORE@ LIB_TDECORE = @LIB_TDECORE@
LIB_TDEFILE = @LIB_TDEFILE@
LIB_TDEHTML = @LIB_TDEHTML@
LIB_TDEPIM = @LIB_TDEPIM@ LIB_TDEPIM = @LIB_TDEPIM@
LIB_TDEPRINT = @LIB_TDEPRINT@ LIB_TDEPRINT = @LIB_TDEPRINT@
LIB_TDEUI = @LIB_TDEUI@ LIB_TDEUI = @LIB_TDEUI@

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.11.3 from Makefile.am. # Makefile.in generated by automake 1.11.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision$ # KDE tags expanded automatically by am_edit - $Revision$
# @configure_input@ # @configure_input@
@ -16,6 +16,23 @@
@SET_MAKE@ @SET_MAKE@
VPATH = @srcdir@ VPATH = @srcdir@
am__make_dryrun = \
{ \
am__dry=no; \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
| grep '^AM OK$$' >/dev/null || am__dry=yes;; \
*) \
for am__flg in $$MAKEFLAGS; do \
case $$am__flg in \
*=*|--*) ;; \
*n*) am__dry=yes; break;; \
esac; \
done;; \
esac; \
test $$am__dry = yes; \
}
pkgdatadir = $(datadir)/@PACKAGE@ pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@
@ -48,6 +65,11 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES = CONFIG_CLEAN_VPATH_FILES =
SOURCES = SOURCES =
DIST_SOURCES = DIST_SOURCES =
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 1 #>+ 1
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@ -141,9 +163,7 @@ LIB_KAB = @LIB_KAB@
LIB_KABC = @LIB_KABC@ LIB_KABC = @LIB_KABC@
LIB_KDED = @LIB_KDED@ LIB_KDED = @LIB_KDED@
LIB_KDNSSD = @LIB_KDNSSD@ LIB_KDNSSD = @LIB_KDNSSD@
LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_KHTML = @LIB_KHTML@
LIB_KIMPROXY = @LIB_KIMPROXY@ LIB_KIMPROXY = @LIB_KIMPROXY@
LIB_KIO = @LIB_KIO@ LIB_KIO = @LIB_KIO@
LIB_KJS = @LIB_KJS@ LIB_KJS = @LIB_KJS@
@ -159,6 +179,8 @@ LIB_QT = @LIB_QT@
LIB_QUI = @LIB_QUI@ LIB_QUI = @LIB_QUI@
LIB_SMB = @LIB_SMB@ LIB_SMB = @LIB_SMB@
LIB_TDECORE = @LIB_TDECORE@ LIB_TDECORE = @LIB_TDECORE@
LIB_TDEFILE = @LIB_TDEFILE@
LIB_TDEHTML = @LIB_TDEHTML@
LIB_TDEPIM = @LIB_TDEPIM@ LIB_TDEPIM = @LIB_TDEPIM@
LIB_TDEPRINT = @LIB_TDEPRINT@ LIB_TDEPRINT = @LIB_TDEPRINT@
LIB_TDEUI = @LIB_TDEUI@ LIB_TDEUI = @LIB_TDEUI@

@ -6,6 +6,6 @@ bin_PROGRAMS = remotefpga_fpgaprogserver
remotefpga_fpgaprogserver_SOURCES = main.cpp fpga_conn.cpp remotefpga_fpgaprogserver_SOURCES = main.cpp fpga_conn.cpp
remotefpga_fpgaprogserver_METASOURCES = AUTO remotefpga_fpgaprogserver_METASOURCES = AUTO
remotefpga_fpgaprogserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -ltdekrbsocket -ltqtrla remotefpga_fpgaprogserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdekrbsocket -ltqtrla
KDE_OPTIONS = nofinal KDE_OPTIONS = nofinal

@ -45,16 +45,16 @@ static const char version[] = "v0.0.1";
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
KAboutData aboutData( "remotefpga_fpgaprog_server", I18N_NOOP("RemoteFPGA FPGA Programming Server"), TDEAboutData aboutData( "remotefpga_fpgaprog_server", I18N_NOOP("RemoteFPGA FPGA Programming Server"),
version, description, KAboutData::License_GPL, version, description, TDEAboutData::License_GPL,
"(c) 2012, Timothy Pearson"); "(c) 2012, Timothy Pearson");
aboutData.addAuthor("Timothy Pearson",0, "kb9vqf@pearsoncomputing.net"); aboutData.addAuthor("Timothy Pearson",0, "kb9vqf@pearsoncomputing.net");
KCmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );
KApplication::disableAutoDcopRegistration(); TDEApplication::disableAutoDcopRegistration();
KApplication app(false, false); TDEApplication app(false, false);
KStartupInfo::appStarted(); TDEStartupInfo::appStarted();
KSimpleConfig config(TQDir::currentDirPath() + "/remotefpga_fpgaprogserver.conf", false); KSimpleConfig config(TQDir::currentDirPath() + "/remotefpga_fpgaprogserver.conf", false);
config.setGroup("Server"); config.setGroup("Server");

@ -636,7 +636,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi fi
if test -n "$trinity14ornewer"; then if test -n "$trinity14ornewer"; then
KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)]) KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)])
AC_SUBST(MAKEKDEWIDGETS) AC_SUBST(MAKEKDEWIDGETS)
@ -2007,7 +2007,7 @@ if test "$kde_qtver" = 1; then
kde_check_lib="libtdecore.la" kde_check_lib="libtdecore.la"
else else
kde_check_header="ksharedptr.h" kde_check_header="ksharedptr.h"
kde_check_lib="libkio.la" kde_check_lib="libtdeio.la"
fi fi
if test -z "$1"; then if test -z "$1"; then
@ -2198,20 +2198,20 @@ cat > conftest.$ac_ext <<EOF
#include <kapp.h> #include <kapp.h>
int main() { int main() {
printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
printf("kde_wallpaperdir=\\"%s\\"\n", printf("kde_wallpaperdir=\\"%s\\"\n",
KApplication::kde_wallpaperdir().data()); TDEApplication::kde_wallpaperdir().data());
printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
printf("kde_moduledir=\\"/tmp/dummy\\"\n"); printf("kde_moduledir=\\"/tmp/dummy\\"\n");
@ -2315,24 +2315,24 @@ if test $kde_qtver = 4; then
AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KIO, "-ltdeio")
AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc") AC_SUBST(LIB_KABC, "-lkabc")
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-lkutils") AC_SUBST(LIB_KUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim") AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-lkimproxy") AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-lkdnssd") AC_SUBST(LIB_KDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-lkunittest") AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio") AC_SUBST(LIB_KSYCOCA, "-ltdeio")
AC_SUBST(LIB_KFILE, "-lkio") AC_SUBST(LIB_TDEFILE, "-ltdeio")
elif test $kde_qtver = 3; then elif test $kde_qtver = 3; then
case $host in case $host in
*cygwin*) lib_kded="-ltdeinit_kded" ;; *cygwin*) lib_kded="-ltdeinit_kded" ;;
@ -2341,41 +2341,41 @@ elif test $kde_qtver = 3; then
AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KIO, "-ltdeio")
AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc") AC_SUBST(LIB_KABC, "-lkabc")
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-lkutils") AC_SUBST(LIB_KUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim") AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-lkimproxy") AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-lkdnssd") AC_SUBST(LIB_KDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-lkunittest") AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio") AC_SUBST(LIB_KSYCOCA, "-ltdeio")
AC_SUBST(LIB_KFILE, "-lkio") AC_SUBST(LIB_TDEFILE, "-ltdeio")
elif test $kde_qtver = 2; then elif test $kde_qtver = 2; then
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KIO, "-ltdeio")
AC_SUBST(LIB_KSYCOCA, "-lksycoca") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile") AC_SUBST(LIB_TDEFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)") AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
fi fi
]) ])
@ -2823,7 +2823,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
test "x$jpeg_incdir" = xNO && jpeg_incdir= test "x$jpeg_incdir" = xNO && jpeg_incdir=
dnl if headers _and_ libraries are missing, this is no error, and we dnl if headers _and_ libraries are missing, this is no error, and we
dnl continue with a warning (the user will get no jpeg support in khtml) dnl continue with a warning (the user will get no jpeg support in tdehtml)
dnl if only one is missing, it means a configuration error, but we still dnl if only one is missing, it means a configuration error, but we still
dnl only warn dnl only warn
if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@ -3890,7 +3890,7 @@ LIBTOOL_SHELL="libtool"
KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)" KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
AC_SUBST(KDE_PLUGIN) AC_SUBST(KDE_PLUGIN)
# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs. # This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)" KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
AC_SUBST(KDE_CHECK_PLUGIN) AC_SUBST(KDE_CHECK_PLUGIN)
@ -4949,7 +4949,8 @@ fi
PYTHONINC=-I$python_incdir PYTHONINC=-I$python_incdir
python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs" python_multiarch_libdirs="`find /usr/lib/ -maxdepth 1 -type d | xargs echo`"
python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $python_multiarch_libdirs $kde_extra_libs"
AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir) AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
if test ! -r $python_libdir/libpython$version.so; then if test ! -r $python_libdir/libpython$version.so; then
AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir) AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
@ -5810,12 +5811,6 @@ if test "x$kde_java_bindir" != "xno"; then
dnl not needed for gcj compile dnl not needed for gcj compile
if test "x$kde_java_libgcjdir" = "x"; then
if test ! -r "$kde_java_libhpidir/libhpi.so"; then
AC_MSG_ERROR([libhpi.so not found under $kde_java_libhpidir. Use --without-java.])
fi
fi
if test -n "$jni_includes"; then if test -n "$jni_includes"; then
dnl Check for JNI version dnl Check for JNI version
AC_LANG_SAVE AC_LANG_SAVE
@ -5852,8 +5847,12 @@ if test "x$kde_java_bindir" != "xno"; then
JAVAH=$kde_java_bindir/javah JAVAH=$kde_java_bindir/javah
JAR=$kde_java_bindir/jar JAR=$kde_java_bindir/jar
AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is]) AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
if test "x$kde_java_libgcjdir" = "x"; then if test "x$kde_java_libgcjdir" = "x"; then
JVMLIBS="-L$kde_java_libjvmdir -ljvm -L$kde_java_libhpidir -lhpi" if test ! -r "$kde_java_libhpidir/libhpi.so"; then
JVMLIBS="-L$kde_java_libjvmdir -ljvm"
else
JVMLIBS="-L$kde_java_libjvmdir -ljvm -L$kde_java_libhpidir -lhpi"
fi
else else
JVMLIBS="-L$kde_java_libgcjdir -lgcj" JVMLIBS="-L$kde_java_libgcjdir -lgcj"
fi fi

@ -1,4 +1,4 @@
# generated automatically by aclocal 1.11.3 -*- Autoconf -*- # generated automatically by aclocal 1.11.6 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
@ -14,8 +14,8 @@
m4_ifndef([AC_AUTOCONF_VERSION], m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
[m4_warning([this file was generated for autoconf 2.68. [m4_warning([this file was generated for autoconf 2.69.
You have another version of autoconf. It may work, but is not guaranteed to. You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely. If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])]) To do so, use the procedure documented by the package, typically `autoreconf'.])])
@ -664,7 +664,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.11' [am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro. dnl require some minimum version. Point them to the right macro.
m4_if([$1], [1.11.3], [], m4_if([$1], [1.11.6], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
]) ])
@ -680,7 +680,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.11.3])dnl [AM_AUTOMAKE_VERSION([1.11.6])dnl
m4_ifndef([AC_AUTOCONF_VERSION], m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.11.3 from Makefile.am. # Makefile.in generated by automake 1.11.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision$ # KDE tags expanded automatically by am_edit - $Revision$
# @configure_input@ # @configure_input@
@ -19,6 +19,23 @@
# the SUBDIRS is filled automatically by am_edit. If files are # the SUBDIRS is filled automatically by am_edit. If files are
# in this directory they are installed into the english dir # in this directory they are installed into the english dir
VPATH = @srcdir@ VPATH = @srcdir@
am__make_dryrun = \
{ \
am__dry=no; \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
| grep '^AM OK$$' >/dev/null || am__dry=yes;; \
*) \
for am__flg in $$MAKEFLAGS; do \
case $$am__flg in \
*=*|--*) ;; \
*n*) am__dry=yes; break;; \
esac; \
done;; \
esac; \
test $$am__dry = yes; \
}
pkgdatadir = $(datadir)/@PACKAGE@ pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@
@ -66,6 +83,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
install-pdf-recursive install-ps-recursive install-recursive \ install-pdf-recursive install-ps-recursive install-recursive \
installcheck-recursive installdirs-recursive pdf-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \
ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive distclean-recursive maintainer-clean-recursive
AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@ -192,9 +214,7 @@ LIB_KAB = @LIB_KAB@
LIB_KABC = @LIB_KABC@ LIB_KABC = @LIB_KABC@
LIB_KDED = @LIB_KDED@ LIB_KDED = @LIB_KDED@
LIB_KDNSSD = @LIB_KDNSSD@ LIB_KDNSSD = @LIB_KDNSSD@
LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_KHTML = @LIB_KHTML@
LIB_KIMPROXY = @LIB_KIMPROXY@ LIB_KIMPROXY = @LIB_KIMPROXY@
LIB_KIO = @LIB_KIO@ LIB_KIO = @LIB_KIO@
LIB_KJS = @LIB_KJS@ LIB_KJS = @LIB_KJS@
@ -210,6 +230,8 @@ LIB_QT = @LIB_QT@
LIB_QUI = @LIB_QUI@ LIB_QUI = @LIB_QUI@
LIB_SMB = @LIB_SMB@ LIB_SMB = @LIB_SMB@
LIB_TDECORE = @LIB_TDECORE@ LIB_TDECORE = @LIB_TDECORE@
LIB_TDEFILE = @LIB_TDEFILE@
LIB_TDEHTML = @LIB_TDEHTML@
LIB_TDEPIM = @LIB_TDEPIM@ LIB_TDEPIM = @LIB_TDEPIM@
LIB_TDEPRINT = @LIB_TDEPRINT@ LIB_TDEPRINT = @LIB_TDEPRINT@
LIB_TDEUI = @LIB_TDEUI@ LIB_TDEUI = @LIB_TDEUI@
@ -592,13 +614,10 @@ distdir: $(DISTFILES)
done done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \ if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \ $(am__make_dryrun) \
|| $(MKDIR_P) "$(distdir)/$$subdir" \ || test -d "$(distdir)/$$subdir" \
|| exit 1; \ || $(MKDIR_P) "$(distdir)/$$subdir" \
fi; \ || exit 1; \
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
$(am__relativize); \ $(am__relativize); \
new_distdir=$$reldir; \ new_distdir=$$reldir; \

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.11.3 from Makefile.am. # Makefile.in generated by automake 1.11.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision$ # KDE tags expanded automatically by am_edit - $Revision$
# @configure_input@ # @configure_input@
@ -16,6 +16,23 @@
@SET_MAKE@ @SET_MAKE@
VPATH = @srcdir@ VPATH = @srcdir@
am__make_dryrun = \
{ \
am__dry=no; \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
| grep '^AM OK$$' >/dev/null || am__dry=yes;; \
*) \
for am__flg in $$MAKEFLAGS; do \
case $$am__flg in \
*=*|--*) ;; \
*n*) am__dry=yes; break;; \
esac; \
done;; \
esac; \
test $$am__dry = yes; \
}
pkgdatadir = $(datadir)/@PACKAGE@ pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@
@ -48,6 +65,11 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES = CONFIG_CLEAN_VPATH_FILES =
SOURCES = SOURCES =
DIST_SOURCES = DIST_SOURCES =
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 1 #>+ 1
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@ -141,9 +163,7 @@ LIB_KAB = @LIB_KAB@
LIB_KABC = @LIB_KABC@ LIB_KABC = @LIB_KABC@
LIB_KDED = @LIB_KDED@ LIB_KDED = @LIB_KDED@
LIB_KDNSSD = @LIB_KDNSSD@ LIB_KDNSSD = @LIB_KDNSSD@
LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_KHTML = @LIB_KHTML@
LIB_KIMPROXY = @LIB_KIMPROXY@ LIB_KIMPROXY = @LIB_KIMPROXY@
LIB_KIO = @LIB_KIO@ LIB_KIO = @LIB_KIO@
LIB_KJS = @LIB_KJS@ LIB_KJS = @LIB_KJS@
@ -159,6 +179,8 @@ LIB_QT = @LIB_QT@
LIB_QUI = @LIB_QUI@ LIB_QUI = @LIB_QUI@
LIB_SMB = @LIB_SMB@ LIB_SMB = @LIB_SMB@
LIB_TDECORE = @LIB_TDECORE@ LIB_TDECORE = @LIB_TDECORE@
LIB_TDEFILE = @LIB_TDEFILE@
LIB_TDEHTML = @LIB_TDEHTML@
LIB_TDEPIM = @LIB_TDEPIM@ LIB_TDEPIM = @LIB_TDEPIM@
LIB_TDEPRINT = @LIB_TDEPRINT@ LIB_TDEPRINT = @LIB_TDEPRINT@
LIB_TDEUI = @LIB_TDEUI@ LIB_TDEUI = @LIB_TDEUI@

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.11.3 from Makefile.am. # Makefile.in generated by automake 1.11.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision$ # KDE tags expanded automatically by am_edit - $Revision$
# @configure_input@ # @configure_input@
@ -16,6 +16,23 @@
@SET_MAKE@ @SET_MAKE@
VPATH = @srcdir@ VPATH = @srcdir@
am__make_dryrun = \
{ \
am__dry=no; \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
| grep '^AM OK$$' >/dev/null || am__dry=yes;; \
*) \
for am__flg in $$MAKEFLAGS; do \
case $$am__flg in \
*=*|--*) ;; \
*n*) am__dry=yes; break;; \
esac; \
done;; \
esac; \
test $$am__dry = yes; \
}
pkgdatadir = $(datadir)/@PACKAGE@ pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@
@ -48,6 +65,11 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES = CONFIG_CLEAN_VPATH_FILES =
SOURCES = SOURCES =
DIST_SOURCES = DIST_SOURCES =
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 1 #>+ 1
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@ -141,9 +163,7 @@ LIB_KAB = @LIB_KAB@
LIB_KABC = @LIB_KABC@ LIB_KABC = @LIB_KABC@
LIB_KDED = @LIB_KDED@ LIB_KDED = @LIB_KDED@
LIB_KDNSSD = @LIB_KDNSSD@ LIB_KDNSSD = @LIB_KDNSSD@
LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_KHTML = @LIB_KHTML@
LIB_KIMPROXY = @LIB_KIMPROXY@ LIB_KIMPROXY = @LIB_KIMPROXY@
LIB_KIO = @LIB_KIO@ LIB_KIO = @LIB_KIO@
LIB_KJS = @LIB_KJS@ LIB_KJS = @LIB_KJS@
@ -159,6 +179,8 @@ LIB_QT = @LIB_QT@
LIB_QUI = @LIB_QUI@ LIB_QUI = @LIB_QUI@
LIB_SMB = @LIB_SMB@ LIB_SMB = @LIB_SMB@
LIB_TDECORE = @LIB_TDECORE@ LIB_TDECORE = @LIB_TDECORE@
LIB_TDEFILE = @LIB_TDEFILE@
LIB_TDEHTML = @LIB_TDEHTML@
LIB_TDEPIM = @LIB_TDEPIM@ LIB_TDEPIM = @LIB_TDEPIM@
LIB_TDEPRINT = @LIB_TDEPRINT@ LIB_TDEPRINT = @LIB_TDEPRINT@
LIB_TDEUI = @LIB_TDEUI@ LIB_TDEUI = @LIB_TDEUI@

@ -6,6 +6,6 @@ bin_PROGRAMS = remotefpga_fpgaserver
remotefpga_fpgaserver_SOURCES = main.cpp fpga_conn.cpp remotefpga_fpgaserver_SOURCES = main.cpp fpga_conn.cpp
remotefpga_fpgaserver_METASOURCES = AUTO remotefpga_fpgaserver_METASOURCES = AUTO
remotefpga_fpgaserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -ltdekrbsocket -ltqtrla remotefpga_fpgaserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdekrbsocket -ltqtrla
KDE_OPTIONS = nofinal KDE_OPTIONS = nofinal

@ -45,16 +45,16 @@ static const char version[] = "v0.0.1";
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
KAboutData aboutData( "remotefpga_fpga_server", I18N_NOOP("RemoteFPGA FPGA Viewer Server"), TDEAboutData aboutData( "remotefpga_fpga_server", I18N_NOOP("RemoteFPGA FPGA Viewer Server"),
version, description, KAboutData::License_GPL, version, description, TDEAboutData::License_GPL,
"(c) 2012, Timothy Pearson"); "(c) 2012, Timothy Pearson");
aboutData.addAuthor("Timothy Pearson",0, "kb9vqf@pearsoncomputing.net"); aboutData.addAuthor("Timothy Pearson",0, "kb9vqf@pearsoncomputing.net");
KCmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );
KApplication::disableAutoDcopRegistration(); TDEApplication::disableAutoDcopRegistration();
KApplication app(false, false); TDEApplication app(false, false);
KStartupInfo::appStarted(); TDEStartupInfo::appStarted();
KSimpleConfig config(TQDir::currentDirPath() + "/remotefpga_fpgaserver.conf", false); KSimpleConfig config(TQDir::currentDirPath() + "/remotefpga_fpgaserver.conf", false);
config.setGroup("Server"); config.setGroup("Server");

@ -636,7 +636,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi fi
if test -n "$trinity14ornewer"; then if test -n "$trinity14ornewer"; then
KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)]) KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)])
AC_SUBST(MAKEKDEWIDGETS) AC_SUBST(MAKEKDEWIDGETS)
@ -2007,7 +2007,7 @@ if test "$kde_qtver" = 1; then
kde_check_lib="libtdecore.la" kde_check_lib="libtdecore.la"
else else
kde_check_header="ksharedptr.h" kde_check_header="ksharedptr.h"
kde_check_lib="libkio.la" kde_check_lib="libtdeio.la"
fi fi
if test -z "$1"; then if test -z "$1"; then
@ -2198,20 +2198,20 @@ cat > conftest.$ac_ext <<EOF
#include <kapp.h> #include <kapp.h>
int main() { int main() {
printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
printf("kde_wallpaperdir=\\"%s\\"\n", printf("kde_wallpaperdir=\\"%s\\"\n",
KApplication::kde_wallpaperdir().data()); TDEApplication::kde_wallpaperdir().data());
printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
printf("kde_moduledir=\\"/tmp/dummy\\"\n"); printf("kde_moduledir=\\"/tmp/dummy\\"\n");
@ -2315,24 +2315,24 @@ if test $kde_qtver = 4; then
AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KIO, "-ltdeio")
AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc") AC_SUBST(LIB_KABC, "-lkabc")
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-lkutils") AC_SUBST(LIB_KUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim") AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-lkimproxy") AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-lkdnssd") AC_SUBST(LIB_KDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-lkunittest") AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio") AC_SUBST(LIB_KSYCOCA, "-ltdeio")
AC_SUBST(LIB_KFILE, "-lkio") AC_SUBST(LIB_TDEFILE, "-ltdeio")
elif test $kde_qtver = 3; then elif test $kde_qtver = 3; then
case $host in case $host in
*cygwin*) lib_kded="-ltdeinit_kded" ;; *cygwin*) lib_kded="-ltdeinit_kded" ;;
@ -2341,41 +2341,41 @@ elif test $kde_qtver = 3; then
AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KIO, "-ltdeio")
AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc") AC_SUBST(LIB_KABC, "-lkabc")
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-lkutils") AC_SUBST(LIB_KUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim") AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-lkimproxy") AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-lkdnssd") AC_SUBST(LIB_KDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-lkunittest") AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio") AC_SUBST(LIB_KSYCOCA, "-ltdeio")
AC_SUBST(LIB_KFILE, "-lkio") AC_SUBST(LIB_TDEFILE, "-ltdeio")
elif test $kde_qtver = 2; then elif test $kde_qtver = 2; then
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KIO, "-ltdeio")
AC_SUBST(LIB_KSYCOCA, "-lksycoca") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile") AC_SUBST(LIB_TDEFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)") AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
fi fi
]) ])
@ -2823,7 +2823,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
test "x$jpeg_incdir" = xNO && jpeg_incdir= test "x$jpeg_incdir" = xNO && jpeg_incdir=
dnl if headers _and_ libraries are missing, this is no error, and we dnl if headers _and_ libraries are missing, this is no error, and we
dnl continue with a warning (the user will get no jpeg support in khtml) dnl continue with a warning (the user will get no jpeg support in tdehtml)
dnl if only one is missing, it means a configuration error, but we still dnl if only one is missing, it means a configuration error, but we still
dnl only warn dnl only warn
if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@ -3890,7 +3890,7 @@ LIBTOOL_SHELL="libtool"
KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)" KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
AC_SUBST(KDE_PLUGIN) AC_SUBST(KDE_PLUGIN)
# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs. # This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)" KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
AC_SUBST(KDE_CHECK_PLUGIN) AC_SUBST(KDE_CHECK_PLUGIN)
@ -4949,7 +4949,8 @@ fi
PYTHONINC=-I$python_incdir PYTHONINC=-I$python_incdir
python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs" python_multiarch_libdirs="`find /usr/lib/ -maxdepth 1 -type d | xargs echo`"
python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $python_multiarch_libdirs $kde_extra_libs"
AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir) AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
if test ! -r $python_libdir/libpython$version.so; then if test ! -r $python_libdir/libpython$version.so; then
AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir) AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
@ -5810,12 +5811,6 @@ if test "x$kde_java_bindir" != "xno"; then
dnl not needed for gcj compile dnl not needed for gcj compile
if test "x$kde_java_libgcjdir" = "x"; then
if test ! -r "$kde_java_libhpidir/libhpi.so"; then
AC_MSG_ERROR([libhpi.so not found under $kde_java_libhpidir. Use --without-java.])
fi
fi
if test -n "$jni_includes"; then if test -n "$jni_includes"; then
dnl Check for JNI version dnl Check for JNI version
AC_LANG_SAVE AC_LANG_SAVE
@ -5852,8 +5847,12 @@ if test "x$kde_java_bindir" != "xno"; then
JAVAH=$kde_java_bindir/javah JAVAH=$kde_java_bindir/javah
JAR=$kde_java_bindir/jar JAR=$kde_java_bindir/jar
AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is]) AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
if test "x$kde_java_libgcjdir" = "x"; then if test "x$kde_java_libgcjdir" = "x"; then
JVMLIBS="-L$kde_java_libjvmdir -ljvm -L$kde_java_libhpidir -lhpi" if test ! -r "$kde_java_libhpidir/libhpi.so"; then
JVMLIBS="-L$kde_java_libjvmdir -ljvm"
else
JVMLIBS="-L$kde_java_libjvmdir -ljvm -L$kde_java_libhpidir -lhpi"
fi
else else
JVMLIBS="-L$kde_java_libgcjdir -lgcj" JVMLIBS="-L$kde_java_libgcjdir -lgcj"
fi fi

@ -1,4 +1,4 @@
# generated automatically by aclocal 1.11.3 -*- Autoconf -*- # generated automatically by aclocal 1.11.6 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
@ -14,8 +14,8 @@
m4_ifndef([AC_AUTOCONF_VERSION], m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
[m4_warning([this file was generated for autoconf 2.68. [m4_warning([this file was generated for autoconf 2.69.
You have another version of autoconf. It may work, but is not guaranteed to. You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely. If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])]) To do so, use the procedure documented by the package, typically `autoreconf'.])])
@ -664,7 +664,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.11' [am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro. dnl require some minimum version. Point them to the right macro.
m4_if([$1], [1.11.3], [], m4_if([$1], [1.11.6], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
]) ])
@ -680,7 +680,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.11.3])dnl [AM_AUTOMAKE_VERSION([1.11.6])dnl
m4_ifndef([AC_AUTOCONF_VERSION], m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.11.3 from Makefile.am. # Makefile.in generated by automake 1.11.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision$ # KDE tags expanded automatically by am_edit - $Revision$
# @configure_input@ # @configure_input@
@ -19,6 +19,23 @@
# the SUBDIRS is filled automatically by am_edit. If files are # the SUBDIRS is filled automatically by am_edit. If files are
# in this directory they are installed into the english dir # in this directory they are installed into the english dir
VPATH = @srcdir@ VPATH = @srcdir@
am__make_dryrun = \
{ \
am__dry=no; \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
| grep '^AM OK$$' >/dev/null || am__dry=yes;; \
*) \
for am__flg in $$MAKEFLAGS; do \
case $$am__flg in \
*=*|--*) ;; \
*n*) am__dry=yes; break;; \
esac; \
done;; \
esac; \
test $$am__dry = yes; \
}
pkgdatadir = $(datadir)/@PACKAGE@ pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@
@ -66,6 +83,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
install-pdf-recursive install-ps-recursive install-recursive \ install-pdf-recursive install-ps-recursive install-recursive \
installcheck-recursive installdirs-recursive pdf-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \
ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive distclean-recursive maintainer-clean-recursive
AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@ -192,9 +214,7 @@ LIB_KAB = @LIB_KAB@
LIB_KABC = @LIB_KABC@ LIB_KABC = @LIB_KABC@
LIB_KDED = @LIB_KDED@ LIB_KDED = @LIB_KDED@
LIB_KDNSSD = @LIB_KDNSSD@ LIB_KDNSSD = @LIB_KDNSSD@
LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_KHTML = @LIB_KHTML@
LIB_KIMPROXY = @LIB_KIMPROXY@ LIB_KIMPROXY = @LIB_KIMPROXY@
LIB_KIO = @LIB_KIO@ LIB_KIO = @LIB_KIO@
LIB_KJS = @LIB_KJS@ LIB_KJS = @LIB_KJS@
@ -210,6 +230,8 @@ LIB_QT = @LIB_QT@
LIB_QUI = @LIB_QUI@ LIB_QUI = @LIB_QUI@
LIB_SMB = @LIB_SMB@ LIB_SMB = @LIB_SMB@
LIB_TDECORE = @LIB_TDECORE@ LIB_TDECORE = @LIB_TDECORE@
LIB_TDEFILE = @LIB_TDEFILE@
LIB_TDEHTML = @LIB_TDEHTML@
LIB_TDEPIM = @LIB_TDEPIM@ LIB_TDEPIM = @LIB_TDEPIM@
LIB_TDEPRINT = @LIB_TDEPRINT@ LIB_TDEPRINT = @LIB_TDEPRINT@
LIB_TDEUI = @LIB_TDEUI@ LIB_TDEUI = @LIB_TDEUI@
@ -592,13 +614,10 @@ distdir: $(DISTFILES)
done done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \ if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \ $(am__make_dryrun) \
|| $(MKDIR_P) "$(distdir)/$$subdir" \ || test -d "$(distdir)/$$subdir" \
|| exit 1; \ || $(MKDIR_P) "$(distdir)/$$subdir" \
fi; \ || exit 1; \
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
$(am__relativize); \ $(am__relativize); \
new_distdir=$$reldir; \ new_distdir=$$reldir; \

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.11.3 from Makefile.am. # Makefile.in generated by automake 1.11.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision$ # KDE tags expanded automatically by am_edit - $Revision$
# @configure_input@ # @configure_input@
@ -16,6 +16,23 @@
@SET_MAKE@ @SET_MAKE@
VPATH = @srcdir@ VPATH = @srcdir@
am__make_dryrun = \
{ \
am__dry=no; \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
| grep '^AM OK$$' >/dev/null || am__dry=yes;; \
*) \
for am__flg in $$MAKEFLAGS; do \
case $$am__flg in \
*=*|--*) ;; \
*n*) am__dry=yes; break;; \
esac; \
done;; \
esac; \
test $$am__dry = yes; \
}
pkgdatadir = $(datadir)/@PACKAGE@ pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@
@ -48,6 +65,11 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES = CONFIG_CLEAN_VPATH_FILES =
SOURCES = SOURCES =
DIST_SOURCES = DIST_SOURCES =
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 1 #>+ 1
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@ -141,9 +163,7 @@ LIB_KAB = @LIB_KAB@
LIB_KABC = @LIB_KABC@ LIB_KABC = @LIB_KABC@
LIB_KDED = @LIB_KDED@ LIB_KDED = @LIB_KDED@
LIB_KDNSSD = @LIB_KDNSSD@ LIB_KDNSSD = @LIB_KDNSSD@
LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_KHTML = @LIB_KHTML@
LIB_KIMPROXY = @LIB_KIMPROXY@ LIB_KIMPROXY = @LIB_KIMPROXY@
LIB_KIO = @LIB_KIO@ LIB_KIO = @LIB_KIO@
LIB_KJS = @LIB_KJS@ LIB_KJS = @LIB_KJS@
@ -159,6 +179,8 @@ LIB_QT = @LIB_QT@
LIB_QUI = @LIB_QUI@ LIB_QUI = @LIB_QUI@
LIB_SMB = @LIB_SMB@ LIB_SMB = @LIB_SMB@
LIB_TDECORE = @LIB_TDECORE@ LIB_TDECORE = @LIB_TDECORE@
LIB_TDEFILE = @LIB_TDEFILE@
LIB_TDEHTML = @LIB_TDEHTML@
LIB_TDEPIM = @LIB_TDEPIM@ LIB_TDEPIM = @LIB_TDEPIM@
LIB_TDEPRINT = @LIB_TDEPRINT@ LIB_TDEPRINT = @LIB_TDEPRINT@
LIB_TDEUI = @LIB_TDEUI@ LIB_TDEUI = @LIB_TDEUI@

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.11.3 from Makefile.am. # Makefile.in generated by automake 1.11.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision$ # KDE tags expanded automatically by am_edit - $Revision$
# @configure_input@ # @configure_input@
@ -16,6 +16,23 @@
@SET_MAKE@ @SET_MAKE@
VPATH = @srcdir@ VPATH = @srcdir@
am__make_dryrun = \
{ \
am__dry=no; \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
| grep '^AM OK$$' >/dev/null || am__dry=yes;; \
*) \
for am__flg in $$MAKEFLAGS; do \
case $$am__flg in \
*=*|--*) ;; \
*n*) am__dry=yes; break;; \
esac; \
done;; \
esac; \
test $$am__dry = yes; \
}
pkgdatadir = $(datadir)/@PACKAGE@ pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@
@ -48,6 +65,11 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES = CONFIG_CLEAN_VPATH_FILES =
SOURCES = SOURCES =
DIST_SOURCES = DIST_SOURCES =
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 1 #>+ 1
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@ -141,9 +163,7 @@ LIB_KAB = @LIB_KAB@
LIB_KABC = @LIB_KABC@ LIB_KABC = @LIB_KABC@
LIB_KDED = @LIB_KDED@ LIB_KDED = @LIB_KDED@
LIB_KDNSSD = @LIB_KDNSSD@ LIB_KDNSSD = @LIB_KDNSSD@
LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_KHTML = @LIB_KHTML@
LIB_KIMPROXY = @LIB_KIMPROXY@ LIB_KIMPROXY = @LIB_KIMPROXY@
LIB_KIO = @LIB_KIO@ LIB_KIO = @LIB_KIO@
LIB_KJS = @LIB_KJS@ LIB_KJS = @LIB_KJS@
@ -159,6 +179,8 @@ LIB_QT = @LIB_QT@
LIB_QUI = @LIB_QUI@ LIB_QUI = @LIB_QUI@
LIB_SMB = @LIB_SMB@ LIB_SMB = @LIB_SMB@
LIB_TDECORE = @LIB_TDECORE@ LIB_TDECORE = @LIB_TDECORE@
LIB_TDEFILE = @LIB_TDEFILE@
LIB_TDEHTML = @LIB_TDEHTML@
LIB_TDEPIM = @LIB_TDEPIM@ LIB_TDEPIM = @LIB_TDEPIM@
LIB_TDEPRINT = @LIB_TDEPRINT@ LIB_TDEPRINT = @LIB_TDEPRINT@
LIB_TDEUI = @LIB_TDEUI@ LIB_TDEUI = @LIB_TDEUI@

@ -6,6 +6,6 @@ bin_PROGRAMS = remotefpga_gpibserver
remotefpga_gpibserver_SOURCES = commanalyzer_functions.cpp gpib_functions.cpp scope_functions.cpp signal_functions.cpp main.cpp gpib_conn.cpp remotefpga_gpibserver_SOURCES = commanalyzer_functions.cpp gpib_functions.cpp scope_functions.cpp signal_functions.cpp main.cpp gpib_conn.cpp
remotefpga_gpibserver_METASOURCES = AUTO remotefpga_gpibserver_METASOURCES = AUTO
remotefpga_gpibserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -ltdekrbsocket -ltqtrla -lgpib remotefpga_gpibserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdekrbsocket -ltqtrla -lgpib
KDE_OPTIONS = nofinal KDE_OPTIONS = nofinal

@ -45,16 +45,16 @@ static const char version[] = "v0.0.1";
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
KAboutData aboutData( "remotefpga_gpib_server", I18N_NOOP("RemoteFPGA GPIB Server"), TDEAboutData aboutData( "remotefpga_gpib_server", I18N_NOOP("RemoteFPGA GPIB Server"),
version, description, KAboutData::License_GPL, version, description, TDEAboutData::License_GPL,
"(c) 2012, Timothy Pearson"); "(c) 2012, Timothy Pearson");
aboutData.addAuthor("Timothy Pearson",0, "kb9vqf@pearsoncomputing.net"); aboutData.addAuthor("Timothy Pearson",0, "kb9vqf@pearsoncomputing.net");
KCmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );
KApplication::disableAutoDcopRegistration(); TDEApplication::disableAutoDcopRegistration();
KApplication app(false, false); TDEApplication app(false, false);
KStartupInfo::appStarted(); TDEStartupInfo::appStarted();
KSimpleConfig config(TQDir::currentDirPath() + "/remotefpga_gpibserver.conf", false); KSimpleConfig config(TQDir::currentDirPath() + "/remotefpga_gpibserver.conf", false);
config.setGroup("Server"); config.setGroup("Server");

@ -636,7 +636,7 @@ AC_DEFUN([KDE_SUBST_PROGRAMS],
fi fi
if test -n "$trinity14ornewer"; then if test -n "$trinity14ornewer"; then
KDE_FIND_PATH(kconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(kconfig_compiler)]) KDE_FIND_PATH(tdeconfig_compiler, KCONFIG_COMPILER, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(tdeconfig_compiler)])
KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)]) KDE_FIND_PATH(dcopidlng, DCOPIDLNG, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(dcopidlng)])
KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)]) KDE_FIND_PATH(makekdewidgets, MAKEKDEWIDGETS, [$kde_default_bindirs], [KDE_MISSING_PROG_ERROR(makekdewidgets)])
AC_SUBST(MAKEKDEWIDGETS) AC_SUBST(MAKEKDEWIDGETS)
@ -2007,7 +2007,7 @@ if test "$kde_qtver" = 1; then
kde_check_lib="libtdecore.la" kde_check_lib="libtdecore.la"
else else
kde_check_header="ksharedptr.h" kde_check_header="ksharedptr.h"
kde_check_lib="libkio.la" kde_check_lib="libtdeio.la"
fi fi
if test -z "$1"; then if test -z "$1"; then
@ -2198,20 +2198,20 @@ cat > conftest.$ac_ext <<EOF
#include <kapp.h> #include <kapp.h>
int main() { int main() {
printf("kde_htmldir=\\"%s\\"\n", KApplication::kde_htmldir().data()); printf("kde_htmldir=\\"%s\\"\n", TDEApplication::kde_htmldir().data());
printf("kde_appsdir=\\"%s\\"\n", KApplication::kde_appsdir().data()); printf("kde_appsdir=\\"%s\\"\n", TDEApplication::kde_appsdir().data());
printf("kde_icondir=\\"%s\\"\n", KApplication::kde_icondir().data()); printf("kde_icondir=\\"%s\\"\n", TDEApplication::kde_icondir().data());
printf("kde_sounddir=\\"%s\\"\n", KApplication::kde_sounddir().data()); printf("kde_sounddir=\\"%s\\"\n", TDEApplication::kde_sounddir().data());
printf("kde_datadir=\\"%s\\"\n", KApplication::kde_datadir().data()); printf("kde_datadir=\\"%s\\"\n", TDEApplication::kde_datadir().data());
printf("kde_locale=\\"%s\\"\n", KApplication::kde_localedir().data()); printf("kde_locale=\\"%s\\"\n", TDEApplication::kde_localedir().data());
printf("kde_cgidir=\\"%s\\"\n", KApplication::kde_cgidir().data()); printf("kde_cgidir=\\"%s\\"\n", TDEApplication::kde_cgidir().data());
printf("kde_confdir=\\"%s\\"\n", KApplication::kde_configdir().data()); printf("kde_confdir=\\"%s\\"\n", TDEApplication::kde_configdir().data());
printf("kde_mimedir=\\"%s\\"\n", KApplication::kde_mimedir().data()); printf("kde_mimedir=\\"%s\\"\n", TDEApplication::kde_mimedir().data());
printf("kde_toolbardir=\\"%s\\"\n", KApplication::kde_toolbardir().data()); printf("kde_toolbardir=\\"%s\\"\n", TDEApplication::kde_toolbardir().data());
printf("kde_wallpaperdir=\\"%s\\"\n", printf("kde_wallpaperdir=\\"%s\\"\n",
KApplication::kde_wallpaperdir().data()); TDEApplication::kde_wallpaperdir().data());
printf("kde_bindir=\\"%s\\"\n", KApplication::kde_bindir().data()); printf("kde_bindir=\\"%s\\"\n", TDEApplication::kde_bindir().data());
printf("kde_partsdir=\\"%s\\"\n", KApplication::kde_partsdir().data()); printf("kde_partsdir=\\"%s\\"\n", TDEApplication::kde_partsdir().data());
printf("kde_servicesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicesdir=\\"/tmp/dummy\\"\n");
printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n"); printf("kde_servicetypesdir=\\"/tmp/dummy\\"\n");
printf("kde_moduledir=\\"/tmp/dummy\\"\n"); printf("kde_moduledir=\\"/tmp/dummy\\"\n");
@ -2315,24 +2315,24 @@ if test $kde_qtver = 4; then
AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KIO, "-ltdeio")
AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc") AC_SUBST(LIB_KABC, "-lkabc")
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-lkutils") AC_SUBST(LIB_KUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim") AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-lkimproxy") AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-lkdnssd") AC_SUBST(LIB_KDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-lkunittest") AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio") AC_SUBST(LIB_KSYCOCA, "-ltdeio")
AC_SUBST(LIB_KFILE, "-lkio") AC_SUBST(LIB_TDEFILE, "-ltdeio")
elif test $kde_qtver = 3; then elif test $kde_qtver = 3; then
case $host in case $host in
*cygwin*) lib_kded="-ltdeinit_kded" ;; *cygwin*) lib_kded="-ltdeinit_kded" ;;
@ -2341,41 +2341,41 @@ elif test $kde_qtver = 3; then
AC_SUBST(LIB_KDED, $lib_kded) AC_SUBST(LIB_KDED, $lib_kded)
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KIO, "-ltdeio")
AC_SUBST(LIB_KJS, "-lkjs") AC_SUBST(LIB_KJS, "-lkjs")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KABC, "-lkabc") AC_SUBST(LIB_KABC, "-lkabc")
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
AC_SUBST(LIB_KUTILS, "-lkutils") AC_SUBST(LIB_KUTILS, "-ltdeutils")
AC_SUBST(LIB_TDEPIM, "-ltdepim") AC_SUBST(LIB_TDEPIM, "-ltdepim")
AC_SUBST(LIB_KIMPROXY, "-lkimproxy") AC_SUBST(LIB_KIMPROXY, "-ltdeimproxy")
AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff") AC_SUBST(LIB_KNEWSTUFF, "-lknewstuff")
AC_SUBST(LIB_KDNSSD, "-lkdnssd") AC_SUBST(LIB_KDNSSD, "-ltdednssd")
AC_SUBST(LIB_KUNITTEST, "-lkunittest") AC_SUBST(LIB_KUNITTEST, "-ltdeunittest")
# these are for backward compatibility # these are for backward compatibility
AC_SUBST(LIB_KSYCOCA, "-lkio") AC_SUBST(LIB_KSYCOCA, "-ltdeio")
AC_SUBST(LIB_KFILE, "-lkio") AC_SUBST(LIB_TDEFILE, "-ltdeio")
elif test $kde_qtver = 2; then elif test $kde_qtver = 2; then
AC_SUBST(LIB_TDECORE, "-ltdecore") AC_SUBST(LIB_TDECORE, "-ltdecore")
AC_SUBST(LIB_TDEUI, "-ltdeui") AC_SUBST(LIB_TDEUI, "-ltdeui")
AC_SUBST(LIB_KIO, "-lkio") AC_SUBST(LIB_KIO, "-ltdeio")
AC_SUBST(LIB_KSYCOCA, "-lksycoca") AC_SUBST(LIB_KSYCOCA, "-ltdesycoca")
AC_SUBST(LIB_SMB, "-lsmb") AC_SUBST(LIB_SMB, "-lsmb")
AC_SUBST(LIB_KFILE, "-lkfile") AC_SUBST(LIB_TDEFILE, "-ltdefile")
AC_SUBST(LIB_KAB, "-lkab") AC_SUBST(LIB_KAB, "-lkab")
AC_SUBST(LIB_KHTML, "-lkhtml") AC_SUBST(LIB_TDEHTML, "-ltdehtml")
AC_SUBST(LIB_KSPELL, "-lkspell") AC_SUBST(LIB_KSPELL, "-ltdespell")
AC_SUBST(LIB_KPARTS, "-lkparts") AC_SUBST(LIB_KPARTS, "-ltdeparts")
AC_SUBST(LIB_TDEPRINT, "-ltdeprint") AC_SUBST(LIB_TDEPRINT, "-ltdeprint")
else else
AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)") AC_SUBST(LIB_TDECORE, "-ltdecore -lXext $(LIB_QT)")
AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)") AC_SUBST(LIB_TDEUI, "-ltdeui $(LIB_TDECORE)")
AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)") AC_SUBST(LIB_KFM, "-lkfm $(LIB_TDECORE)")
AC_SUBST(LIB_KFILE, "-lkfile $(LIB_KFM) $(LIB_TDEUI)") AC_SUBST(LIB_TDEFILE, "-ltdefile $(LIB_KFM) $(LIB_TDEUI)")
AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)") AC_SUBST(LIB_KAB, "-lkab $(LIB_KIMGIO) $(LIB_TDECORE)")
fi fi
]) ])
@ -2823,7 +2823,7 @@ AC_FIND_FILE(jpeglib.h, $jpeg_incdirs, jpeg_incdir)
test "x$jpeg_incdir" = xNO && jpeg_incdir= test "x$jpeg_incdir" = xNO && jpeg_incdir=
dnl if headers _and_ libraries are missing, this is no error, and we dnl if headers _and_ libraries are missing, this is no error, and we
dnl continue with a warning (the user will get no jpeg support in khtml) dnl continue with a warning (the user will get no jpeg support in tdehtml)
dnl if only one is missing, it means a configuration error, but we still dnl if only one is missing, it means a configuration error, but we still
dnl only warn dnl only warn
if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then if test -n "$jpeg_incdir" && test -n "$LIBJPEG" ; then
@ -3890,7 +3890,7 @@ LIBTOOL_SHELL="libtool"
KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)" KDE_PLUGIN="-avoid-version -module -no-undefined \$(KDE_NO_UNDEFINED) \$(KDE_RPATH) \$(KDE_MT_LDFLAGS)"
AC_SUBST(KDE_PLUGIN) AC_SUBST(KDE_PLUGIN)
# This hack ensures that libtool creates shared libs for kunittest plugins. By default check_LTLIBRARIES makes static libs. # This hack ensures that libtool creates shared libs for tdeunittest plugins. By default check_LTLIBRARIES makes static libs.
KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)" KDE_CHECK_PLUGIN="\$(KDE_PLUGIN) -rpath \$(libdir)"
AC_SUBST(KDE_CHECK_PLUGIN) AC_SUBST(KDE_CHECK_PLUGIN)
@ -4949,7 +4949,8 @@ fi
PYTHONINC=-I$python_incdir PYTHONINC=-I$python_incdir
python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $kde_extra_libs" python_multiarch_libdirs="`find /usr/lib/ -maxdepth 1 -type d | xargs echo`"
python_libdirs="$ac_python_dir/lib$tdelibsuff /usr/lib$tdelibsuff /usr/local /usr/lib$tdelibsuff $python_multiarch_libdirs $kde_extra_libs"
AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir) AC_FIND_FILE(libpython$version.so, $python_libdirs, python_libdir)
if test ! -r $python_libdir/libpython$version.so; then if test ! -r $python_libdir/libpython$version.so; then
AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir) AC_FIND_FILE(libpython$version.a, $python_libdirs, python_libdir)
@ -5810,12 +5811,6 @@ if test "x$kde_java_bindir" != "xno"; then
dnl not needed for gcj compile dnl not needed for gcj compile
if test "x$kde_java_libgcjdir" = "x"; then
if test ! -r "$kde_java_libhpidir/libhpi.so"; then
AC_MSG_ERROR([libhpi.so not found under $kde_java_libhpidir. Use --without-java.])
fi
fi
if test -n "$jni_includes"; then if test -n "$jni_includes"; then
dnl Check for JNI version dnl Check for JNI version
AC_LANG_SAVE AC_LANG_SAVE
@ -5852,8 +5847,12 @@ if test "x$kde_java_bindir" != "xno"; then
JAVAH=$kde_java_bindir/javah JAVAH=$kde_java_bindir/javah
JAR=$kde_java_bindir/jar JAR=$kde_java_bindir/jar
AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is]) AC_DEFINE_UNQUOTED(PATH_JAVA, "$kde_java_bindir/java", [Define where your java executable is])
if test "x$kde_java_libgcjdir" = "x"; then if test "x$kde_java_libgcjdir" = "x"; then
JVMLIBS="-L$kde_java_libjvmdir -ljvm -L$kde_java_libhpidir -lhpi" if test ! -r "$kde_java_libhpidir/libhpi.so"; then
JVMLIBS="-L$kde_java_libjvmdir -ljvm"
else
JVMLIBS="-L$kde_java_libjvmdir -ljvm -L$kde_java_libhpidir -lhpi"
fi
else else
JVMLIBS="-L$kde_java_libgcjdir -lgcj" JVMLIBS="-L$kde_java_libgcjdir -lgcj"
fi fi

@ -1,4 +1,4 @@
# generated automatically by aclocal 1.11.3 -*- Autoconf -*- # generated automatically by aclocal 1.11.6 -*- Autoconf -*-
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, # 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
@ -14,8 +14,8 @@
m4_ifndef([AC_AUTOCONF_VERSION], m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.68],, m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
[m4_warning([this file was generated for autoconf 2.68. [m4_warning([this file was generated for autoconf 2.69.
You have another version of autoconf. It may work, but is not guaranteed to. You have another version of autoconf. It may work, but is not guaranteed to.
If you have problems, you may need to regenerate the build system entirely. If you have problems, you may need to regenerate the build system entirely.
To do so, use the procedure documented by the package, typically `autoreconf'.])]) To do so, use the procedure documented by the package, typically `autoreconf'.])])
@ -664,7 +664,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
[am__api_version='1.11' [am__api_version='1.11'
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
dnl require some minimum version. Point them to the right macro. dnl require some minimum version. Point them to the right macro.
m4_if([$1], [1.11.3], [], m4_if([$1], [1.11.6], [],
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
]) ])
@ -680,7 +680,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
[AM_AUTOMAKE_VERSION([1.11.3])dnl [AM_AUTOMAKE_VERSION([1.11.6])dnl
m4_ifndef([AC_AUTOCONF_VERSION], m4_ifndef([AC_AUTOCONF_VERSION],
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.11.3 from Makefile.am. # Makefile.in generated by automake 1.11.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision$ # KDE tags expanded automatically by am_edit - $Revision$
# @configure_input@ # @configure_input@
@ -19,6 +19,23 @@
# the SUBDIRS is filled automatically by am_edit. If files are # the SUBDIRS is filled automatically by am_edit. If files are
# in this directory they are installed into the english dir # in this directory they are installed into the english dir
VPATH = @srcdir@ VPATH = @srcdir@
am__make_dryrun = \
{ \
am__dry=no; \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
| grep '^AM OK$$' >/dev/null || am__dry=yes;; \
*) \
for am__flg in $$MAKEFLAGS; do \
case $$am__flg in \
*=*|--*) ;; \
*n*) am__dry=yes; break;; \
esac; \
done;; \
esac; \
test $$am__dry = yes; \
}
pkgdatadir = $(datadir)/@PACKAGE@ pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@
@ -66,6 +83,11 @@ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
install-pdf-recursive install-ps-recursive install-recursive \ install-pdf-recursive install-ps-recursive install-recursive \
installcheck-recursive installdirs-recursive pdf-recursive \ installcheck-recursive installdirs-recursive pdf-recursive \
ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive ps-recursive uninstall-recursive nmcheck-recursive bcheck-recursive
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
distclean-recursive maintainer-clean-recursive distclean-recursive maintainer-clean-recursive
AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@ -192,9 +214,7 @@ LIB_KAB = @LIB_KAB@
LIB_KABC = @LIB_KABC@ LIB_KABC = @LIB_KABC@
LIB_KDED = @LIB_KDED@ LIB_KDED = @LIB_KDED@
LIB_KDNSSD = @LIB_KDNSSD@ LIB_KDNSSD = @LIB_KDNSSD@
LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_KHTML = @LIB_KHTML@
LIB_KIMPROXY = @LIB_KIMPROXY@ LIB_KIMPROXY = @LIB_KIMPROXY@
LIB_KIO = @LIB_KIO@ LIB_KIO = @LIB_KIO@
LIB_KJS = @LIB_KJS@ LIB_KJS = @LIB_KJS@
@ -210,6 +230,8 @@ LIB_QT = @LIB_QT@
LIB_QUI = @LIB_QUI@ LIB_QUI = @LIB_QUI@
LIB_SMB = @LIB_SMB@ LIB_SMB = @LIB_SMB@
LIB_TDECORE = @LIB_TDECORE@ LIB_TDECORE = @LIB_TDECORE@
LIB_TDEFILE = @LIB_TDEFILE@
LIB_TDEHTML = @LIB_TDEHTML@
LIB_TDEPIM = @LIB_TDEPIM@ LIB_TDEPIM = @LIB_TDEPIM@
LIB_TDEPRINT = @LIB_TDEPRINT@ LIB_TDEPRINT = @LIB_TDEPRINT@
LIB_TDEUI = @LIB_TDEUI@ LIB_TDEUI = @LIB_TDEUI@
@ -592,13 +614,10 @@ distdir: $(DISTFILES)
done done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \ @list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \ if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \ $(am__make_dryrun) \
|| $(MKDIR_P) "$(distdir)/$$subdir" \ || test -d "$(distdir)/$$subdir" \
|| exit 1; \ || $(MKDIR_P) "$(distdir)/$$subdir" \
fi; \ || exit 1; \
done
@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
dir1=$$subdir; dir2="$(distdir)/$$subdir"; \ dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
$(am__relativize); \ $(am__relativize); \
new_distdir=$$reldir; \ new_distdir=$$reldir; \

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.11.3 from Makefile.am. # Makefile.in generated by automake 1.11.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision$ # KDE tags expanded automatically by am_edit - $Revision$
# @configure_input@ # @configure_input@
@ -16,6 +16,23 @@
@SET_MAKE@ @SET_MAKE@
VPATH = @srcdir@ VPATH = @srcdir@
am__make_dryrun = \
{ \
am__dry=no; \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
| grep '^AM OK$$' >/dev/null || am__dry=yes;; \
*) \
for am__flg in $$MAKEFLAGS; do \
case $$am__flg in \
*=*|--*) ;; \
*n*) am__dry=yes; break;; \
esac; \
done;; \
esac; \
test $$am__dry = yes; \
}
pkgdatadir = $(datadir)/@PACKAGE@ pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@
@ -48,6 +65,11 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES = CONFIG_CLEAN_VPATH_FILES =
SOURCES = SOURCES =
DIST_SOURCES = DIST_SOURCES =
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 1 #>+ 1
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@ -141,9 +163,7 @@ LIB_KAB = @LIB_KAB@
LIB_KABC = @LIB_KABC@ LIB_KABC = @LIB_KABC@
LIB_KDED = @LIB_KDED@ LIB_KDED = @LIB_KDED@
LIB_KDNSSD = @LIB_KDNSSD@ LIB_KDNSSD = @LIB_KDNSSD@
LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_KHTML = @LIB_KHTML@
LIB_KIMPROXY = @LIB_KIMPROXY@ LIB_KIMPROXY = @LIB_KIMPROXY@
LIB_KIO = @LIB_KIO@ LIB_KIO = @LIB_KIO@
LIB_KJS = @LIB_KJS@ LIB_KJS = @LIB_KJS@
@ -159,6 +179,8 @@ LIB_QT = @LIB_QT@
LIB_QUI = @LIB_QUI@ LIB_QUI = @LIB_QUI@
LIB_SMB = @LIB_SMB@ LIB_SMB = @LIB_SMB@
LIB_TDECORE = @LIB_TDECORE@ LIB_TDECORE = @LIB_TDECORE@
LIB_TDEFILE = @LIB_TDEFILE@
LIB_TDEHTML = @LIB_TDEHTML@
LIB_TDEPIM = @LIB_TDEPIM@ LIB_TDEPIM = @LIB_TDEPIM@
LIB_TDEPRINT = @LIB_TDEPRINT@ LIB_TDEPRINT = @LIB_TDEPRINT@
LIB_TDEUI = @LIB_TDEUI@ LIB_TDEUI = @LIB_TDEUI@

@ -1,4 +1,4 @@
# Makefile.in generated by automake 1.11.3 from Makefile.am. # Makefile.in generated by automake 1.11.6 from Makefile.am.
# KDE tags expanded automatically by am_edit - $Revision$ # KDE tags expanded automatically by am_edit - $Revision$
# @configure_input@ # @configure_input@
@ -16,6 +16,23 @@
@SET_MAKE@ @SET_MAKE@
VPATH = @srcdir@ VPATH = @srcdir@
am__make_dryrun = \
{ \
am__dry=no; \
case $$MAKEFLAGS in \
*\\[\ \ ]*) \
echo 'am--echo: ; @echo "AM" OK' | $(MAKE) -f - 2>/dev/null \
| grep '^AM OK$$' >/dev/null || am__dry=yes;; \
*) \
for am__flg in $$MAKEFLAGS; do \
case $$am__flg in \
*=*|--*) ;; \
*n*) am__dry=yes; break;; \
esac; \
done;; \
esac; \
test $$am__dry = yes; \
}
pkgdatadir = $(datadir)/@PACKAGE@ pkgdatadir = $(datadir)/@PACKAGE@
pkgincludedir = $(includedir)/@PACKAGE@ pkgincludedir = $(includedir)/@PACKAGE@
pkglibdir = $(libdir)/@PACKAGE@ pkglibdir = $(libdir)/@PACKAGE@
@ -48,6 +65,11 @@ CONFIG_CLEAN_FILES =
CONFIG_CLEAN_VPATH_FILES = CONFIG_CLEAN_VPATH_FILES =
SOURCES = SOURCES =
DIST_SOURCES = DIST_SOURCES =
am__can_run_installinfo = \
case $$AM_UPDATE_INFO_DIR in \
n|no|NO) false;; \
*) (install-info --version) >/dev/null 2>&1;; \
esac
#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) #>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
#>+ 1 #>+ 1
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST) DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
@ -141,9 +163,7 @@ LIB_KAB = @LIB_KAB@
LIB_KABC = @LIB_KABC@ LIB_KABC = @LIB_KABC@
LIB_KDED = @LIB_KDED@ LIB_KDED = @LIB_KDED@
LIB_KDNSSD = @LIB_KDNSSD@ LIB_KDNSSD = @LIB_KDNSSD@
LIB_KFILE = @LIB_KFILE@
LIB_KFM = @LIB_KFM@ LIB_KFM = @LIB_KFM@
LIB_KHTML = @LIB_KHTML@
LIB_KIMPROXY = @LIB_KIMPROXY@ LIB_KIMPROXY = @LIB_KIMPROXY@
LIB_KIO = @LIB_KIO@ LIB_KIO = @LIB_KIO@
LIB_KJS = @LIB_KJS@ LIB_KJS = @LIB_KJS@
@ -159,6 +179,8 @@ LIB_QT = @LIB_QT@
LIB_QUI = @LIB_QUI@ LIB_QUI = @LIB_QUI@
LIB_SMB = @LIB_SMB@ LIB_SMB = @LIB_SMB@
LIB_TDECORE = @LIB_TDECORE@ LIB_TDECORE = @LIB_TDECORE@
LIB_TDEFILE = @LIB_TDEFILE@
LIB_TDEHTML = @LIB_TDEHTML@
LIB_TDEPIM = @LIB_TDEPIM@ LIB_TDEPIM = @LIB_TDEPIM@
LIB_TDEPRINT = @LIB_TDEPRINT@ LIB_TDEPRINT = @LIB_TDEPRINT@
LIB_TDEUI = @LIB_TDEUI@ LIB_TDEUI = @LIB_TDEUI@

@ -6,6 +6,6 @@ bin_PROGRAMS = remotefpga_sensormonserver
remotefpga_sensormonserver_SOURCES = main.cpp sensor_conn.cpp remotefpga_sensormonserver_SOURCES = main.cpp sensor_conn.cpp
remotefpga_sensormonserver_METASOURCES = AUTO remotefpga_sensormonserver_METASOURCES = AUTO
remotefpga_sensormonserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -ltdekrbsocket -ltqtrla remotefpga_sensormonserver_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -ltdekrbsocket -ltqtrla
KDE_OPTIONS = nofinal KDE_OPTIONS = nofinal

@ -45,16 +45,16 @@ static const char version[] = "v0.0.1";
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
KAboutData aboutData( "remotefpga_sensormon_server", I18N_NOOP("RemoteFPGA Sensor Monitor Server"), TDEAboutData aboutData( "remotefpga_sensormon_server", I18N_NOOP("RemoteFPGA Sensor Monitor Server"),
version, description, KAboutData::License_GPL, version, description, TDEAboutData::License_GPL,
"(c) 2012, Timothy Pearson"); "(c) 2012, Timothy Pearson");
aboutData.addAuthor("Timothy Pearson",0, "kb9vqf@pearsoncomputing.net"); aboutData.addAuthor("Timothy Pearson",0, "kb9vqf@pearsoncomputing.net");
KCmdLineArgs::init( argc, argv, &aboutData ); TDECmdLineArgs::init( argc, argv, &aboutData );
KApplication::disableAutoDcopRegistration(); TDEApplication::disableAutoDcopRegistration();
KApplication app(false, false); TDEApplication app(false, false);
KStartupInfo::appStarted(); TDEStartupInfo::appStarted();
KSimpleConfig config(TQDir::currentDirPath() + "/remotefpga_sensormonserver.conf", false); KSimpleConfig config(TQDir::currentDirPath() + "/remotefpga_sensormonserver.conf", false);
config.setGroup("Server"); config.setGroup("Server");

Loading…
Cancel
Save