summaryrefslogtreecommitdiff
authorwimpie <wimpie>2004-08-25 22:27:41 (UTC)
committer wimpie <wimpie>2004-08-25 22:27:41 (UTC)
commite00962edd9d4be58c6184e5b6c5f6ef07f449689 (patch) (unidiff)
treec4c717187977c583f7bd7dcc37c2f203be4c0896
parent9c679b7a9cff346175b012cb1634dc2161b95889 (diff)
downloadopie-e00962edd9d4be58c6184e5b6c5f6ef07f449689.zip
opie-e00962edd9d4be58c6184e5b6c5f6ef07f449689.tar.gz
opie-e00962edd9d4be58c6184e5b6c5f6ef07f449689.tar.bz2
Add menuconfig variable to set if opie-login has to be compiled
agains PAM Changed pro to use that variable
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/opie-login/config.in4
-rw-r--r--core/opie-login/opie-login.pro6
2 files changed, 7 insertions, 3 deletions
diff --git a/core/opie-login/config.in b/core/opie-login/config.in
index 1f0fdbe..e6b7d69 100644
--- a/core/opie-login/config.in
+++ b/core/opie-login/config.in
@@ -1,4 +1,8 @@
1 config OPIE-LOGIN 1 config OPIE-LOGIN
2 boolean "opie-login (Initial Login app, ala xdm/kdm/gdm)" 2 boolean "opie-login (Initial Login app, ala xdm/kdm/gdm)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE
5
6config OPIELOGIN_USEPAM
7 boolean "Compile login manager with PAM support"
8 depends OPIE-LOGIN
diff --git a/core/opie-login/opie-login.pro b/core/opie-login/opie-login.pro
index 175d0b6..feac087 100644
--- a/core/opie-login/opie-login.pro
+++ b/core/opie-login/opie-login.pro
@@ -1,30 +1,30 @@
1TEMPLATE = app 1TEMPLATE = app
2CONFIG = qt warn_on usepam 2CONFIG = qt warn_on
3 3
4HEADERS = loginwindowimpl.h \ 4HEADERS = loginwindowimpl.h \
5 loginapplication.h \ 5 loginapplication.h \
6 passworddialogimpl.h \ 6 passworddialogimpl.h \
7 ../launcher/inputmethods.h \ 7 ../launcher/inputmethods.h \
8 ../apps/calibrate/calibrate.h 8 ../apps/calibrate/calibrate.h
9 9
10SOURCES = loginwindowimpl.cpp \ 10SOURCES = loginwindowimpl.cpp \
11 loginapplication.cpp \ 11 loginapplication.cpp \
12 passworddialogimpl.cpp \ 12 passworddialogimpl.cpp \
13 ../launcher/inputmethods.cpp \ 13 ../launcher/inputmethods.cpp \
14 ../apps/calibrate/calibrate.cpp \ 14 ../apps/calibrate/calibrate.cpp \
15 main.cpp 15 main.cpp
16 16
17INTERFACES = loginwindow.ui passworddialog.ui 17INTERFACES = loginwindow.ui passworddialog.ui
18 18
19INCLUDEPATH += $(OPIEDIR)/include ../launcher ../apps/calibrate 19INCLUDEPATH += $(OPIEDIR)/include ../launcher ../apps/calibrate
20DEPENDPATH += $(OPIEDIR)/include ../launcher ../apps/calibrate 20DEPENDPATH += $(OPIEDIR)/include ../launcher ../apps/calibrate
21 21
22LIBS += -lqpe -lopiecore2 22LIBS += -lqpe -lopiecore2
23 23
24usepam:LIBS += -lpam 24OPIELOGIN_USEPAM:LIBS += -lpam
25usepam:DEFINES += USEPAM 25OPIELOGIN_USEPAM:DEFINES += USEPAM
26 26
27DESTDIR = $(OPIEDIR)/bin 27DESTDIR = $(OPIEDIR)/bin
28TARGET = opie-login 28TARGET = opie-login
29 29
30include ( $(OPIEDIR)/include.pro ) 30include ( $(OPIEDIR)/include.pro )