Changes in configure [9ae8f82:2f8e3ca]

File:

• configure (modified) (6 diffs)

configure

@@ -52 +52 @@
 ssl=auto
 
-pam=0
-ldap=0
-
 pie=1
 
 arch=$(uname -s)
+cpu=$(uname -m)
 
 GLIB_MIN_VERSION=2.16
@@ -135 +133 @@
 --purple=0/1    Disable/enable libpurple support        $purple
                 (automatically disables other protocol modules)
-
---pam=0/1       Disable/enable PAM authentication       $pam
---ldap=0/1      Disable/enable LDAP authentication      $ldap
 
 --doc=0/1       Disable/enable help.txt generation      $doc
@@ -199 +194 @@
 
 TARGET=$target
+ARCH=$arch
+CPU=$cpu
 
 INSTALL=install -p
@@ -245 +242 @@
 #define PIDFILE "$pidfile"
 #define IPCSOCKET "$ipcsocket"
+#define ARCH "$arch"
+#define CPU "$cpu"
 EOF
 
@@ -336 +335 @@
 fi
 
-if ! $PKG_CONFIG --version > /dev/null 2>/dev/null; then
-        echo
-        echo 'Cannot find pkg-config, aborting.'
-        exit 1
-fi
-
-if $PKG_CONFIG glib-2.0; then
+if $PKG_CONFIG --version > /dev/null 2>/dev/null && $PKG_CONFIG glib-2.0; then
         if $PKG_CONFIG glib-2.0 --atleast-version=$GLIB_MIN_VERSION; then
                 cat<<EOF >>Makefile.settings
@@ -635 +628 @@
 done
 echo "STORAGE_OBJS="$STORAGE_OBJS >> Makefile.settings
-
-authobjs=
-authlibs=
-if [ "$pam" = 0 ]; then
-        echo '#undef WITH_PAM' >> config.h
-else
-        if ! echo '#include <security/pam_appl.h>' | $CC -E - >/dev/null 2>/dev/null; then
-                echo 'Cannot find libpam development libraries, aborting. (Install libpam0g-dev?)'
-                exit 1
-        fi
-        echo '#define WITH_PAM' >> config.h
-        authobjs=$authobjs'auth_pam.o '
-        authlibs=$authlibs'-lpam '
-fi
-if [ "$ldap" = 0 ]; then
-        echo '#undef WITH_LDAP' >> config.h
-else
-        if ! echo '#include <ldap.h>' | $CC -E - >/dev/null 2>/dev/null; then
-                echo 'Cannot find libldap development libraries, aborting. (Install libldap2-dev?)'
-                exit 1
-        fi
-        echo '#define WITH_LDAP' >> config.h
-        authobjs=$authobjs'auth_ldap.o '
-        authlibs=$authlibs'-lldap '
-fi
-echo AUTH_OBJS=$authobjs >> Makefile.settings
-echo EFLAGS+=$authlibs >> Makefile.settings
 
 if [ "$strip" = 0 ]; then