Skip to content
Snippets Groups Projects
Commit 0ae334a4 authored by Christophe Geuzaine's avatar Christophe Geuzaine
Browse files

don't use native file chooser by default on Linux

parent 10f7253b
No related branches found
No related tags found
No related merge requests found
...@@ -1284,7 +1284,8 @@ Optional Features: ...@@ -1284,7 +1284,8 @@ Optional Features:
--enable-universal enable support for universal binaries on Mac --enable-universal enable support for universal binaries on Mac
(default=no) (default=no)
--enable-native-file-chooser --enable-native-file-chooser
enable native file chooser (default=yes) enable native file chooser (default=yes, except on
Linux)
Optional Packages: Optional Packages:
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
...@@ -3819,7 +3820,8 @@ else ...@@ -3819,7 +3820,8 @@ else
fi fi
if test "x${NATIVE}" = "xyes"; then if test "x${NATIVE}" = "xyes"; then
if test "x$enable_native_file_chooser" != "xno"; then if (test "x${UNAME}" = "xLinux" -a "x$enable_native_file_chooser" = "xyes" ||
test "x${UNAME}" != "xLinux" -a "x$enable_native_file_chooser" != "xno"); then
GMSH_DIRS="${GMSH_DIRS} contrib/NativeFileChooser" GMSH_DIRS="${GMSH_DIRS} contrib/NativeFileChooser"
GMSH_LIBS="${GMSH_LIBS} -lGmshNativeFileChooser" GMSH_LIBS="${GMSH_LIBS} -lGmshNativeFileChooser"
FLAGS="-DHAVE_NATIVE_FILE_CHOOSER ${FLAGS}" FLAGS="-DHAVE_NATIVE_FILE_CHOOSER ${FLAGS}"
......
dnl $Id: configure.in,v 1.151 2008-04-01 21:20:35 geuzaine Exp $ dnl $Id: configure.in,v 1.152 2008-04-16 15:39:25 geuzaine Exp $
dnl dnl
dnl Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle dnl Copyright (C) 1997-2008 C. Geuzaine, J.-F. Remacle
dnl dnl
...@@ -142,7 +142,7 @@ AC_ARG_ENABLE(universal, ...@@ -142,7 +142,7 @@ AC_ARG_ENABLE(universal,
[enable support for universal binaries on Mac (default=no)])) [enable support for universal binaries on Mac (default=no)]))
AC_ARG_ENABLE(native-file-chooser, AC_ARG_ENABLE(native-file-chooser,
AC_HELP_STRING([--enable-native-file-chooser], AC_HELP_STRING([--enable-native-file-chooser],
[enable native file chooser (default=yes)])) [enable native file chooser (default=yes, except on Linux)]))
dnl Get the operating system and machine names dnl Get the operating system and machine names
UNAME=`uname` UNAME=`uname`
...@@ -235,7 +235,8 @@ if test "x$enable_gui" != "xno"; then ...@@ -235,7 +235,8 @@ if test "x$enable_gui" != "xno"; then
AC_CHECK_FILE(./contrib/NativeFileChooser/Fl_Native_File_Chooser.cxx, AC_CHECK_FILE(./contrib/NativeFileChooser/Fl_Native_File_Chooser.cxx,
NATIVE="yes", NATIVE="no") NATIVE="yes", NATIVE="no")
if test "x${NATIVE}" = "xyes"; then if test "x${NATIVE}" = "xyes"; then
if test "x$enable_native_file_chooser" != "xno"; then if (test "x${UNAME}" = "xLinux" -a "x$enable_native_file_chooser" = "xyes" ||
test "x${UNAME}" != "xLinux" -a "x$enable_native_file_chooser" != "xno"); then
GMSH_DIRS="${GMSH_DIRS} contrib/NativeFileChooser" GMSH_DIRS="${GMSH_DIRS} contrib/NativeFileChooser"
GMSH_LIBS="${GMSH_LIBS} -lGmshNativeFileChooser" GMSH_LIBS="${GMSH_LIBS} -lGmshNativeFileChooser"
FLAGS="-DHAVE_NATIVE_FILE_CHOOSER ${FLAGS}" FLAGS="-DHAVE_NATIVE_FILE_CHOOSER ${FLAGS}"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment