[ooo-build-commit] Branch 'ooo/master' - configure configure.in

[Jan Holesovsky]

 configure    |   16 ++++++++--------
 configure.in |   14 +++++++-------
 2 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 334480803a67013d7387f189790089c1f7b5d60d
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Wed Sep 23 11:08:28 2009 +0000

    #i10000# #i105293# ext. openssl check

diff --git a/configure b/configure
index 287e13e..06ed74c 100755
--- a/configure
+++ b/configure
@@ -753,11 +753,11 @@ SYSTEM_AGG
 AGG_LIBS
 AGG_CFLAGS
 ENABLE_AGG
-NEON_VERSION
-SYSTEM_NEON
 SYSTEM_OPENSSL
 OPENSSL_LIBS
 OPENSSL_CFLAGS
+NEON_VERSION
+SYSTEM_NEON
 NEON_LIBS
 NEON_CFLAGS
 DISABLE_NEON
@@ -22946,6 +22946,12 @@ $as_echo "internal" >&6; }
     NEON_CFLAGS=
     BUILD_TYPE="$BUILD_TYPE NEON"
 fi
+
+
+
+
+fi
+
 if test "$_os" = "Darwin" && test "$with_system_openssl" != "no"; then
    with_system_openssl=yes
 fi
@@ -23072,12 +23078,6 @@ fi
 
 
 
-
-
-
-
-fi
-
 { $as_echo "$as_me:$LINENO: checking whether to enable agg" >&5
 $as_echo_n "checking whether to enable agg... " >&6; }
 if test "$with_agg" = "no"; then
diff --git a/configure.in b/configure.in
index cf91e51..aff65d6 100644
--- a/configure.in
+++ b/configure.in
@@ -4795,8 +4795,14 @@ else
     NEON_CFLAGS=
     BUILD_TYPE="$BUILD_TYPE NEON"
 fi
+AC_SUBST(SYSTEM_NEON)
+AC_SUBST(NEON_VERSION)
+AC_SUBST(NEON_LIBS)
+AC_SUBST(NEON_CFLAGS)
+fi
+
 dnl ===================================================================
-dnl Check for system openssl (only neon needs it!)
+dnl Check for system openssl
 dnl ===================================================================
 if test "$_os" = "Darwin" && test "$with_system_openssl" != "no"; then
    with_system_openssl=yes
@@ -4823,12 +4829,6 @@ AC_SUBST(SYSTEM_OPENSSL)
 AC_SUBST(OPENSSL_CFLAGS)
 AC_SUBST(OPENSSL_LIBS)
 
-AC_SUBST(SYSTEM_NEON)
-AC_SUBST(NEON_VERSION)
-AC_SUBST(NEON_LIBS)
-AC_SUBST(NEON_CFLAGS)
-fi
-
 dnl ===================================================================
 dnl Test for disabling agg
 dnl ===================================================================