From: Pavlov Konstantin <thresh@videolan.org>
Date: Fri, 9 Jun 2006 19:59:22 +0000 (+0000)
Subject: revert 15853 as it brokes things
X-Git-Tag: 0.9.0-test0~11030
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=1f1c05083b9640f537faaf7804bebd10ef71218d;p=vlc

revert 15853 as it brokes things
---

diff --git a/configure.ac b/configure.ac
index b3dfc7caea..18653372e1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5149,21 +5149,20 @@ then
         have_xul=true
 	MOZILLA_CONFIG="${XULRUNNER_CONFIG}"
       fi
+    
+      if ${MOZILLA_CONFIG} --defines | grep -q 'MOZ_X11=1'; then
+        LDFLAGS="${LDFLAGS_save} ${X_LIBS} ${X_PRE_LIBS}"
+        AC_CHECK_LIB(Xt,XtStrings,
+         [
+	     VLC_ADD_CPPFLAGS([mozilla],[${X_CFLAGS}])
+	     VLC_ADD_LDFLAGS([mozilla],[${X_LIBS} ${X_PRE_LIBS} -lXt -lX11 -lSM -lICE])
+	 ],
+         [],
+         [[${X_LIBS} ${X_PRE_LIBS} -lX11 -lSM -lICE]
+        ])
+        LDFLAGS="${LDFLAGS_save}"
+      fi
     fi
-
-    if ${MOZILLA_CONFIG} --defines | grep -q 'MOZ_X11=1'; then
-      LDFLAGS="${LDFLAGS_save} ${X_LIBS} ${X_PRE_LIBS}"
-      AC_CHECK_LIB(Xt,XtStrings,
-       [
-         VLC_ADD_CPPFLAGS([mozilla],[${X_CFLAGS}]
-         VLC_ADD_LDFLAGS([mozilla],[${X_LIBS} ${X_PRE_LIBS} -lXt -lX11 -lSM -lICE])
-       ],
-       [],
-       [[${X_LIBS} ${X_PRE_LIBS} -lX11 -lSM -lICE]
-      ])
-      LDFLAGS="${LDFLAGS_save}"
-    fi
-
       mozilla=:
       dnl Workaround for http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=150490
       VLC_ADD_CPPFLAGS([mozilla],[[`${MOZILLA_CONFIG} --cflags plugin xpcom java | sed 's,-I\([^ ]*\)/mozilla/\([^ ]*\),-I\1/\2 -I\1/mozilla/\2,g' | xargs`]])