Changeset 1270

Timestamp:

Apr 23, 2009 11:53:41 PM (11 years ago)

Author:

andreasw

Message:

create dummy strings.h file if it does not exist on the system, so that compilation works on Windows

Location:

ThirdParty/Metis/trunk

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• configure (modified) (1 diff)
• configure.ac (modified) (1 diff)

ThirdParty/Metis/trunk/Makefile.am

@@ -87 +87 @@
 
 # Files that are generated and should be cleaned with make distclean
-DISTCLEANFILES = $(MAKEOKFILE)
+DISTCLEANFILES = $(MAKEOKFILE) strings.h
 
 include ../../BuildTools/Makemain.inc

ThirdParty/Metis/trunk/Makefile.in

@@ -314 +314 @@
 
 # Files that are generated and should be cleaned with make distclean
-DISTCLEANFILES = $(MAKEOKFILE) $(am__append_2) $(VPATH_DISTCLEANFILES)
+DISTCLEANFILES = $(MAKEOKFILE) strings.h $(am__append_2) \
+        $(VPATH_DISTCLEANFILES)
 DocFiles = README AUTHORS LICENSE
 DocInstallDir = $(prefix)/share/doc/coin/$(PACKAGE_NAME)

ThirdParty/Metis/trunk/configure

@@ -19956 +19956 @@
 
 
+# We need to create a dummy header file for Windows
+echo "$as_me:$LINENO: checking whether we need to create a dummy strings.h file" >&5
+echo $ECHO_N "checking whether we need to create a dummy strings.h file... $ECHO_C" >&6
+if test $ac_cv_header_strings_h = no; then
+  echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+  touch strings.h
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
 METISDIR=metis-4.0
 

ThirdParty/Metis/trunk/configure.ac

@@ -67 +67 @@
 AM_CONDITIONAL(SKIPMAKE, test -z "$MAKEOKFILE")
 
+# We need to create a dummy header file for Windows
+AC_MSG_CHECKING([whether we need to create a dummy strings.h file])
+if test $ac_cv_header_strings_h = no; then
+  AC_MSG_RESULT([yes])
+  touch strings.h
+else
+  AC_MSG_RESULT([no])
+fi
+
 METISDIR=metis-4.0
 AC_SUBST(METISDIR)