Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
gmsh
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Larry Price
gmsh
Commits
0ae334a4
Commit
0ae334a4
authored
17 years ago
by
Christophe Geuzaine
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
configure
+4
-2
4 additions, 2 deletions
configure
configure.in
+4
-3
4 additions, 3 deletions
configure.in
with
8 additions
and
5 deletions
configure
+
4
−
2
View file @
0ae334a4
...
@@ -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
}
"
...
...
This diff is collapsed.
Click to expand it.
configure.in
+
4
−
3
View file @
0ae334a4
dnl $Id: configure.in,v 1.15
1
2008-04-
01 21:20:3
5 geuzaine Exp $
dnl $Id: configure.in,v 1.15
2
2008-04-
16 15:39:2
5 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}"
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment