12 files changed, 13 insertions, 13 deletions

diff --git a/core/applets/cardmon/config.in b/core/applets/cardmon/config.in
index 8626c75..50a52b4 100644
--- a/core/applets/cardmon/config.in
+++ b/core/applets/cardmon/config.in
@@ -1,4 +1,4 @@
   config CARDMON
     boolean "opie-cardmon (monitor cf/sd/mmc card status, and eject function)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/core/applets/rotateapplet/config.in b/core/applets/rotateapplet/config.in
index d3de89a..53defd6 100644
--- a/core/applets/rotateapplet/config.in
+++ b/core/applets/rotateapplet/config.in
@@ -1,4 +1,4 @@
   config ROTATEAPPLET
     boolean "Rotate"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/core/applets/volumeapplet/config.in b/core/applets/volumeapplet/config.in
index f097591..b18cd54 100644
--- a/core/applets/volumeapplet/config.in
+++ b/core/applets/volumeapplet/config.in
@@ -1,4 +1,4 @@
   config VOLUMEAPPLET
     boolean "opie-volumeapplet (set volume for microphone and speaker)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/core/obex/config.in b/core/obex/config.in
index c0208d1..a3db002 100644
--- a/core/obex/config.in
+++ b/core/obex/config.in
@@ -1,4 +1,4 @@
   config OBEX
     boolean "libopieobex0 (library needed for beaming in Opie)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/core/opie-login/config.in b/core/opie-login/config.in
index a71319c..1f0fdbe 100644
--- a/core/opie-login/config.in
+++ b/core/opie-login/config.in
@@ -1,4 +1,4 @@
   config OPIE-LOGIN
     boolean "opie-login (Initial Login app, ala xdm/kdm/gdm)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/core/opie-login/opie-login.pro b/core/opie-login/opie-login.pro
index 30ed859..3265bd3 100644
--- a/core/opie-login/opie-login.pro
+++ b/core/opie-login/opie-login.pro
@@ -18,10 +18,10 @@ INCLUDEPATH += $(OPIEDIR)/include ../launcher ../apps/calibrate
 DEPENDPATH  += $(OPIEDIR)/include ../launcher ../apps/calibrate
 
 LIBS        += -lqpe -lopiecore2
 
-usepam:LIBS += -lpam
-usepam:DEFINES += USEPAM
+#usepam:LIBS += -lpam
+#usepam:DEFINES += USEPAM
 
 DESTDIR     = $(OPIEDIR)/bin
 TARGET      = opie-login
 
diff --git a/core/pim/today/plugins/datebook/config.in b/core/pim/today/plugins/datebook/config.in
index 413e0b8..aa43770 100644
--- a/core/pim/today/plugins/datebook/config.in
+++ b/core/pim/today/plugins/datebook/config.in
@@ -1,4 +1,4 @@
   config TODAY_DATEBOOK
     boolean "datebook"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIEUI2 && LIBOPIECORE2
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI && LIBOPIE2CORE
diff --git a/core/settings/button/config.in b/core/settings/button/config.in
index 834c375..dcc19a4 100644
--- a/core/settings/button/config.in
+++ b/core/settings/button/config.in
@@ -1,4 +1,4 @@
   config BUTTON-SETTINGS
     boolean "opie-button-settings (application buttons settings)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2 && !TARGET_RAMSES
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && !TARGET_RAMSES
diff --git a/core/settings/citytime/config.in b/core/settings/citytime/config.in
index be1bb71..777d211 100644
--- a/core/settings/citytime/config.in
+++ b/core/settings/citytime/config.in
@@ -1,4 +1,4 @@
   config CITYTIME
     boolean "opie-citytime (Time-zone / world clock settings)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/core/settings/light-and-power/config.in b/core/settings/light-and-power/config.in
index ef2a42f..ccfc5ca 100644
--- a/core/settings/light-and-power/config.in
+++ b/core/settings/light-and-power/config.in
@@ -1,4 +1,4 @@
   config LIGHT-AND-POWER
     boolean "opie-light-and-power (apm and energy saving settings)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
diff --git a/core/tools/quicklauncher/config.in b/core/tools/quicklauncher/config.in
index eacbcf6..9343021 100644
--- a/core/tools/quicklauncher/config.in
+++ b/core/tools/quicklauncher/config.in
@@ -1,4 +1,4 @@
   config QUICKLAUNCHER
     boolean "The Quick Launcher Loader"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIEUI2 && LIBOPIECORE2
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2UI && LIBOPIE2CORE
diff --git a/noncore/tools/remote/config.in b/noncore/tools/remote/config.in
index 2a42c58..d39fafc 100644
--- a/noncore/tools/remote/config.in
+++ b/noncore/tools/remote/config.in
@@ -1,4 +1,4 @@
   config REMOTE
     boolean "opie-remote (remote control using irda, frontent to lirc)"
     default "y"
-    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIECORE2
+    depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE