move SQL_BACKEND configuration to where it belongs

2 files changed, 14 insertions, 16 deletions

diff --git a/config.in b/config.in
index e0255d6..2be4697 100644
--- a/config.in
+++ b/config.in
@@ -145,113 +145,97 @@ endmenu
 menu "Base"
   choice
     prompt "Qpe Library Selection"
     default LIBQPE
     source library/config.in
     source x11/config.in
   endchoice
   source libopie/config.in
 
   source libopie2/config.in
   source libqtaux/config.in
 
   source core/opie-login/config.in
   source core/opiealarm/config.in
   source core/tools/quicklauncher/config.in
   source core/launcher/config.in
   source core/symlinker/config.in
 endmenu
 
 comment ""
 
 menu "Applets"
   source core/applets/config.in
   source noncore/applets/config.in
 endmenu
 
 menu "Apps"
   source core/apps/config.in
   source noncore/apps/config.in
 endmenu
 
 menu "Communications and Networking"
   source noncore/comm/config.in
   source noncore/net/config.in
 endmenu
 
 menu "Games"
   source noncore/games/config.in
 endmenu
 
 menu "Graphics and Multimedia"
   source freetype/config.in
   source noncore/graphics/config.in
   source core/multimedia/config.in
   source noncore/multimedia/config.in
 endmenu
 
 menu "Input methods"
   source inputmethods/config.in
 endmenu
 
 menu "Pim"
   source core/pim/config.in
   menu "Today Plugins"
     source noncore/todayplugins/config.in
     source core/pim/today/plugins/config.in
   endmenu
 endmenu
 
 menu "Settings"
   source core/settings/config.in
   source noncore/settings/config.in
 endmenu
 
 menu "Theming"
   source noncore/decorations/config.in
   source noncore/styles/config.in
 endmenu
 
 menu "Tools"
   source noncore/tools/config.in
 endmenu
 
 menu "Development"
   source development/keyview/config.in
   #source development/debugviewer/config.in
 endmenu
 
 menu "Examples"
     config EXAMPLES
 	boolean "Compile Example Application"
     source examples/config.in
 endmenu
 
 comment ""
 
 menu "Unsupported / Unmaintained"
   source noncore/unsupported/config.in
 endmenu
 
 comment ""
   depends on EXPERIMENTAL
 menu "Experimental"
   depends on EXPERIMENTAL
   source libslcompat/config.in
   source core/qws/config.in
-
-  config SQL_PIM_BACKEND
-  bool "Add SQL-Backend support"
-  default n
-  help
-	This adds the SQL-Support, using SQLite. Which database is used
-	by the backends is defined by the file "pimaccess.conf" in the
-	directory "Settings".
-	There currently do exist to groups "[contact]" and "[todo]". You can
-	select the used backend by the variable "usebackend=<type>", where
-	<type> is "sql" or "xml". "xml" is the default !
-	Important: The SQLite-library "libsqlite.so" must be installed !
-  depends ( LIBOPIE2DB )
-
-  comment "SQL-Support needs libopie2db!"
-  depends !( LIBOPIE2DB )
 endmenu
diff --git a/libopie2/opiepim/config.in b/libopie2/opiepim/config.in
index f45638a..fb75fcc 100644
--- a/libopie2/opiepim/config.in
+++ b/libopie2/opiepim/config.in
@@ -1,7 +1,21 @@
   config LIBOPIE2PIM
     boolean "libopie2pim (pim related classes)"
     default "n"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2DB
     comment "libopie2pim needs a libqpe and libopie2core and libopie2db"
     depends !(( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2DB)
 
+  config SQL_PIM_BACKEND
+    boolean "Enable SQL Backend for libopie2pim"
+    default n
+    help
+        This adds the SQL-Support, using SQLite. Which database is used
+        by the backends is defined by the file "pimaccess.conf" in the
+        directory "Settings".
+        There currently do exist to groups "[contact]" and "[todo]". You can
+        select the used backend by the variable "usebackend=<type>", where
+        <type> is "sql" or "xml". "xml" is the default !
+        Important: The SQLite-library "libsqlite.so" must be installed !
+    depends ( LIBOPIE2DB )
+    comment "SQL-Support needs libopie2db (and libsqlite)"
+    depends !( LIBOPIE2DB )