Changeset 10436

Timestamp:

Apr 1, 2010, 10:17:52 PM (13 years ago)

Author:

charles

Message:

(trunk) #3111 "configure --disable-FOO doesn't quite work" -- fixed in trunk for 2.00. patch by naddy

File:

• trunk/configure.ac (modified) (4 diffs)

trunk/configure.ac

@@ -294 +294 @@
                   [enable_libnotify=yes]) 
     use_libnotify=no
-    if test "x$enable_libnotify" = "xyes" ; then
-        if test "x$have_libnotify" = "xyes"; then
+    if test "x$have_libnotify" = "xyes"; then
+        if test "x$enable_libnotify" = "xyes" ; then
             use_libnotify=yes
             AC_DEFINE([HAVE_LIBNOTIFY], 1) 
+        else
+            LIBNOTIFY_CFLAGS=
+            LIBNOTIFY_LIBS=
         fi
     fi
@@ -310 +313 @@
                   [enable_libappindicator=yes])
     use_libappindicator=no
-    if test "x$enable_libappindicator" = "xyes" ; then
-        if test "x$have_libappindicator" = "xyes"; then
+    if test "x$have_libappindicator" = "xyes"; then
+        if test "x$enable_libappindicator" = "xyes" ; then
             use_libappindicator=yes
-            AC_SUBST(LIBAPPINDICATOR_LIBS) 
-            AC_SUBST(LIBAPPINDICATOR_CFLAGS) 
             AC_DEFINE([HAVE_LIBAPPINDICATOR], 1) 
+        else
+            LIBAPPINDICATOR_CFLAGS=
+            LIBAPPINDICATOR_LIBS=
         fi
     fi
@@ -326 +330 @@
                   AS_HELP_STRING([--enable-libcanberra],[enable sounds]),, 
                   [enable_libcanberra=yes]) 
-    if test "x$enable_libcanberra" = "xyes" ; then
-        if test "x$have_libcanberra" = "xyes"; then
+    if test "x$have_libcanberra" = "xyes"; then
+        if test "x$enable_libcanberra" = "xyes" ; then
             use_canberra=yes
             AC_DEFINE([HAVE_LIBCANBERRA], 1) 
+        else
+            LIBCANBERRA_CFLAGS=
+            LIBCANBERRA_LIBS=
         fi
     fi
@@ -340 +347 @@
                   AS_HELP_STRING([--enable-gconf2],[enable GConf support]),, 
                   [enable_gconf2=yes]) 
-    if test "x$enable_gconf2" = "xyes" ; then
-        if test "x$have_gconf2" = "xyes"; then
+    if test "x$have_gconf2" = "xyes"; then
+        if test "x$enable_gconf2" = "xyes" ; then
             use_gconf2=yes
             AC_DEFINE([HAVE_GCONF2], 1) 
+        else
+            GCONF2_CFLAGS=
+            GCONF2_LIBS=
         fi
     fi