Changeset eda54e4 for configure

Timestamp:

2007-10-12T00:08:58Z (17 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

a6df0b5

Parents:

82135c7 (diff), d444c09 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from devel.

File:

• configure (modified) (4 diffs)

configure

@@ -29 +29 @@
 strip=1
 gcov=0
+plugins=1
 ipv6=1
 
@@ -69 +70 @@
 --strip=0/1     Disable/enable binary stripping         $strip
 --gcov=0/1      Disable/enable test coverage reporting  $gcov
+--plugins=0/1   Disable/enable plugins support          $plugins
 
 --ipv6=0/1      IPv6 socket support                     $ipv6
-
---ldap=0/1/auto LDAP support                            $ldap
 
 --events=...    Event handler (glib, libevent)          $events
@@ -140 +140 @@
 
 if [ "$debug" = "1" ]; then
-        echo 'CFLAGS=-g' >> Makefile.settings
+        [ -z "$CFLAGS" ] && CFLAGS=-g
         echo 'DEBUG=1' >> Makefile.settings
         echo '#define DEBUG' >> config.h
 else
-        echo 'CFLAGS=-O3' >> Makefile.settings
-fi
-
+        [ -z "$CFLAGS" ] && CFLAGS=-O3
+fi
+
+echo CFLAGS=$CFLAGS >> Makefile.settings
 echo CFLAGS+=-I`pwd` -I`pwd`/lib -I`pwd`/protocols -I. >> Makefile.settings
 
@@ -385 +386 @@
 fi
 
+if [ "$plugins" = 0 ]; then
+        echo '#undef WITH_PLUGINS' >> config.h
+else
+        echo '#define WITH_PLUGINS' >> config.h
+fi
+
 echo
 if [ -z "$BITLBEE_VERSION" -a -d .bzr ] && type bzr > /dev/null 2> /dev/null; then