Commit: c8435594fc7c2fcdf0af93a8787c747ab2055baa - dia (git)

作図ソフト dia の改良版

Commit MetaInfo

• Revision: c8435594fc7c2fcdf0af93a8787c747ab2055baa (tree)
• Time: 2001-09-07 11:22:52
• Author: James Henstridge <james@daa....>
• Commiter: James Henstridge

Log Message

refactor the check for libxml a little so that it handles finding both

2001-09-07 James Henstridge <[e-mail]>

* configure.in (found_libxml): refactor the check for libxml a
little so that it handles finding both libxml1 and 2 better.

Change Summary

• modified: ChangeLog
• modified: configure.in

Incremental Difference

--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
[phone]  James Henstridge  <[e-mail]>
+
+	* configure.in (found_libxml): refactor the check for libxml a
+	little so that it handles finding both libxml1 and 2 better.
+
 2001-09-03  Cyrille Chepelov  <[e-mail]>
 
 	* app/app_procs.c: removed a spurious } which caused a compilation

--- a/configure.in
+++ b/configure.in
@@ -268,57 +268,52 @@ dnl
 dnl Locate the gnome-xml library
 dnl
 
-AC_CHECK_PROG(XML2_CONFIG, xml2-config, xml2-config)
-if test "$XML2_CONFIG" != ""
-then
-  AC_MSG_CHECKING(for libxml >= 2.3.9)
-  vers=`$XML2_CONFIG --version | sed -e "s/libxml //" | awk 'BEGIN {FS=".";} { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-  if test "$vers" -ge 2003009; then
+found_libxml=false
+AC_CHECK_PROG(XML_CONFIG, xml-config, xml-config)
+if test "x$XML_CONFIG" != x ; then
+  AC_MSG_CHECKING(for libxml >= 1.8.14)
+  vers=`$XML_CONFIG --version | sed -e "s/libxml //" | awk 'BEGIN {FS=".";} { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+
+  dnl 1.18.14 is required for xmlUseNewParser()    
+  if test "$vers" -ge 1008014; then
     AC_MSG_RESULT(found)
-    XML_LIBS="`$XML2_CONFIG --libs`"
-    XML_CFLAGS="`$XML2_CONFIG --cflags`"
-
-    if test "$enable_gnome_print" = "yes"
-    then
-        gnome-config --cflags print | \
-        grep gnome-xml 2>&1 >/dev/null && \
-        AC_MSG_ERROR(libxml2 found but gnome-print uses libxml1 ; this is a conflict.\nPlease do either provide libxml1 or disable gnome-print.)
-    fi
-    echo $GNOME_CFLAGS | \
-    grep gnome-xml 2>&1 >/dev/null && \
-    AC_MSG_ERROR(libxml2 found but one GNOME component uses libxml1 ; this is a conflict.\nPlease do either provide libxml1 or disable the offending GNOME component.)
-        
+    found_libxml=true
+    XML_LIBS="`$XML_CONFIG --libs`"
+    XML_CFLAGS="`$XML_CONFIG --cflags`"
   else
     AC_MSG_RESULT(not found)
   fi
 fi
-if test "$XML_CONFIG" = ""
-then
-  AC_CHECK_PROG(XML_CONFIG, xml-config, xml-config)
-  if test "$XML_CONFIG" != "" 
-  then
-    AC_MSG_CHECKING(for libxml >= 1.8.14)
-    vers=`$XML_CONFIG --version | sed -e "s/libxml //" | awk 'BEGIN {FS=".";} { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-    if test "$vers" -ge 1008014; then
-      dnl 1.18.14 is required for xmlUseNewParser()    
+
+if ! $found_libxml; then
+  AC_CHECK_PROG(XML2_CONFIG, xml2-config, xml2-config)
+  if test "x$XML2_CONFIG" != x ; then
+    AC_MSG_CHECKING(for libxml >= 2.3.9)
+    vers=`$XML2_CONFIG --version | sed -e "s/libxml //" | awk 'BEGIN {FS=".";} { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+
+    if test "$vers" -ge 2003009; then
       AC_MSG_RESULT(found)
+      found_libxml=true
+      XML_LIBS="`$XML2_CONFIG --libs`"
+      XML_CFLAGS="`$XML2_CONFIG --cflags`"
+
+      if test "$enable_gnome_print" = "yes"
+      then
+          gnome-config --cflags print | \
+          grep gnome-xml 2>&1 >/dev/null && \
+          AC_MSG_ERROR(libxml2 found but gnome-print uses libxml1 ; this is a conflict.\nPlease do either provide libxml1 or disable gnome-print.)
+      fi
+      echo $GNOME_CFLAGS | \
+      grep gnome-xml 2>&1 >/dev/null && \
+      AC_MSG_ERROR(libxml2 found but one GNOME component uses libxml1 ; this is a conflict.\nPlease do either provide libxml1 or disable the offending GNOME component.)
+        
     else
-      AC_MSG_ERROR(you need libxml >= 1.8.14 for this version of dia)
+      AC_MSG_RESULT(not found)
     fi
-    XML_LIBS="`$XML_CONFIG --libs`"
-    XML_CFLAGS="`$XML_CONFIG --cflags`"
-  else 
-    AC_MSG_RESULT(not found)
   fi
 fi
 
-if test "$XML_CONFIG" != "" && test "$XML2_CONFIG" != ""
-then
-    AC_MSG_ERROR(Both libxml1 and libxml2 found. You need to choose one or face crashes.\nWe advise you use only libxml1 for the moment.)
-fi
-
-if test "$XML_CONFIG" = "" && test "$XML2_CONFIG" = ""
-then
+if ! $found_libxml; then
     AC_MSG_ERROR(Neither libxml1 or libxml2 found. You must install one (libxml1, preferably))
 fi