From kde-commits  Fri Jan 23 09:39:45 2004
From: Michael Goffioul <goffioul () imec ! be>
Date: Fri, 23 Jan 2004 09:39:45 +0000
To: kde-commits
Subject: kdelibs/kdeprint/cups
Message-Id: <20040123093945.CD5D71911 () office ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=107485082803720

CVS commit by goffioul: 

- Use kdeinit framework for cupsdconf utility
- Make CUPS plugin dlopen cupsdconf module instead of regular library (should solve problems with packaging and multiple KDE versions installation)


  M +3 -3      kmcupsmanager.cpp   1.62
  M +2 -0      cupsdconf2/.cvsignore   1.4
  M +9 -12     cupsdconf2/Makefile.am   1.11
  M +1 -1      cupsdconf2/main.cpp   1.5


--- kdelibs/kdeprint/cups/kmcupsmanager.cpp  #1.61:1.62
@@ -737,8 +737,8 @@ void* KMCupsManager::loadCupsdConfFuncti
         if (!m_cupsdconf)
         {
-                m_cupsdconf = KLibLoader::self()->library("libcupsdconf");
+                m_cupsdconf = KLibLoader::self()->library("cupsdconf");
                 if (!m_cupsdconf)
                 {
-                        setErrorMsg(i18n("Library libcupsdconf not found. Check your installation."));
+                        setErrorMsg(i18n("Library cupsdconf not found. Check your installation."));
                         return NULL;
                 }
@@ -746,5 +746,5 @@ void* KMCupsManager::loadCupsdConfFuncti
         void*   func = m_cupsdconf->symbol(name);
         if (!func)
-                setErrorMsg(i18n("Symbol %1 not found in libcupsdconf library.").arg(name));
+                setErrorMsg(i18n("Symbol %1 not found in cupsdconf library.").arg(name));
         return func;
 }

--- kdelibs/kdeprint/cups/cupsdconf2/.cvsignore  #1.3:1.4
@@ -3,2 +3,4 @@
 Makefile.rules.in
 cupsdconf
+cupsdconf.la.cpp
+cupsdconf_dummy.cpp

--- kdelibs/kdeprint/cups/cupsdconf2/Makefile.am  #1.10:1.11
@@ -3,21 +3,18 @@
 INCLUDES= -I$(top_srcdir) -I$(top_srcdir)/kio -I$(top_srcdir)/kfile $(all_includes)
 
-bin_PROGRAMS = cupsdconf
-cupsdconf_SOURCES = main.cpp
-
-cupsdconf_LDADD   =  libcupsdconf.la
-cupsdconf_LDFLAGS = $(all_libraries) $(KDE_RPATH)
+bin_PROGRAMS =
+lib_LTLIBRARIES =
+kdeinit_LTLIBRARIES = cupsdconf.la
 
 # library creation
-lib_LTLIBRARIES = libcupsdconf.la
-libcupsdconf_la_SOURCES = cupsdconf.cpp cupsddialog.cpp cupsdpage.cpp cupsdcomment.cpp cupsdsplash.cpp \
+cupsdconf_la_SOURCES = cupsdconf.cpp cupsddialog.cpp cupsdpage.cpp cupsdcomment.cpp cupsdsplash.cpp \
                           cupsdserverpage.cpp cupsdlogpage.cpp cupsdjobspage.cpp cupsdfilterpage.cpp \
                           qdirlineedit.cpp cupsddirpage.cpp portdialog.cpp cupsdnetworkpage.cpp \
                           editlist.cpp cupsdbrowsingpage.cpp browsedialog.cpp cupsdsecuritypage.cpp \
                           locationdialog.cpp addressdialog.cpp cups-util.c \
-                          qdirmultilineedit.cpp sizewidget.cpp
-libcupsdconf_la_METASOURCES = AUTO
-libcupsdconf_la_LDFLAGS = $(all_libraries) -avoid-version -no-undefined
-libcupsdconf_la_LIBADD = $(LIB_KIO) $(LIB_CUPS)
+                          qdirmultilineedit.cpp sizewidget.cpp main.cpp
+cupsdconf_la_METASOURCES = AUTO
+cupsdconf_la_LDFLAGS = -avoid-version -module $(all_libraries) $(KDE_RPATH)
+cupsdconf_la_LIBADD = $(LIB_KIO) $(LIB_CUPS)
 
 noinst_HEADERS = cupsdconf.h cupsdpage.h cupsddialog.h cupsdcomment.h cupsdsplash.h \

--- kdelibs/kdeprint/cups/cupsdconf2/main.cpp  #1.4:1.5
@@ -31,5 +31,5 @@ static KCmdLineOptions options[] =
 };
 
-int main(int argc, char *argv[])
+extern "C" int kdemain(int argc, char *argv[])
 {
         KCmdLineArgs::init(argc,argv,"cupsdconf",